aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1998-05-05 21:47:31 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1998-05-05 21:47:31 +0000
commit98c4b0923fda74e8731eca40bc4bd9fca5ee7780 (patch)
tree64bf384f668d43625164ea3f06695a6d3a42fab8 /x11-servers
parent91b7aa1579bbe54b44b797d8400dc8b3d9f7fdde (diff)
downloadports-98c4b0923fda74e8731eca40bc4bd9fca5ee7780.tar.gz
ports-98c4b0923fda74e8731eca40bc4bd9fca5ee7780.zip
This is bugfix patch number 1 for XFree86 3.3.2. This patch fixes the
following problems: - xterm utmp handling problem. - exploitable buffer overflows in xterm related to the preeditType, inputMethod and *Keymap resources. - fix xterm's mishandling of the -vb command line option. - fix an invisible cursor problem with xterm. - exploitable buffer overflows in setuid programs using the Xaw library which are related to the preeditType and inputMethod resources.
Notes
Notes: svn path=/head/; revision=10866
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile10
-rw-r--r--x11-servers/XFree86-4-Server-snap/distinfo1
-rw-r--r--x11-servers/XFree86-4-Server/Makefile10
-rw-r--r--x11-servers/XFree86-4-Server/distinfo1
4 files changed, 20 insertions, 2 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 259e26df3b87..d5fd1df173f4 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.39 1998/03/19 14:57:10 markm Exp $
+# $Id: Makefile,v 1.40 1998/04/03 22:59:40 jmz Exp $
#
DISTNAME= xc
@@ -16,6 +16,13 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/source/
DISTFILES= X332src-1.tgz X332src-2.tgz
+PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/fixes/ \
+ ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/fixes/ \
+ ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/fixes/ \
+ ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/fixes/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/fixes/
+PATCHFILES= 3.3.2-patch1
+
MAINTAINER= jmz@FreeBSD.ORG
IS_INTERACTIVE= yes # configure script asks questions
@@ -24,6 +31,7 @@ USE_X11= yes
ALL_TARGET= World
INSTALL_TARGET= install install.man
DIST_SUBDIR= xc
+PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
.if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
pre-fetch:
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 4ef8149a82c5..c96d23e12914 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,3 +1,4 @@
MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3
MD5 (xc/X332src-2.tgz) = d7b5370405afaf1097952911d1b5303d
+MD5 (xc/3.3.2-patch1) = e5a66e732d62cf23007d6b939281028a
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 259e26df3b87..d5fd1df173f4 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.39 1998/03/19 14:57:10 markm Exp $
+# $Id: Makefile,v 1.40 1998/04/03 22:59:40 jmz Exp $
#
DISTNAME= xc
@@ -16,6 +16,13 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/source/
DISTFILES= X332src-1.tgz X332src-2.tgz
+PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/fixes/ \
+ ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/fixes/ \
+ ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/fixes/ \
+ ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/fixes/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/fixes/
+PATCHFILES= 3.3.2-patch1
+
MAINTAINER= jmz@FreeBSD.ORG
IS_INTERACTIVE= yes # configure script asks questions
@@ -24,6 +31,7 @@ USE_X11= yes
ALL_TARGET= World
INSTALL_TARGET= install install.man
DIST_SUBDIR= xc
+PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
.if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO)
pre-fetch:
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 4ef8149a82c5..c96d23e12914 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,3 +1,4 @@
MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3
MD5 (xc/X332src-2.tgz) = d7b5370405afaf1097952911d1b5303d
+MD5 (xc/3.3.2-patch1) = e5a66e732d62cf23007d6b939281028a
MD5 (xc/Wraphelp.c) = IGNORE