ports/99206: port XFree86-4-Server broken (make patch fails)

Tue Jun 20 15:20:17 UTC 2006

>Number:         99206
>Category:       ports
>Synopsis:       port XFree86-4-Server broken (make patch fails)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 20 15:20:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Weber-Fahr
>Release:        4.11-RELEASE-p19
>Organization:
Arcor
>Environment:
FreeBSD ivrweb.ivr.lab.arcor.net 4.11-RELEASE-p19 FreeBSD 4.11-RELEASE-p19 #0: Mon Jun 19 23:37:37 CEST 2006     root at ivrweb.ivr.lab.arcor.net:/usr/obj/usr/src/sys/DL140  i386

>Description:
CVSupped to current ports tree
tried portupgrade -a - it fails with XFree86-4-Server

one of the patch files fails to apply:

ivrweb# [XFree86-4-Server] make
By default, the X Server installs as a set-user-id root binary. When run by
a normal user, it checks arguments and environment as done in the x11/wrapper
port before handling them normally.  If you are concerned about the security
of this, but still want to run an X Server (for example using xdm/kdm/gdm,
which will still run the server as root), you can cancel the build and set
NO_SUID_XSERVER=YES in /etc/make.conf.
===>  Vulnerability check disabled, database not found
=> XFree86-4.5.0-src-1.tgz doesn't seem to exist in /usr/ports/distfiles/xc.
=> Attempting to fetch from http://www.gtlib.cc.gatech.edu/pub/XFree86/4.5.0/source/.
XFree86-4.5.0-src-1.tgz                       100% of   10 MB  501 kBps 00m00s
=> XFree86-4.5.0-src-2.tgz doesn't seem to exist in /usr/ports/distfiles/xc.
=> Attempting to fetch from http://www.gtlib.cc.gatech.edu/pub/XFree86/4.5.0/source/.
XFree86-4.5.0-src-2.tgz                       100% of 5689 kB  486 kBps 00m00s
=> XFree86-4.5.0-src-3.tgz doesn't seem to exist in /usr/ports/distfiles/xc.
=> Attempting to fetch from http://www.gtlib.cc.gatech.edu/pub/XFree86/4.5.0/source/.
XFree86-4.5.0-src-3.tgz                       100% of   11 MB  504 kBps 00m00s
===>  Extracting for XFree86-Server-4.5.0_3
=> MD5 Checksum OK for xc/XFree86-4.5.0-src-1.tgz.
=> MD5 Checksum OK for xc/XFree86-4.5.0-src-2.tgz.
=> MD5 Checksum OK for xc/XFree86-4.5.0-src-3.tgz.
===>  Patching for XFree86-Server-4.5.0_3
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-Imake.rules
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-Imake.tmpl
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-X11.tmpl
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-c2
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-f
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-imake.c
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-texteroids
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-xditview-Imakefile
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-xdm
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-xdm_session.c
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-xf86.tmpl
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-xterm-Imakefile
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-z14
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-z15
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-z34
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-z35
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-z45
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile
===>  Applying extra patch /usr/ports/x11-servers/XFree86-4-Server/../../x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile
===>  Applying FreeBSD patches for XFree86-Server-4.5.0_3
1 out of 2 hunks failed--saving rejects to programs/Xserver/hw/xfree86/common/xf86PciInfo.h.rej
=> Patch patch-programs::Xserver::hw::xfree86::common::xf86PciInfo. failed to apply cleanly.
=> Patch(es) patch-CAN-2005-2495 patch-FreeBSD.cf patch-GL-Imakefile patch-HALlib_bindings.c patch-Imake.cf patch-Pci.h patch-bsdResource.c patch-bus_Imakefile patch-compiler.h patch-drm_Imakefile patch-elfloader.c patch-loader.c patch-mga_driver.c patch-mouse.c patch-os-support_Imakefile applied cleanly.
*** Error code 1

Stop in /usr/ports/x11-servers/XFree86-4-Server.

>How-To-Repeat:
- cvsup to ports tree of June 20th, 2006
- cd /usr/ports/x11-servers/XFree86-4-Server
- make patch
>Fix:

>Release-Note:
>Audit-Trail:
>Unformatted: