Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jul 2004 18:10:22 GMT
From:      Dejan Lesjak <dejan.lesjak@ijs.si>
To:        x11@FreeBSD.org
Subject:   Re: ports/67510: [patch] Update XFree86 clients to 4.4 release.
Message-ID:  <200407071810.i67IAMSp071655@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/67510; it has been noted by GNATS.

From: Dejan Lesjak <dejan.lesjak@ijs.si>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/67510: [patch] Update XFree86 clients to 4.4 release.
Date: Wed, 7 Jul 2004 20:06:36 +0200

 --Boundary-00=_suD7Ah/U5D1qArZ
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 The following things are corrected with this updated patch:
 - fix security issue with xdm (http://bugs.xfree86.org/show_bug.cgi?id=1376)
 - make this port compile on FreeBSD 4.x 
 (http://bugs.xfree86.org/show_bug.cgi?id=1422)
 
 --Boundary-00=_suD7Ah/U5D1qArZ
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="XFree86-4-clients_2.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="XFree86-4-clients_2.patch"
 
 Index: Makefile
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-clients/Makefile,v
 retrieving revision 1.125
 diff -u -r1.125 Makefile
 --- Makefile	31 May 2004 06:15:41 -0000	1.125
 +++ Makefile	6 Jul 2004 22:35:50 -0000
 @@ -6,16 +6,15 @@
  #
  
  PORTNAME=	clients
 -PORTVERSION=	4.3.0
 -PORTREVISION=	8
 +PORTVERSION=	4.4.0
  CATEGORIES=	x11
  MASTER_SITES=	${MASTER_SITE_XFREE}
 -MASTER_SITE_SUBDIR=	4.3.0
 +MASTER_SITE_SUBDIR= ${PORTVERSION}
  PKGNAMEPREFIX=	XFree86-
 -DISTFILES=	X430src-1.tgz \
 -		X430src-2.tgz \
 -		X430src-3.tgz \
 -		X430src-4.tgz
 +DISTFILES=	XFree86-4.4.0-src-1.tgz \
 +		XFree86-4.4.0-src-2.tgz \
 +		XFree86-4.4.0-src-3.tgz \
 +		XFree86-4.4.0-src-4.tgz
  
  MAINTAINER=	x11@FreeBSD.org
  COMMENT=	XFree86-4 client programs and related files
 @@ -40,7 +39,10 @@
  XINSTALL_MAN_DIRS=	programs
  
  .for pf in patch-bdftruncate.pl patch-ucs2any.pl \
 -	   patch-Xres.cpp patch-Imake.rules patch-mkfontscale.c
 +	   patch-programs::fonttosfnt::read.c \
 +	   patch-programs::xdm::Imakefile \
 +	   patch-programs::xdm::session.c \
 +	   patch-programs::xdm::socket.c
  EXTRA_PATCHES+=		${FILESDIR}/${pf}
  .endfor
  
 @@ -70,6 +72,10 @@
  post-install:
  	${CHOWN} root:wheel ${PREFIX}/bin/luit
  	${CHMOD} 04711 ${PREFIX}/bin/luit
 +	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 +.else
 +post-install:
 +	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
  .endif
  
  .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 Index: distinfo
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-clients/distinfo,v
 retrieving revision 1.35
 diff -u -r1.35 distinfo
 --- distinfo	31 Mar 2004 03:12:35 -0000	1.35
 +++ distinfo	6 Jul 2004 22:35:50 -0000
 @@ -1,8 +1,8 @@
 -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
 -SIZE (xc/X430src-1.tgz) = 10993622
 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
 -SIZE (xc/X430src-2.tgz) = 7962239
 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 -SIZE (xc/X430src-3.tgz) = 12366363
 -MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
 -SIZE (xc/X430src-4.tgz) = 12906091
 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523
 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538
 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
 +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
 +MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
 +SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
 Index: pkg-install
 ===================================================================
 RCS file: pkg-install
 diff -N pkg-install
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ pkg-install	6 Jul 2004 22:35:50 -0000
 @@ -0,0 +1,16 @@
 +#!/bin/sh
 +
 +if [ "$2" != "POST-INSTALL" ]; then
 +	exit 0
 +fi
 +
 +PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
 +XDMCONFDIR=${PKG_PREFIX}/lib/X11/xdm
 +XDMCONFFILES="GiveConsole TakeConsole Xaccess Xresources Xservers Xsession \
 +	Xsetup_0 Xwilling xdm-config"
 +
 +for file in $XDMCONFFILES; do
 +	if [ ! -f ${XDMCONFDIR}/$file ]; then
 +		cp ${XDMCONFDIR}/default/$file ${XDMCONFDIR}/$file
 +	fi
 +done
 Index: pkg-plist
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-clients/pkg-plist,v
 retrieving revision 1.40
 diff -u -r1.40 pkg-plist
 --- pkg-plist	11 Mar 2003 23:38:06 -0000	1.40
 +++ pkg-plist	6 Jul 2004 22:35:50 -0000
 @@ -1,3 +1,12 @@
 +@unexec if cmp -s %D/lib/X11/xdm/GiveConsole %D/lib/X11/xdm/default/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
 +@unexec if cmp -s %D/lib/X11/xdm/TakeConsole %D/lib/X11/xdm/default/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
 +@unexec if cmp -s %D/lib/X11/xdm/Xaccess %D/lib/X11/xdm/default/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
 +@unexec if cmp -s %D/lib/X11/xdm/Xresources %D/lib/X11/xdm/default/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
 +@unexec if cmp -s %D/lib/X11/xdm/Xservers %D/lib/X11/xdm/default/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
 +@unexec if cmp -s %D/lib/X11/xdm/Xsession %D/lib/X11/xdm/default/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
 +@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0 %D/lib/X11/xdm/default/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
 +@unexec if cmp -s %D/lib/X11/xdm/Xwilling %D/lib/X11/xdm/default/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
 +@unexec if cmp -s %D/lib/X11/xdm/xdm-config %D/lib/X11/xdm/default/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
  bin/Xmark
  bin/appres
  bin/atobm
 @@ -11,6 +20,7 @@
  bin/dpsexec
  bin/dpsinfo
  bin/editres
 +bin/fonttosfnt
  bin/fslsfonts
  bin/fstobdf
  bin/glxgears
 @@ -138,6 +148,7 @@
  lib/X11/app-defaults/XCalc-color
  lib/X11/app-defaults/XClipboard
  lib/X11/app-defaults/XClock
 +lib/X11/app-defaults/XClock-color
  lib/X11/app-defaults/XConsole
  lib/X11/app-defaults/XFontSel
  lib/X11/app-defaults/XLoad
 @@ -351,18 +362,18 @@
  lib/X11/x11perfcomp/fillblnk
  lib/X11/x11perfcomp/perfboth
  lib/X11/x11perfcomp/perfratio
 -lib/X11/xdm/GiveConsole
 -lib/X11/xdm/TakeConsole
 -lib/X11/xdm/Xaccess
 -lib/X11/xdm/Xresources
 -lib/X11/xdm/Xservers
 -lib/X11/xdm/Xsession
 -lib/X11/xdm/Xsetup_0
 -lib/X11/xdm/Xwilling
 +lib/X11/xdm/default/GiveConsole
 +lib/X11/xdm/default/TakeConsole
 +lib/X11/xdm/default/Xaccess
 +lib/X11/xdm/default/Xresources
 +lib/X11/xdm/default/Xservers
 +lib/X11/xdm/default/Xsession
 +lib/X11/xdm/default/Xsetup_0
 +lib/X11/xdm/default/Xwilling
  lib/X11/xdm/chooser
  lib/X11/xdm/pixmaps/XFree86.xpm
  lib/X11/xdm/pixmaps/XFree86bw.xpm
 -lib/X11/xdm/xdm-config
 +lib/X11/xdm/default/xdm-config
  lib/X11/xedit/lisp/indent.lsp
  lib/X11/xedit/lisp/lisp.lsp
  lib/X11/xedit/lisp/progmodes/c.lsp
 @@ -371,6 +382,7 @@
  lib/X11/xedit/lisp/progmodes/lisp.lsp
  lib/X11/xedit/lisp/progmodes/make.lsp
  lib/X11/xedit/lisp/progmodes/man.lsp
 +lib/X11/xedit/lisp/progmodes/patch.lsp
  lib/X11/xedit/lisp/progmodes/rpm.lsp
  lib/X11/xedit/lisp/progmodes/sgml.lsp
  lib/X11/xedit/lisp/progmodes/sh.lsp
 @@ -406,6 +418,7 @@
  lib/X11/xkb/geometry/README
  lib/X11/xkb/geometry/amiga
  lib/X11/xkb/geometry/ataritt
 +lib/X11/xkb/geometry/chicony
  lib/X11/xkb/geometry/dell
  lib/X11/xkb/geometry/digital/lk
  lib/X11/xkb/geometry/digital/pc
 @@ -413,6 +426,7 @@
  lib/X11/xkb/geometry/everex
  lib/X11/xkb/geometry/fujitsu
  lib/X11/xkb/geometry/hp
 +lib/X11/xkb/geometry/ibm/thinkpad
  lib/X11/xkb/geometry/keytronic
  lib/X11/xkb/geometry/kinesis
  lib/X11/xkb/geometry/macintosh
 @@ -509,6 +523,7 @@
  lib/X11/xkb/symbols/al
  lib/X11/xkb/symbols/altwin
  lib/X11/xkb/symbols/am
 +lib/X11/xkb/symbols/apple
  lib/X11/xkb/symbols/ar
  lib/X11/xkb/symbols/az
  lib/X11/xkb/symbols/be
 @@ -550,6 +565,7 @@
  lib/X11/xkb/symbols/gur
  lib/X11/xkb/symbols/hp/us
  lib/X11/xkb/symbols/hr
 +lib/X11/xkb/symbols/hr_US
  lib/X11/xkb/symbols/hu
  lib/X11/xkb/symbols/hu_US
  lib/X11/xkb/symbols/hu_qwerty
 @@ -610,6 +626,7 @@
  lib/X11/xkb/symbols/pc/dev
  lib/X11/xkb/symbols/pc/dk
  lib/X11/xkb/symbols/pc/dvorak
 +lib/X11/xkb/symbols/pc/dz
  lib/X11/xkb/symbols/pc/ee
  lib/X11/xkb/symbols/pc/el
  lib/X11/xkb/symbols/pc/en_US
 @@ -653,6 +670,9 @@
  lib/X11/xkb/symbols/pc/ru
  lib/X11/xkb/symbols/pc/sapmi
  lib/X11/xkb/symbols/pc/se
 +lib/X11/xkb/symbols/pc/se_FI
 +lib/X11/xkb/symbols/pc/se_NO
 +lib/X11/xkb/symbols/pc/se_SE
  lib/X11/xkb/symbols/pc/si
  lib/X11/xkb/symbols/pc/sk
  lib/X11/xkb/symbols/pc/sk_qwerty
 @@ -661,11 +681,15 @@
  lib/X11/xkb/symbols/pc/syr_phonetic
  lib/X11/xkb/symbols/pc/tel
  lib/X11/xkb/symbols/pc/th
 +lib/X11/xkb/symbols/pc/th_pat
 +lib/X11/xkb/symbols/pc/th_tis
  lib/X11/xkb/symbols/pc/tj
  lib/X11/xkb/symbols/pc/tml
  lib/X11/xkb/symbols/pc/tr
  lib/X11/xkb/symbols/pc/ua
  lib/X11/xkb/symbols/pc/us
 +lib/X11/xkb/symbols/pc/us_intl
 +lib/X11/xkb/symbols/pc/uz
  lib/X11/xkb/symbols/pc/yu
  lib/X11/xkb/symbols/pc104
  lib/X11/xkb/symbols/pl
 @@ -673,8 +697,8 @@
  lib/X11/xkb/symbols/pt
  lib/X11/xkb/symbols/ralt
  lib/X11/xkb/symbols/ro
 +lib/X11/xkb/symbols/ro2
  lib/X11/xkb/symbols/ru
 -lib/X11/xkb/symbols/ru_yawerty
  lib/X11/xkb/symbols/sapmi
  lib/X11/xkb/symbols/se
  lib/X11/xkb/symbols/se_FI
 @@ -689,10 +713,13 @@
  lib/X11/xkb/symbols/srvr_ctrl
  lib/X11/xkb/symbols/sun/se
  lib/X11/xkb/symbols/sun/us
 +lib/X11/xkb/symbols/sun/usb
  lib/X11/xkb/symbols/syr
  lib/X11/xkb/symbols/syr_phonetic
  lib/X11/xkb/symbols/tel
  lib/X11/xkb/symbols/th
 +lib/X11/xkb/symbols/th_pat
 +lib/X11/xkb/symbols/th_tis
  lib/X11/xkb/symbols/tj
  lib/X11/xkb/symbols/tml
  lib/X11/xkb/symbols/tr
 @@ -702,6 +729,7 @@
  lib/X11/xkb/symbols/us_group2
  lib/X11/xkb/symbols/us_group3
  lib/X11/xkb/symbols/us_intl
 +lib/X11/xkb/symbols/uz
  lib/X11/xkb/symbols/vn
  lib/X11/xkb/symbols/xfree68/amiga
  lib/X11/xkb/symbols/xfree68/ataritt
 @@ -715,6 +743,7 @@
  lib/X11/xkb/types/extra
  lib/X11/xkb/types/iso9995
  lib/X11/xkb/types/mousekeys
 +lib/X11/xkb/types/numpad
  lib/X11/xkb/types/pc
  lib/X11/xkb/xkbcomp
  lib/X11/xman.help
 Index: files/manpages
 ===================================================================
 RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-clients/files/manpages,v
 retrieving revision 1.5
 diff -u -r1.5 manpages
 --- files/manpages	11 Mar 2003 23:38:06 -0000	1.5
 +++ files/manpages	6 Jul 2004 22:35:00 -0000
 @@ -10,6 +10,7 @@
  	dpsexec.1 \
  	dpsinfo.1 \
  	editres.1 \
 +	fonttosfnt.1 \
  	fslsfonts.1 \
  	fstobdf.1 \
  	glxgears.1 \
 Index: files/patch-Imake.rules
 ===================================================================
 RCS file: files/patch-Imake.rules
 diff -N files/patch-Imake.rules
 --- files/patch-Imake.rules	3 Jan 2004 21:35:04 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,16 +0,0 @@
 ---- config/cf/Imake.rules.orig	Sat Jan  3 16:16:06 2004
 -+++ config/cf/Imake.rules	Sat Jan  3 16:18:47 2004
 -@@ -3148,7 +3148,12 @@
 -  * Also delete line numbers from the cpp output (-P is not portable, I guess).
 -  */
 - #ifndef CppSedMagic
 --#define CppSedMagic sed -e '/^#  *[0-9][0-9]*  *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
 -+#define CppSedMagic sed -e '/^#  *[0-9][0-9]*  *.*$$/d' \
 -+			-e '/^#line  *[0-9][0-9]*  *.*$$/d' \
 -+			-e '/^[ 	]*XCOMM$$/s/XCOMM/#/' \
 -+			-e '/^[ 	]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' \
 -+			-e '/^[ 	]*XHASH/s/XHASH/#/' \
 -+			-e '/\@\@$$/s/\@\@$$/\\/'
 - #endif /* CppSedMagic */
 - 
 - #ifndef CppFileTarget
 Index: files/patch-Xres.cpp
 ===================================================================
 RCS file: files/patch-Xres.cpp
 diff -N files/patch-Xres.cpp
 --- files/patch-Xres.cpp	3 Jan 2004 21:35:04 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,50 +0,0 @@
 ---- programs/xdm/config/Xres.cpp.orig	Sat Jan  3 15:50:37 2004
 -+++ programs/xdm/config/Xres.cpp	Sat Jan  3 15:53:22 2004
 -@@ -28,7 +28,7 @@
 - #endif /* XPM */
 - xlogin*fail: Login incorrect
 - #ifdef XPM
 --/**/#if WIDTH > 800
 -+XHASHif WIDTH > 800
 - xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
 - xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
 - xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
 -@@ -38,9 +38,9 @@
 - xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
 - xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
 - xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
 --/**/#endif
 -+XHASHendif
 - #endif /* XPM */
 --/**/#ifdef COLOR
 -+XHASHifdef COLOR
 - #ifndef XPM
 - xlogin*greetColor: CadetBlue
 - #else
 -@@ -56,7 +56,7 @@
 - xlogin*failColor: red
 - *Foreground: black
 - *Background: #fffff0
 --/**/#else
 -+XHASHelse
 - #ifdef XPM
 - xlogin*borderWidth: 3
 - xlogin*frameWidth: 0
 -@@ -68,13 +68,13 @@
 - xlogin*Foreground: black
 - xlogin*Background: white
 - #endif /* XPM */
 --/**/#endif
 -+XHASHendif
 - #ifdef XPM
 --/**/#if PLANES >= 8
 -+XHASHif PLANES >= 8
 - xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
 --/**/#else
 -+XHASHelse
 - xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
 --/**/#endif
 -+XHASHendif
 - xlogin*useShape: true
 - xlogin*logoPadding: 10
 - #endif /* XPM */
 Index: files/patch-mkfontscale.c
 ===================================================================
 RCS file: files/patch-mkfontscale.c
 diff -N files/patch-mkfontscale.c
 --- files/patch-mkfontscale.c	17 Mar 2004 07:04:14 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,12 +0,0 @@
 ---- programs/mkfontscale/mkfontscale.c.orig	Wed Mar 17 07:01:52 2004
 -+++ programs/mkfontscale/mkfontscale.c	Wed Mar 17 07:03:10 2004
 -@@ -29,7 +29,8 @@
 - #include <dirent.h>
 - 
 - #include <X11/fonts/fontenc.h>
 --#include <freetype/freetype.h>
 -+#include <ft2build.h>
 -+#include FT_FREETYPE_H
 - #include <freetype/ftsnames.h>
 - #include <freetype/tttables.h>
 - #include <freetype/ttnameid.h>
 Index: files/patch-programs::fonttosfnt::read.c
 ===================================================================
 RCS file: files/patch-programs::fonttosfnt::read.c
 diff -N files/patch-programs::fonttosfnt::read.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-programs::fonttosfnt::read.c	6 Jul 2004 22:35:00 -0000
 @@ -0,0 +1,11 @@
 +--- programs/fonttosfnt/read.c.orig	Fri Apr  9 22:31:49 2004
 ++++ programs/fonttosfnt/read.c	Fri Apr  9 22:32:24 2004
 +@@ -28,7 +28,7 @@
 + #include FT_BDF_H
 + #include "X11/Xos.h"
 + #include "fonttosfnt.h"
 +-#include "fontenc.h"
 ++#include "X11/fonts/fontenc.h"
 + 
 + #define FLOOR2(x, y) ((x) >= 0 ? (x) / (y) : -(((-(x)) + (y) - 1) / (y)))
 + #define CEIL2(x, y) (FLOOR2((x) + (y) - 1, (y)))
 Index: files/patch-programs::xdm::Imakefile
 ===================================================================
 RCS file: files/patch-programs::xdm::Imakefile
 diff -N files/patch-programs::xdm::Imakefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-programs::xdm::Imakefile	6 Jul 2004 22:35:00 -0000
 @@ -0,0 +1,14 @@
 +--- programs/xdm/Imakefile.old	Wed Jun 30 22:11:46 2004
 ++++ programs/xdm/Imakefile	Wed Jun 30 22:12:12 2004
 +@@ -31,7 +31,11 @@
 + #endif
 + 
 + #if HasSecureRPC
 ++#if defined(FreeBSDArchitecture) && (OSMajorVersion < 5)
 ++RPC_DEFINES = -DSECURE_RPC -DFREEBSD_OLD_RPC
 ++#else
 + RPC_DEFINES = -DSECURE_RPC
 ++#endif
 + RPCOBJS = rpcauth.o
 + RPCSRCS = rpcauth.c
 + RPCLIB = -lrpcsvc
 Index: files/patch-programs::xdm::session.c
 ===================================================================
 RCS file: files/patch-programs::xdm::session.c
 diff -N files/patch-programs::xdm::session.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-programs::xdm::session.c	6 Jul 2004 22:35:00 -0000
 @@ -0,0 +1,27 @@
 +--- programs/xdm/session.c.old	Wed Jun 30 22:12:02 2004
 ++++ programs/xdm/session.c	Wed Jun 30 22:12:21 2004
 +@@ -54,8 +54,12 @@
 + #ifdef SECURE_RPC
 + # include <rpc/rpc.h>
 + # include <rpc/key_prot.h>
 ++#ifdef FREEBSD_OLD_RPC
 ++extern int key_setnet(struct netstarg *arg);
 ++#else
 + extern int key_setnet(struct key_netstarg *arg);
 + #endif
 ++#endif
 + #ifdef K5AUTH
 + # include <krb5/krb5.h>
 + #endif
 +@@ -643,7 +647,11 @@
 + 	    char    netname[MAXNETNAMELEN+1], secretkey[HEXKEYBYTES+1];
 + 	    int	    nameret, keyret;
 + 	    int	    len;
 ++#ifdef FREEBSD_OLD_RPC
 ++	    struct  netstarg netst;
 ++#else
 + 	    struct  key_netstarg netst;
 ++#endif
 + 	    int     key_set_ok = 0;
 + 
 + 	    nameret = getnetname (netname);
 Index: files/patch-programs::xdm::socket.c
 ===================================================================
 RCS file: files/patch-programs::xdm::socket.c
 diff -N files/patch-programs::xdm::socket.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-programs::xdm::socket.c	6 Jul 2004 22:35:00 -0000
 @@ -0,0 +1,12 @@
 +--- programs/xdm/socket.c.orig	Thu Jun  3 05:38:29 2004
 ++++ programs/xdm/socket.c	Thu Jun  3 05:40:54 2004
 +@@ -66,6 +66,9 @@
 +     char *name = localHostname ();
 +     registerHostname (name, strlen (name));
 + 
 ++    if (request_port == 0)
 ++	return;
 ++
 + #if defined(IPv6) && defined(AF_INET6)
 +     chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
 + #else
 
 --Boundary-00=_suD7Ah/U5D1qArZ--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407071810.i67IAMSp071655>