[pkgsrc/pkgsrc-2006Q1]: pkgsrc/x11 Pullup ticket 1538 - requested by tron

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/x11 Pullup ticket 1538 - requested by tron
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:14:52 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/410dd5775204
branches:  pkgsrc-2006Q1
changeset: 510259:410dd5775204
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue May 09 15:09:25 2006 +0000

description:
Pullup ticket 1538 - requested by tron
security fix for xorg

Patch provided by the submitter.

   Module Name:         pkgsrc
   Committed By:        tron
   Date:                Wed May  3 12:23:48 UTC 2006

   Modified Files:
        pkgsrc/x11/xorg-libs: distinfo
        pkgsrc/x11/xorg-server: Makefile
   Added Files:
        pkgsrc/x11/xorg-libs/patches: patch-bh

   Log Message:
   Apply patch to fix vulnerability reported in CVE-2006-1526.
   Bump package revision because of this fix.

diffstat:

 x11/xorg-clients/Makefile       |   7 +++++--
 x11/xorg-imake/Makefile         |   4 ++--
 x11/xorg-imake/distinfo         |   4 ++--
 x11/xorg-imake/patches/patch-ac |  27 ++++++++++++++++++---------
 x11/xorg-libs/Makefile          |   4 ++--
 x11/xorg-libs/buildlink3.mk     |   4 ++--
 x11/xorg-libs/distinfo          |   8 ++++++--
 x11/xorg-libs/patches/patch-ac  |  31 +++++++++++++++++++++++--------
 x11/xorg-libs/patches/patch-bh  |  22 ++++++++++++++++++++++
 x11/xorg-libs/patches/patch-bn  |  13 +++++++++++++
 x11/xorg-libs/patches/patch-bo  |  14 ++++++++++++++
 x11/xorg-libs/patches/patch-bp  |  10 ++++++++++
 x11/xorg-server/Makefile        |  11 +++++------
 13 files changed, 124 insertions(+), 35 deletions(-)

diffs (truncated from 371 to 300 lines):

diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-clients/Makefile
--- a/x11/xorg-clients/Makefile Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-clients/Makefile Tue May 09 15:09:25 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/03/14 20:43:24 jlam Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2006/05/09 15:09:25 salo Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-clients-${XORG_VER}
-PKGREVISION=   5
+PKGREVISION=   7
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG}
 DISTFILES=     X11R${XORG_VER}-src1.tar.gz \
@@ -20,6 +20,9 @@
 XINSTALL_DIRS=         programs fonts/util
 XINSTALL_MAN_DIRS=     programs
 
+USE_TOOLS+=    perl:run
+REPLACE_PERL+= fonts/util/bdftruncate.pl
+
 # XXX TODO: define build's VarDirectory to pkgsrc's VARBASE
 OWN_DIRS=               ${VARBASE}/lib/xdm
 OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir \
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-imake/Makefile   Tue May 09 15:09:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/27 22:58:57 joerg Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2006/05/09 15:09:25 salo Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-imake-${XORG_VER}
@@ -98,7 +98,7 @@
 SUBST_STAGE.thr=       post-patch
 SUBST_FILES.thr=       config/cf/NetBSD.cf.in
 SUBST_SED.thr=         -e 's|@@NETBSD_THREADLIB@@|-DUSE_NBSD_THREADLIB|'
-SUBST_MESSAGE.thr=     "Fixes for threadlib.h."
+SUBST_MESSAGE.thr=     Fixes for threadlib.h.
 .  else
 SUBST_CLASSES+=                nada
 SUBST_STAGE.nada=      post-patch
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo   Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-imake/distinfo   Tue May 09 15:09:25 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/01/19 00:30:55 joerg Exp $
+$NetBSD: distinfo,v 1.18.2.1 2006/05/09 15:09:25 salo Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -8,7 +8,7 @@
 Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 682191f790eddb94917c486ec63818756fee8e8e
+SHA1 (patch-ac) = edd7ae5601783d65bec21b5aaed3fd879bc0ed99
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = f6bff42193905fd3158b3de52bf925b5fb5f002a
 SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-imake/patches/patch-ac
--- a/x11/xorg-imake/patches/patch-ac   Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-imake/patches/patch-ac   Tue May 09 15:09:25 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-ac,v 1.6.2.1 2006/05/09 15:09:25 salo Exp $
 
---- config/cf/NetBSD.cf.in.orig        2005-12-06 10:56:30.000000000 +0100
-+++ config/cf/NetBSD.cf.in     2005-12-06 11:01:02.000000000 +0100
-@@ -126,7 +126,7 @@
+--- config/cf/NetBSD.cf.in.orig        2005-11-30 06:20:06.000000000 +0100
++++ config/cf/NetBSD.cf.in
+@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajor
  # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
        (OSMajorVersion == 2 && OSMinorVersion < 99) || \
        (OSMajorVersion < 2))
@@ -11,7 +11,7 @@
  # endif
  # define SystemMTDefines      -D_REENTRANT
  # define MTSafeAPIDefines     -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajor
  #define MkdirHierCmd          mkdir -p
  
  #undef CcCmd
@@ -20,7 +20,7 @@
  #ifndef DefaultCCOptions
  #if defined(UseInstalled)
  #define DefaultCCOptions      /**/
-@@ -166,7 +166,7 @@
+@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajor
  #endif
  #endif
  
@@ -29,7 +29,7 @@
  #define StandardCppOptions    -traditional
  #define StandardCppDefines    /**/
  #define PreProcessCmd         CcCmd -E
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ XCOMM operating system:  OSName (OSMajor
   * Disabled for NetBSD/vax until I figure out the scheme. --CS 
   */
  #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
@@ -38,7 +38,16 @@
  #  ifndef DoLoadableServer
  #  define DoLoadableServer    YES
  #  endif
-@@ -404,6 +404,10 @@
+@@ -284,6 +284,8 @@ XCOMM operating system:  OSName (OSMajor
+ #  ifndef XFree86ConsoleDefines
+ #    define XFree86ConsoleDefines     -DWSCONS_SUPPORT
+ #  endif
++#elif defined(ia64Architecture) || defined(AMD64Architecture)
++#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #else
+ #  define ServerExtraDefines GccGasOption
+ #endif
+@@ -404,6 +406,10 @@ XCOMM operating system:  OSName (OSMajor
  # endif /* MTRRBuiltin */
  #endif /* i386Architecture */
  
@@ -49,7 +58,7 @@
  /*
   * agpgart support (NetBSD 1.5Y and up)
   */
-@@ -590,7 +594,7 @@
+@@ -590,7 +596,7 @@ InstallManPageAliasesBase(file,destdir,a
  # define BuildXInputLib          YES
  #endif
  
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-libs/Makefile    Tue May 09 15:09:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/12 15:29:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2006/05/09 15:09:25 salo Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
@@ -47,7 +47,7 @@
 SUBST_STAGE.mkstrs=    post-patch
 SUBST_FILES.mkstrs=    config/cf/Library.tmpl
 SUBST_SED.mkstrs=      -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
-SUBST_MESSAGE.mkstrs=  "Fixing path of makestrs."
+SUBST_MESSAGE.mkstrs=  Fixing path of makestrs.
 
 post-install:
        @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-libs/buildlink3.mk
--- a/x11/xorg-libs/buildlink3.mk       Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-libs/buildlink3.mk       Tue May 09 15:09:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/23 23:17:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14.2.1 2006/05/09 15:09:25 salo Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=      ${XORG_LIBS_BUILDLINK3_MK}+
@@ -31,4 +31,4 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-libs/distinfo    Tue May 09 15:09:25 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2006/03/20 21:34:59 joerg Exp $
+$NetBSD: distinfo,v 1.38.2.1 2006/05/09 15:09:25 salo Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -11,7 +11,7 @@
 Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
-SHA1 (patch-ac) = 3fee8b29343e40f81abfc3df7d4ff417efbcaacc
+SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3
 SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a
 SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
@@ -42,5 +42,9 @@
 SHA1 (patch-be) = b9bc7d05429652400343609b123c99c76f64b33a
 SHA1 (patch-bf) = 753c56b84a6859fa4048d88a53f9c04400525d72
 SHA1 (patch-bg) = 3db63fcbe81d9f801ccac6353ad4a213a15c3ffe
+SHA1 (patch-bh) = 9e7e86c9abde02c7c80ddcf5d88e8429b85cd3a6
 SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec
 SHA1 (patch-bm) = f9b73b7c1bd7d6d6db6d23741d5d1125eea5f860
+SHA1 (patch-bn) = 58049eb799b469b70b5a2c611b8aef37a5631c0c
+SHA1 (patch-bo) = fd34e4c71756f17294aeab63db1f15090b3edc1b
+SHA1 (patch-bp) = 6bf5252ceeefb2a59cfa16b7375bba61f4867d01
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-libs/patches/patch-ac
--- a/x11/xorg-libs/patches/patch-ac    Sat May 06 16:30:23 2006 +0000
+++ b/x11/xorg-libs/patches/patch-ac    Tue May 09 15:09:25 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $
+$NetBSD: patch-ac,v 1.8.2.1 2006/05/09 15:09:25 salo Exp $
 
---- config/cf/NetBSD.cf.in.orig        2005-12-06 10:56:30.000000000 +0100
-+++ config/cf/NetBSD.cf.in     2005-12-06 11:01:02.000000000 +0100
+--- config/cf/NetBSD.cf.in.orig        2006-04-28 23:09:24.000000000 +0200
++++ config/cf/NetBSD.cf.in
 @@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajor
  # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
        (OSMajorVersion == 2 && OSMinorVersion < 99) || \
@@ -38,7 +38,7 @@
  #  ifndef DoLoadableServer
  #  define DoLoadableServer    YES
  #  endif
-@@ -240,16 +240,19 @@ XCOMM operating system:  OSName (OSMajor
+@@ -240,17 +240,24 @@ XCOMM operating system:  OSName (OSMajor
  #   define ServerOSDefines    XFree86ServerOSDefines -DDDXTIME
  # elif defined(PpcArchitecture)
  #  define ServerOSDefines     XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
@@ -56,11 +56,26 @@
  # endif
  #endif
 -#ifdef i386Architecture
+-# define ServerExtraDefines GccGasOption XFree86ServerDefines
 +#if defined(i386Architecture) || defined(AMD64Architecture)
- # define ServerExtraDefines GccGasOption XFree86ServerDefines
++#  if defined(AMD64Architecture)
++#   define ServerExtraDefines XFree86ServerDefines -D_XSERVER64
++#  else
++#   define ServerExtraDefines GccGasOption XFree86ServerDefines
++#  endif
  # ifndef XFree86ConsoleDefines
  #  if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \
-@@ -404,6 +407,10 @@ XCOMM operating system:  OSName (OSMajor
+                              || OSMinorVersion >= 4) \
+@@ -284,6 +291,8 @@ XCOMM operating system:  OSName (OSMajor
+ #  ifndef XFree86ConsoleDefines
+ #    define XFree86ConsoleDefines     -DWSCONS_SUPPORT
+ #  endif
++#elif defined(ia64Architecture)
++#  define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #else
+ #  define ServerExtraDefines GccGasOption
+ #endif
+@@ -404,6 +413,10 @@ XCOMM operating system:  OSName (OSMajor
  # endif /* MTRRBuiltin */
  #endif /* i386Architecture */
  
@@ -71,7 +86,7 @@
  /*
   * agpgart support (NetBSD 1.5Y and up)
   */
-@@ -420,7 +427,7 @@ XCOMM operating system:  OSName (OSMajor
+@@ -420,7 +433,7 @@ XCOMM operating system:  OSName (OSMajor
   * MMX, SSE and 3DNow will be autodetected. NetBSD 1.6 and up have the
   * necessary kernel and toolchain support.
   */
@@ -80,7 +95,7 @@
        ((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5))
  # define HasX86Support          YES
  # define HasMMXSupport          YES
-@@ -590,7 +597,7 @@ InstallManPageAliasesBase(file,destdir,a
+@@ -590,7 +603,7 @@ InstallManPageAliasesBase(file,destdir,a
  # define BuildXInputLib          YES
  #endif
  
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-libs/patches/patch-bh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-bh    Tue May 09 15:09:25 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-bh,v 1.2.2.1 2006/05/09 15:09:25 salo Exp $
+
+--- programs/Xserver/render/mitri.c.orig       2005-07-03 08:02:08.000000000 +0100
++++ programs/Xserver/render/mitri.c    2006-05-03 11:59:48.000000000 +0100
+@@ -145,7 +145,7 @@
+     if (npoint < 3)
+       return;
+     ntri = npoint - 2;
+-    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
++    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+     if (!tris)
+       return;
+     for (tri = tris; npoint >= 3; npoint--, points++, tri++)
+@@ -177,7 +177,7 @@
+     if (npoint < 3)
+       return;
+     ntri = npoint - 2;
+-    tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
++    tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+     if (!tris)
+       return;
+     first = points++;
diff -r 7e439323ef0a -r 410dd5775204 x11/xorg-libs/patches/patch-bn
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-bn    Tue May 09 15:09:25 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-bn,v 1.3.2.1 2006/05/09 15:09:25 salo Exp $
+
+--- programs/xfs/Imakefile.orig        2006-04-12 21:45:29.000000000 +0000
++++ programs/xfs/Imakefile
+@@ -51,8 +51,6 @@ ServerTarget(xfs,$(FSDIRS),NullParameter
+ ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(FSSYSLIBS) $(EXTRA_LIBRARIES))
+ #endif
+ 
+-LinkConfDirectory(fs,.,fs,.)
Prev by Date: [pkgsrc/trunk]: pkgsrc Update gnome-vfs2, gnome-vfs2-cdda and gnome-vfs2-smb ...
Next by Date: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/doc #1538
Previous by Thread: [pkgsrc/trunk]: pkgsrc Update gnome-vfs2, gnome-vfs2-cdda and gnome-vfs2-smb ...
Next by Thread: [pkgsrc/pkgsrc-2006Q1]: pkgsrc/doc #1538
Indexes:
Home | Main Index | Thread Index | Old Index