summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2006-08-23 23:30:32 +0000
committersalo <salo@pkgsrc.org>2006-08-23 23:30:32 +0000
commitc03aeffcaaa7344c8ac1474f84cb6dc2de8d8079 (patch)
tree7d3b257d809dc71a779cf16a9c3697f7172af8c8 /x11
parentf5c4566f451a054d8b0f6ea4bdc3af3d6c22d19d (diff)
downloadpkgsrc-c03aeffcaaa7344c8ac1474f84cb6dc2de8d8079.tar.gz
Pullup ticket 1804 - requested by joerg
security fix and sync with HEAD for xorg Revisions pulled up: - pkgsrc/meta-pkgs/xorg/Makefile.common 1.41, 1.42 - pkgsrc/x11/xorg-imake/Makefile 1.29, 1.30 - pkgsrc/x11/xorg-imake/distinfo 1.21 - pkgsrc/x11/xorg-imake/patches/patch-ac 1.8 - pkgsrc/x11/xorg-libs/Makefile 1.37, 1.39, 1.40, 1.41 - pkgsrc/x11/xorg-libs/PLIST 1.8, 1.9, 1.10 - pkgsrc/x11/xorg-libs/distinfo 1.48, 1.49, 1.50, 1.51, 1.52 - pkgsrc/x11/xorg-libs/patches/patch-ac 1.10 - pkgsrc/x11/xorg-libs/patches/patch-ad 1.6 - pkgsrc/x11/xorg-libs/patches/patch-au 1.3 - pkgsrc/x11/xorg-libs/patches/patch-bq 1.1 - pkgsrc/x11/xorg-libs/patches/patch-br 1.1 - pkgsrc/x11/xorg-server/Makefile 1.45 Module Name: pkgsrc Committed By: rillig Date: Tue Jul 4 09:20:18 UTC 2006 Modified Files: pkgsrc/meta-pkgs/xorg: Makefile.common Log Message: Made a SUBST block much simpler. --- Module Name: pkgsrc Committed By: joerg Date: Mon Jul 17 17:06:59 UTC 2006 Modified Files: pkgsrc/x11/xorg-imake: Makefile Log Message: Since mkhtmlindex is now a Perl script, depend on Perl and replace the interpreter. Bump revision. --- Module Name: pkgsrc Committed By: minskim Date: Sun Jul 23 15:45:36 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: Makefile distinfo pkgsrc/x11/xorg-libs/patches: patch-au Log Message: Make this package build on platforms without native zlib by including zlib's buildlink3.mk. Thanks to Joerg Sonnenberger for review. --- Module Name: pkgsrc Committed By: minskim Date: Sun Jul 23 16:54:20 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: PLIST Log Message: Add missing entries for Linux. Approved by the maintainer. --- Module Name: pkgsrc Committed By: joerg Date: Mon Jul 24 14:11:13 UTC 2006 Modified Files: pkgsrc/meta-pkgs/xorg: Makefile.common pkgsrc/x11/xorg-libs: Makefile Log Message: Move zlib SUBST magic to Makefile.common, it is always needed. Fixes problems found by abs@ --- Module Name: pkgsrc Committed By: minskim Date: Mon Jul 24 22:00:47 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: PLIST distinfo pkgsrc/x11/xorg-libs/patches: patch-ad Log Message: Set ForceNormalLib and SharedFontLib to YES regardless of Linux distribution, so that the same set of libraries are built on every Linux distribution. Thanks to Joerg Sonnenberger for guide and review. --- Module Name: pkgsrc Committed By: minskim Date: Wed Jul 26 16:02:21 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: Makefile PLIST Log Message: Add a missing file on Linux. Bump PKGREVISION. -- Module Name: pkgsrc Committed By: joerg Date: Mon Jul 31 16:39:42 UTC 2006 Modified Files: pkgsrc/x11/xorg-imake: Makefile distinfo pkgsrc/x11/xorg-imake/patches: patch-ac pkgsrc/x11/xorg-libs: Makefile distinfo pkgsrc/x11/xorg-libs/patches: patch-ac Log Message: Don't drop -fno-strict-aliasing on NetBSD/!i386. Fixes PR 34099. Bump revision of xorg-imake and xorg-libs. --- Module Name: pkgsrc Committed By: joerg Date: Mon Aug 14 09:54:39 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: distinfo Added Files: pkgsrc/x11/xorg-libs/patches: patch-bq Log Message: Don't install os.h and misc.h in server builds, it would override files from xorg-libs. --- Module Name: pkgsrc Committed By: joerg Date: Tue Aug 22 18:12:14 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: Makefile distinfo pkgsrc/x11/xorg-server: Makefile Log Message: Fix SA21450 using patch from Xorg CVS. Bump revisions of xorg-libs and xorg-server. --- Module Name: pkgsrc Committed By: joerg Date: Wed Aug 23 00:11:08 UTC 2006 Added Files: pkgsrc/x11/xorg-libs/patches: patch-br Log Message: Actually add the patch as well.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-imake/Makefile7
-rw-r--r--x11/xorg-imake/distinfo4
-rw-r--r--x11/xorg-imake/patches/patch-ac20
-rw-r--r--x11/xorg-libs/Makefile5
-rw-r--r--x11/xorg-libs/PLIST52
-rw-r--r--x11/xorg-libs/distinfo10
-rw-r--r--x11/xorg-libs/patches/patch-ac20
-rw-r--r--x11/xorg-libs/patches/patch-ad34
-rw-r--r--x11/xorg-libs/patches/patch-au13
-rw-r--r--x11/xorg-libs/patches/patch-bq14
-rw-r--r--x11/xorg-libs/patches/patch-br103
-rw-r--r--x11/xorg-server/Makefile4
12 files changed, 260 insertions, 26 deletions
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 6c5c9d08acd..508118b7b22 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/06/12 00:36:25 joerg Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2006/08/23 23:30:32 salo Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
-PKGREVISION= 2
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
@@ -17,6 +17,9 @@ USE_DIRS+= xorg-1.1
INSTALL_TARGET= install install.man
NO_XORG_TARGETS= yes
+USE_TOOLS+= perl:run
+REPLACE_PERL+= config/util/mkhtmlindex.pl
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 03b2faa83de..7d12fddbf06 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2006/06/12 00:36:25 joerg Exp $
+$NetBSD: distinfo,v 1.20.2.1 2006/08/23 23:30:32 salo Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -8,7 +8,7 @@ RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = edd7ae5601783d65bec21b5aaed3fd879bc0ed99
+SHA1 (patch-ac) = 9df1808bf84dbb78130287d69d619ca4359d3f47
SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
SHA1 (patch-ae) = 33233761a745b4c62cf64855a5d9c196cd679cf2
SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index c445113ae29..e3cf47a1401 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
+$NetBSD: patch-ac,v 1.7.2.1 2006/08/23 23:30:32 salo Exp $
--- config/cf/NetBSD.cf.in.orig 2005-11-30 06:20:06.000000000 +0100
+++ config/cf/NetBSD.cf.in
@@ -38,6 +38,15 @@ $NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
+@@ -231,7 +231,7 @@ XCOMM operating system: OSName (OSMajor
+ # define ServerExtraSysLibs -li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags -O2
++# define OptimizedCDebugFlags -O2 GccAliasingArgs
+ # if defined(SparcArchitecture)
+ # define ServerOSDefines -DDDXOSINIT
+ # elif defined(AlphaArchitecture)
@@ -284,6 +284,8 @@ XCOMM operating system: OSName (OSMajor
# ifndef XFree86ConsoleDefines
# define XFree86ConsoleDefines -DWSCONS_SUPPORT
@@ -67,3 +76,12 @@ $NetBSD: patch-ac,v 1.7 2006/04/28 21:52:19 joerg Exp $
# include <xorg.cf>
#endif
+@@ -651,7 +664,7 @@ sed 's/\.[0-9]*$$//'`
+ */
+ #ifdef PpcArchitecture
+
+-# define OptimizedCDebugFlags -O2
++# define OptimizedCDebugFlags -O2 GccAliasingArgs
+ # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
+
+ # ifndef DoLoadableServer
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 431fa17a2b8..50ea4050815 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/06/12 00:36:25 joerg Exp $
+# $NetBSD: Makefile,v 1.36.2.1 2006/08/23 23:30:32 salo Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
-PKGREVISION= 4
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
@@ -66,6 +66,7 @@ pre-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
.endfor
+.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
diff --git a/x11/xorg-libs/PLIST b/x11/xorg-libs/PLIST
index b9e76251543..90fb7f95adc 100644
--- a/x11/xorg-libs/PLIST
+++ b/x11/xorg-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/06/12 00:36:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7.2.1 2006/08/23 23:30:32 salo Exp $
${X11ROOT_PREFIX}/include/DPS/ColorSB.h
${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -984,21 +984,27 @@ ${X11ROOT_PREFIX}/lib/libXprintUtil.a
@comment begin Linux
${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
+${X11ROOT_PREFIX}/lib/libFS.a
${X11ROOT_PREFIX}/lib/libFS.so
${X11ROOT_PREFIX}/lib/libFS.so.6
${X11ROOT_PREFIX}/lib/libFS.so.6.0
+${X11ROOT_PREFIX}/lib/libGL.a
${X11ROOT_PREFIX}/lib/libGL.so
${X11ROOT_PREFIX}/lib/libGL.so.1
${X11ROOT_PREFIX}/lib/libGL.so.1.2
+${X11ROOT_PREFIX}/lib/libGLU.a
${X11ROOT_PREFIX}/lib/libGLU.so
${X11ROOT_PREFIX}/lib/libGLU.so.1
${X11ROOT_PREFIX}/lib/libGLU.so.1.3
+${X11ROOT_PREFIX}/lib/libGLw.a
${X11ROOT_PREFIX}/lib/libGLw.so
${X11ROOT_PREFIX}/lib/libGLw.so.1
${X11ROOT_PREFIX}/lib/libGLw.so.1.0
+${X11ROOT_PREFIX}/lib/libI810XvMC.a
${X11ROOT_PREFIX}/lib/libI810XvMC.so
${X11ROOT_PREFIX}/lib/libI810XvMC.so.1
${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libICE.a
${X11ROOT_PREFIX}/lib/libICE.so
${X11ROOT_PREFIX}/lib/libICE.so.6
${X11ROOT_PREFIX}/lib/libICE.so.6.4
@@ -1006,15 +1012,19 @@ ${X11ROOT_PREFIX}/lib/libOSMesa.a
${X11ROOT_PREFIX}/lib/libOSMesa.so
${X11ROOT_PREFIX}/lib/libOSMesa.so.4
${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
${X11ROOT_PREFIX}/lib/libSM.so
${X11ROOT_PREFIX}/lib/libSM.so.6
${X11ROOT_PREFIX}/lib/libSM.so.6.0
+${X11ROOT_PREFIX}/lib/libX11.a
${X11ROOT_PREFIX}/lib/libX11.so
${X11ROOT_PREFIX}/lib/libX11.so.6
${X11ROOT_PREFIX}/lib/libX11.so.6.2
+${X11ROOT_PREFIX}/lib/libXRes.a
${X11ROOT_PREFIX}/lib/libXRes.so
${X11ROOT_PREFIX}/lib/libXRes.so.1
${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXTrap.a
${X11ROOT_PREFIX}/lib/libXTrap.so
${X11ROOT_PREFIX}/lib/libXTrap.so.6
${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
@@ -1022,6 +1032,7 @@ ${X11ROOT_PREFIX}/lib/libXau.a
${X11ROOT_PREFIX}/lib/libXau.so
${X11ROOT_PREFIX}/lib/libXau.so.6
${X11ROOT_PREFIX}/lib/libXau.so.6.0
+${X11ROOT_PREFIX}/lib/libXaw.a
${X11ROOT_PREFIX}/lib/libXaw.so
${X11ROOT_PREFIX}/lib/libXaw.so.6
${X11ROOT_PREFIX}/lib/libXaw.so.6.1
@@ -1029,7 +1040,7 @@ ${X11ROOT_PREFIX}/lib/libXaw.so.7
${X11ROOT_PREFIX}/lib/libXaw.so.7.0
${X11ROOT_PREFIX}/lib/libXaw.so.8
${X11ROOT_PREFIX}/lib/libXaw.so.8.0
-${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
${X11ROOT_PREFIX}/lib/libXext.so
${X11ROOT_PREFIX}/lib/libXext.so.6
${X11ROOT_PREFIX}/lib/libXext.so.6.4
@@ -1037,84 +1048,121 @@ ${X11ROOT_PREFIX}/lib/libXfont.a
${X11ROOT_PREFIX}/lib/libXfont.so
${X11ROOT_PREFIX}/lib/libXfont.so.1
${X11ROOT_PREFIX}/lib/libXfont.so.1.5
+${X11ROOT_PREFIX}/lib/libXi.a
${X11ROOT_PREFIX}/lib/libXi.so
${X11ROOT_PREFIX}/lib/libXi.so.6
${X11ROOT_PREFIX}/lib/libXi.so.6.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
${X11ROOT_PREFIX}/lib/libXinerama.so
${X11ROOT_PREFIX}/lib/libXinerama.so.1
${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXcomposite.a
${X11ROOT_PREFIX}/lib/libXcomposite.so
${X11ROOT_PREFIX}/lib/libXcomposite.so.1
${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.a
${X11ROOT_PREFIX}/lib/libXdamage.so
${X11ROOT_PREFIX}/lib/libXdamage.so.1
${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
${X11ROOT_PREFIX}/lib/libXdmcp.so
${X11ROOT_PREFIX}/lib/libXdmcp.so.6
${X11ROOT_PREFIX}/lib/libXdmcp.so.6.0
+${X11ROOT_PREFIX}/lib/libXevie.a
${X11ROOT_PREFIX}/lib/libXevie.so
${X11ROOT_PREFIX}/lib/libXevie.so.1
${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXfixes.a
${X11ROOT_PREFIX}/lib/libXfixes.so
${X11ROOT_PREFIX}/lib/libXfixes.so.3
${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
${X11ROOT_PREFIX}/lib/libXprintUtil.a
${X11ROOT_PREFIX}/lib/libdmx.a
+${X11ROOT_PREFIX}/lib/libXmu.a
${X11ROOT_PREFIX}/lib/libXmu.so
${X11ROOT_PREFIX}/lib/libXmu.so.6
${X11ROOT_PREFIX}/lib/libXmu.so.6.2
+${X11ROOT_PREFIX}/lib/libXmuu.a
${X11ROOT_PREFIX}/lib/libXmuu.so
${X11ROOT_PREFIX}/lib/libXmuu.so.1
${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
+${X11ROOT_PREFIX}/lib/libXp.a
${X11ROOT_PREFIX}/lib/libXp.so
${X11ROOT_PREFIX}/lib/libXp.so.6
${X11ROOT_PREFIX}/lib/libXp.so.6.2
+${X11ROOT_PREFIX}/lib/libXpm.a
${X11ROOT_PREFIX}/lib/libXpm.so
${X11ROOT_PREFIX}/lib/libXpm.so.4
${X11ROOT_PREFIX}/lib/libXpm.so.4.11
+${X11ROOT_PREFIX}/lib/libXss.a
${X11ROOT_PREFIX}/lib/libXss.so
${X11ROOT_PREFIX}/lib/libXss.so.1
${X11ROOT_PREFIX}/lib/libXss.so.1.0
+${X11ROOT_PREFIX}/lib/libXt.a
${X11ROOT_PREFIX}/lib/libXt.so
${X11ROOT_PREFIX}/lib/libXt.so.6
${X11ROOT_PREFIX}/lib/libXt.so.6.0
+${X11ROOT_PREFIX}/lib/libXtst.a
${X11ROOT_PREFIX}/lib/libXtst.so
${X11ROOT_PREFIX}/lib/libXtst.so.6
${X11ROOT_PREFIX}/lib/libXtst.so.6.1
+${X11ROOT_PREFIX}/lib/libXv.a
${X11ROOT_PREFIX}/lib/libXv.so
${X11ROOT_PREFIX}/lib/libXv.so.1
${X11ROOT_PREFIX}/lib/libXv.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
${X11ROOT_PREFIX}/lib/libXvMC.so
${X11ROOT_PREFIX}/lib/libXvMC.so.1
${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMCW.a
+${X11ROOT_PREFIX}/lib/libXvMCW.so
+${X11ROOT_PREFIX}/lib/libXvMCW.so.1
+${X11ROOT_PREFIX}/lib/libXvMCW.so.1.0
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.a
${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so
${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
${X11ROOT_PREFIX}/lib/libXxf86misc.so
${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
+${X11ROOT_PREFIX}/lib/libXxf86rush.a
${X11ROOT_PREFIX}/lib/libXxf86rush.so
${X11ROOT_PREFIX}/lib/libXxf86rush.so.1
${X11ROOT_PREFIX}/lib/libXxf86rush.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
${X11ROOT_PREFIX}/lib/libXxf86vm.so
${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
+${X11ROOT_PREFIX}/lib/libdps.a
${X11ROOT_PREFIX}/lib/libdps.so
${X11ROOT_PREFIX}/lib/libdps.so.1
${X11ROOT_PREFIX}/lib/libdps.so.1.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
${X11ROOT_PREFIX}/lib/libdpstk.so
${X11ROOT_PREFIX}/lib/libdpstk.so.1
${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
${X11ROOT_PREFIX}/lib/libfontenc.so
${X11ROOT_PREFIX}/lib/libfontenc.so.1
${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/libviaXvMC.a
+${X11ROOT_PREFIX}/lib/libviaXvMC.so
+${X11ROOT_PREFIX}/lib/libviaXvMC.so.1
+${X11ROOT_PREFIX}/lib/libviaXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libviaXvMCPro.a
+${X11ROOT_PREFIX}/lib/libviaXvMCPro.so
+${X11ROOT_PREFIX}/lib/libviaXvMCPro.so.1
+${X11ROOT_PREFIX}/lib/libviaXvMCPro.so.1.0
${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
${X11ROOT_PREFIX}/lib/libxkbfile.so
${X11ROOT_PREFIX}/lib/libxkbfile.so.1
${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
${X11ROOT_PREFIX}/lib/libxkbui.so
${X11ROOT_PREFIX}/lib/libxkbui.so.1
${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 6201929efd3..1850423592f 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46.2.1 2006/08/10 07:54:21 ghen Exp $
+$NetBSD: distinfo,v 1.46.2.2 2006/08/23 23:30:32 salo Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -11,8 +11,8 @@ RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
-SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3
-SHA1 (patch-ad) = 33233761a745b4c62cf64855a5d9c196cd679cf2
+SHA1 (patch-ac) = 4b64af7f360836589943ec229247357033e883fa
+SHA1 (patch-ad) = 8b803d38021a0762e503c445a302f133e5c1f3b1
SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
SHA1 (patch-ag) = d300aa92052bdfe13e799223cf055c7955e7bb8f
@@ -29,7 +29,7 @@ SHA1 (patch-aq) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
SHA1 (patch-ar) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4
SHA1 (patch-as) = 492de38023ab7babebe0db8ab700d76e5f2b8a8b
SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd
-SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151
+SHA1 (patch-au) = 8c4062d46c817b80bb0ca85821f6c69dc9947f84
SHA1 (patch-av) = bfcdb21557e8e6f8c24399ad0077b75d4a5215c6
SHA1 (patch-aw) = f9bc393bb6867cd5e2ed54ce7e84ddfb4837785b
SHA1 (patch-ax) = 582b2b9d8f0f8316b9e2b5528cd14753df1f4bdf
@@ -51,6 +51,8 @@ SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860
SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c
SHA1 (patch-bo) = fd34e4c71756f17294aeab63db1f15090b3edc1b
SHA1 (patch-bp) = 6bf5252ceeefb2a59cfa16b7375bba61f4867d01
+SHA1 (patch-bq) = 8e8f9a634b80b10dae7d79faaf1684cc9d8c1fa8
+SHA1 (patch-br) = d64c6408126daf25e900a63a07c1282c719eaaab
SHA1 (patch-ca) = 8a2a46defa2f62917128a0aaaf946cda8a169892
SHA1 (patch-cb) = 96e00c680acbafa3665ccae650a513daea3c2a01
SHA1 (patch-cc) = d5d72e525f9564eda7f2ea21ddb179800fb153b5
diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac
index 9a1c93aec0c..1d8f2c59df1 100644
--- a/x11/xorg-libs/patches/patch-ac
+++ b/x11/xorg-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
+$NetBSD: patch-ac,v 1.9.2.1 2006/08/23 23:30:32 salo Exp $
--- config/cf/NetBSD.cf.in.orig 2006-04-28 23:09:24.000000000 +0200
+++ config/cf/NetBSD.cf.in
@@ -38,6 +38,15 @@ $NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
+@@ -231,7 +231,7 @@ XCOMM operating system: OSName (OSMajor
+ # define ServerExtraSysLibs -li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags -O2
++# define OptimizedCDebugFlags -O2 GccAliasingArgs
+ # if defined(SparcArchitecture)
+ # define ServerOSDefines -DDDXOSINIT
+ # elif defined(AlphaArchitecture)
@@ -240,17 +240,24 @@ XCOMM operating system: OSName (OSMajor
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# elif defined(PpcArchitecture)
@@ -104,3 +113,12 @@ $NetBSD: patch-ac,v 1.9 2006/04/28 21:52:19 joerg Exp $
# include <xorg.cf>
#endif
+@@ -651,7 +664,7 @@ sed 's/\.[0-9]*$$//'`
+ */
+ #ifdef PpcArchitecture
+
+-# define OptimizedCDebugFlags -O2
++# define OptimizedCDebugFlags -O2 GccAliasingArgs
+ # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
+
+ # ifndef DoLoadableServer
diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad
index b977fd8ae8a..1b668ece4ad 100644
--- a/x11/xorg-libs/patches/patch-ad
+++ b/x11/xorg-libs/patches/patch-ad
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
+$NetBSD: patch-ad,v 1.5.2.1 2006/08/23 23:30:32 salo Exp $
---- config/cf/linux.cf.in.orig 2005-12-06 11:06:50.000000000 +0100
-+++ config/cf/linux.cf.in 2005-12-06 11:09:08.000000000 +0100
-@@ -609,10 +609,10 @@
+--- config/cf/linux.cf.in.orig 2005-10-21 19:10:27.000000000 +0000
++++ config/cf/linux.cf.in
+@@ -94,6 +94,9 @@ XCOMM operating system: OSName (OSMajor
+ XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
+ XCOMM binutils: (LinuxBinUtilsMajorVersion)
+
++#define ForceNormalLib YES
++#define SharedLibFont YES
++
+ #if LinuxDistribution == LinuxDebian
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ # define SystemManDirectory /usr/share/man
+@@ -116,7 +119,6 @@ InstallNamedTargetNoClobber(install,file
+ # define SharedLibXdmGreet NO
+ # define LinkGLToUsrInclude NO
+ # define LinkGLToUsrLib NO
+-# define SharedLibFont NO
+ # define SharedLibGlu YES
+ # define NormalLibGlu YES
+ # define FSUseSyslog YES
+@@ -609,10 +611,10 @@ InstallNamedTargetNoClobber(install,file
# if defined (i386Architecture) && ((GccMajorVersion >3) \
|| ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
# ifndef CcCmd
@@ -15,7 +33,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
# endif
# endif
# if defined (Ppc64Architecture)
-@@ -624,8 +624,8 @@
+@@ -624,8 +626,8 @@ InstallNamedTargetNoClobber(install,file
# endif
# endif
# ifndef CcCmd
@@ -26,7 +44,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
# endif
# ifndef AsCmd
# define AsCmd CcCmd -c -x assembler
-@@ -779,7 +779,6 @@
+@@ -779,7 +781,6 @@ InstallNamedTargetNoClobber(install,file
#define YaccCmd bison -y
#define LexCmd flex -l
#define HasFlex YES
@@ -34,7 +52,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
#define PreProcessCmd CcCmd -E
#define PostIncDir DefaultGccIncludeDir
#define LdCombineFlags -r
-@@ -853,7 +852,7 @@
+@@ -853,7 +854,7 @@ InstallNamedTargetNoClobber(install,file
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -43,7 +61,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file
+@@ -1053,9 +1054,6 @@ InstallNamedTargetNoClobber(install,file
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#if HaveLib64
diff --git a/x11/xorg-libs/patches/patch-au b/x11/xorg-libs/patches/patch-au
index 6718ed7cac9..53123dfcf4d 100644
--- a/x11/xorg-libs/patches/patch-au
+++ b/x11/xorg-libs/patches/patch-au
@@ -1,7 +1,16 @@
-$NetBSD: patch-au,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-au,v 1.2.4.1 2006/08/23 23:30:32 salo Exp $
---- config/cf/Imake.tmpl.orig 2006-01-06 16:13:36.000000000 +0000
+--- config/cf/Imake.tmpl.orig 2005-11-07 22:33:24.000000000 -0800
+++ config/cf/Imake.tmpl
+@@ -596,7 +596,7 @@ XCOMM deprecated; please strongly consid
+ #undef GzipLibrary /* GzipLibrary was valid only if HasZlib */
+ #endif
+ #ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */
+-#define GzipLibrary -lz
++#define GzipLibrary -L@ZLIBDIR@ @COMPILER_RPATH_FLAG@@ZLIBDIR@ -lz
+ #endif
+ /* If the system has the Freetype2 library - if NO, the copy in extras is built */
+ #ifndef HasFreetype2
@@ -1965,7 +1965,11 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS)
#if HasGcc
diff --git a/x11/xorg-libs/patches/patch-bq b/x11/xorg-libs/patches/patch-bq
new file mode 100644
index 00000000000..5309c94cfcb
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bq
@@ -0,0 +1,14 @@
+$NetBSD: patch-bq,v 1.1.2.2 2006/08/23 23:30:32 salo Exp $
+
+--- programs/Xserver/include/Imakefile.orig 2006-08-14 08:07:51.000000000 +0000
++++ programs/Xserver/include/Imakefile
+@@ -5,7 +5,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17
+
+ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 dawes Exp $
+
++#if !BuildServer
+ HEADERS = os.h misc.h
++#endif
+
+ #if defined(XorgVersion) || defined(XFree86Version) \
+ || defined(BSDOSArchitecture)
diff --git a/x11/xorg-libs/patches/patch-br b/x11/xorg-libs/patches/patch-br
new file mode 100644
index 00000000000..1beec08c6fa
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-br
@@ -0,0 +1,103 @@
+$NetBSD: patch-br,v 1.1.2.2 2006/08/23 23:30:32 salo Exp $
+
+--- lib/font/bitmap/pcfread.c.orig 2005-07-09 08:36:12.000000000 +0200
++++ lib/font/bitmap/pcfread.c
+@@ -45,6 +45,7 @@ from The Open Group.
+ #endif
+
+ #include <stdarg.h>
++#include <stdint.h>
+
+ void
+ pcfError(const char* message, ...)
+@@ -133,6 +134,10 @@ pcfReadTOC(FontFilePtr file, int *countp
+ return (PCFTablePtr) NULL;
+ count = pcfGetLSB32(file);
+ if (IS_EOF(file)) return (PCFTablePtr) NULL;
++ if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
++ pcfError("pcfReadTOC(): invalid file format\n");
++ return NULL;
++ }
+ tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
+ if (!tables) {
+ pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
+@@ -252,6 +257,10 @@ pcfGetProperties(FontInfoPtr pFontInfo,
+ if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
+ goto Bail;
+ nprops = pcfGetINT32(file, format);
++ if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
++ pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
++ goto Bail;
++ }
+ if (IS_EOF(file)) goto Bail;
+ props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
+ if (!props) {
+@@ -267,6 +276,13 @@ pcfGetProperties(FontInfoPtr pFontInfo,
+ props[i].name = pcfGetINT32(file, format);
+ isStringProp[i] = pcfGetINT8(file, format);
+ props[i].value = pcfGetINT32(file, format);
++ if (props[i].name < 0
++ || (isStringProp[i] != 0 && isStringProp[i] != 1)
++ || (isStringProp[i] && props[i].value < 0)) {
++ pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
++ props[i].name, isStringProp[i], props[i].value);
++ goto Bail;
++ }
+ if (IS_EOF(file)) goto Bail;
+ }
+ /* pad the property array */
+@@ -282,6 +298,7 @@ pcfGetProperties(FontInfoPtr pFontInfo,
+ }
+ if (IS_EOF(file)) goto Bail;
+ string_size = pcfGetINT32(file, format);
++ if (string_size < 0) goto Bail;
+ if (IS_EOF(file)) goto Bail;
+ strings = (char *) xalloc(string_size);
+ if (!strings) {
+@@ -422,6 +439,10 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
+ else
+ nmetrics = pcfGetINT16(file, format);
+ if (IS_EOF(file)) goto Bail;
++ if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
++ pcfError("pcfReadFont(): invalid file format\n");
++ goto Bail;
++ }
+ metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
+ if (!metrics) {
+ pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
+@@ -447,7 +468,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
+ nbitmaps = pcfGetINT32(file, format);
+ if (nbitmaps != nmetrics || IS_EOF(file))
+ goto Bail;
+-
++ /* nmetrics is alreadt ok, so nbitmap also is */
+ offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
+ if (!offsets) {
+ pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
+@@ -461,6 +482,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
+ for (i = 0; i < GLYPHPADOPTIONS; i++) {
+ bitmapSizes[i] = pcfGetINT32(file, format);
+ if (IS_EOF(file)) goto Bail;
++ if (bitmapSizes[i] < 0) goto Bail;
+ }
+
+ sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
+@@ -536,6 +558,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr f
+ if (IS_EOF(file)) goto Bail;
+ if (nink_metrics != nmetrics)
+ goto Bail;
++ /* nmetrics already checked */
+ ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
+ if (!ink_metrics) {
+ pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));
+@@ -809,6 +832,10 @@ pmfReadFont(FontPtr pFont, FontFilePtr f
+ else
+ nmetrics = pcfGetINT16(file, format);
+ if (IS_EOF(file)) goto Bail;
++ if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
++ pcfError("pmfReadFont(): invalid file format\n");
++ goto Bail;
++ }
+ metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
+ if (!metrics) {
+ pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index e6a14ae4f2d..b182d039f0f 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2006/06/17 12:33:53 markd Exp $
+# $NetBSD: Makefile,v 1.44.2.1 2006/08/23 23:30:32 salo Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 07:14:14 +0000