Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/tigervnc/patches/tigervnc-1.4.2-rh692048.patch

    Contents of /trunk/tigervnc/patches/tigervnc-1.4.2-rh692048.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2533 - (show annotations) (download)
    Fri Jan 30 09:59:24 2015 UTC (9 years, 3 months ago) by niro
    File size: 1628 byte(s) 
    -rediffed against 1.4.2
    1 diff -Naur tigervnc-1.4.2/common/rfb/SecurityClient.cxx tigervnc-1.4.2-magellan/common/rfb/SecurityClient.cxx
    2 --- tigervnc-1.4.2/common/rfb/SecurityClient.cxx 2015-01-24 00:37:23.000000000 +0100
    3 +++ tigervnc-1.4.2-magellan/common/rfb/SecurityClient.cxx 2015-01-30 12:52:24.540931780 +0100
    4 @@ -49,7 +49,7 @@
    5 #endif
    6 ")",
    7 #ifdef HAVE_GNUTLS
    8 - "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
    9 + "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
    10 #else
    11 "VncAuth,None",
    12 #endif
    13 diff -Naur tigervnc-1.4.2/common/rfb/Security.cxx tigervnc-1.4.2-magellan/common/rfb/Security.cxx
    14 --- tigervnc-1.4.2/common/rfb/Security.cxx 2015-01-24 00:37:23.000000000 +0100
    15 +++ tigervnc-1.4.2-magellan/common/rfb/Security.cxx 2015-01-30 12:52:49.444933657 +0100
    16 @@ -68,7 +68,6 @@
    17 list<rdr::U8> result;
    18 list<U32>::iterator i;
    19
    20 - result.push_back(secTypeVeNCrypt);
    21 for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
    22 if (*i < 0x100)
    23 result.push_back(*i);
    24 @@ -106,8 +105,6 @@
    25 for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
    26 if (*i == secType)
    27 return true;
    28 - if (secType == secTypeVeNCrypt)
    29 - return true;
    30
    31 return false;
    32 }
    33 diff -Naur tigervnc-1.4.2/common/rfb/SecurityServer.cxx tigervnc-1.4.2-magellan/common/rfb/SecurityServer.cxx
    34 --- tigervnc-1.4.2/common/rfb/SecurityServer.cxx 2015-01-24 00:37:23.000000000 +0100
    35 +++ tigervnc-1.4.2-magellan/common/rfb/SecurityServer.cxx 2015-01-30 12:53:52.429938404 +0100
    36 @@ -43,7 +43,7 @@
    37 #endif
    38 ")",
    39 #ifdef HAVE_GNUTLS
    40 - "TLSVnc,VncAuth",
    41 + "VncAuth",
    42 #else
    43 "VncAuth",
    44 #endif