← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/vnc4/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/vnc4-build-ppc.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ola Lundqvist
  • Date: 2006-05-15 20:35:17 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060515203517-l4lre1ku942mn26k
Tags: 4.1.1+X4.3.0-10
* Correction of critical security issue. Thanks to Martin Kogler
  <e9925248@student.tuwien.ac.at> that informed me about the issue,
  and provided the patch.
  This flaw was originally found by Steve Wiseman of intelliadmin.com.
* Applied patch from Javier Kohen <jkohen@users.sourceforge.net> that
  inform the user that only 8 first characters of the password will
  actually be used when typing more than 8 characters, closes:
  #355619.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/vnc4-build-ppc.patch
 
1
Package: vnc4
 
2
Version: 4.1.1+X4.3.0-6
 
3
Severity: wishlist
 
4
Tags: patch
 
5
 
 
6
When building 'vnc4' on ppc64/unstable, I get the following error:
 
7
 
 
8
gcc -O2 -fsigned-char    -fno-merge-constants -I../../../programs/Xserver/fb -I../../../programs/Xserver/mi -I../../../programs/Xserver/include               -I../../../exports/include/X11          -I../../../include/fonts -I../../../programs/Xserver/hw/xfree86/common          -I../../../programs/Xserver/render -I../../../include/extensions -I../../../programs/Xserver/Xext  -I../../.. -I../../../exports/include -I/usr/X11R6/include  -Dlinux -D__powerpc__ -D_POSIX_C_SOURCE=199309L                            -D_POSIX_SOURCE -D_XOPEN_SOURCE                                 -D_BSD_SOURCE -D_SVID_SOURCE                             -D_GNU_SOURCE                           -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP       -DXCSECURITY -DTOGCUP   -DXF86BIGFONT -DDPMSExtension     -DPANORAMIX    -DRENDER -DRANDR -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH                                 -DXFreeXDGA -DXvExtension                               -DXFree86LOADER  -DXFree86Server                                -DXF86VIDMODE                           -DXvMCExtension                                                                 -DSMART_SCHEDULE                                -DBUILDDEBUG -DXResExtension                            -DX_BYTE_ORDER=X_BIG_ENDIAN -DNDEBUG  -DFUNCPROTO=15 -DNARROWPROTO  -DIN_MODULE -DXFree86Module    -c fbblt.c
 
9
fbblt.c: In function 'fbBlt':
 
10
fbblt.c:136: error: duplicate case value
 
11
 
 
12
With the attached patch 'vnc4' can be compiled on ppc64.
 
13
 
 
14
Regards
 
15
Andreas Jochens
 
16
 
 
17
diff -urN ../tmp-orig/vnc4-4.1.1+X4.3.0/unix/xc/config/cf/linux.cf ./unix/xc/config/cf/linux.cf
 
18
--- ../tmp-orig/vnc4-4.1.1+X4.3.0/unix/xc/config/cf/linux.cf    2006-04-21 11:53:04.000000000 +0000
 
19
+++ ./unix/xc/config/cf/linux.cf        2006-04-21 09:02:32.000000000 +0000
 
20
@@ -818,7 +818,11 @@
 
21
 # endif
 
22
 # define LinuxMachineDefines   -D__powerpc__
 
23
 # define ServerOSDefines       XFree86ServerOSDefines -DDDXTIME -DPART_NET
 
24
+# ifdef __powerpc64__
 
25
+# define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 
26
+# else
 
27
 # define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines
 
28
+# endif
 
29
 #endif /* PpcArchitecture */
 
30
 
 
31
 #ifdef s390Architecture
 
32
diff -urN ../tmp-orig/vnc4-4.1.1+X4.3.0/unix/xc/include/Xmd.h ./unix/xc/include/Xmd.h
 
33
--- ../tmp-orig/vnc4-4.1.1+X4.3.0/unix/xc/include/Xmd.h 2002-05-31 18:45:39.000000000 +0000
 
34
+++ ./unix/xc/include/Xmd.h     2006-04-21 10:18:20.000000000 +0000
 
35
@@ -60,7 +60,7 @@
 
36
 #endif
 
37
 #if defined(__alpha) || defined(__alpha__) || \
 
38
     defined(__ia64__) || defined(ia64) || \
 
39
-    defined(__sparc64__) || \
 
40
+    defined(__sparc64__) || defined(__powerpc64__) || \
 
41
     defined(__s390x__) || \
 
42
     (defined(__hppa__) && defined(__LP64__)) || \
 
43
     defined(__x86_64__) || defined(x86_64)
 
44
 
 
45