From: Brian P. Hinz Date: Fri, 19 Sep 2014 03:45:56 +0000 (-0400) Subject: Remove distro specific patches obsoleted by changes in 38023dc304 X-Git-Tag: v1.3.90~30^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F34%2Fhead;p=tigervnc.git Remove distro specific patches obsoleted by changes in 38023dc304 --- diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/513_tigervnc11-rh692048.patch b/contrib/packages/deb/ubuntu-precise/debian/patches/513_tigervnc11-rh692048.patch deleted file mode 100644 index f93bec33..00000000 --- a/contrib/packages/deb/ubuntu-precise/debian/patches/513_tigervnc11-rh692048.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/common/rfb/SecurityClient.cxx 2011-02-21 14:14:16.000000000 +0100 -+++ b/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", -+ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", - #else - "VncAuth,None", - #endif -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -67,7 +67,6 @@ const std::list Security::GetEn - list result; - list::iterator i; - -- result.push_back(secTypeVeNCrypt); - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i < 0x100) - result.push_back(*i); -@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType) - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i == secType) - return true; -- if (secType == secTypeVeNCrypt) -- return true; - - return false; - } -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200 -@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "VncAuth,TLSVnc", -+ "VncAuth", - #else - "VncAuth", - #endif diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/series b/contrib/packages/deb/ubuntu-precise/debian/patches/series index 2e5a026a..b9635cf3 100644 --- a/contrib/packages/deb/ubuntu-precise/debian/patches/series +++ b/contrib/packages/deb/ubuntu-precise/debian/patches/series @@ -8,5 +8,4 @@ 504_tigervnc-cookie.patch 510_tigervnc11-ldnow.patch 511_tigervnc11-gethomedir.patch -513_tigervnc11-rh692048.patch 516_tigervnc-xorg-manpages.patch diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch deleted file mode 100644 index f93bec33..00000000 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/513_tigervnc11-rh692048.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/common/rfb/SecurityClient.cxx 2011-02-21 14:14:16.000000000 +0100 -+++ b/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", -+ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", - #else - "VncAuth,None", - #endif -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -67,7 +67,6 @@ const std::list Security::GetEn - list result; - list::iterator i; - -- result.push_back(secTypeVeNCrypt); - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i < 0x100) - result.push_back(*i); -@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType) - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i == secType) - return true; -- if (secType == secTypeVeNCrypt) -- return true; - - return false; - } -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200 -@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "VncAuth,TLSVnc", -+ "VncAuth", - #else - "VncAuth", - #endif diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/series b/contrib/packages/deb/ubuntu-trusty/debian/patches/series index 6b75eff8..ced87cc6 100644 --- a/contrib/packages/deb/ubuntu-trusty/debian/patches/series +++ b/contrib/packages/deb/ubuntu-trusty/debian/patches/series @@ -8,6 +8,5 @@ 504_tigervnc-cookie.patch 510_tigervnc11-ldnow.patch 511_tigervnc11-gethomedir.patch -513_tigervnc11-rh692048.patch 516_tigervnc-xorg-manpages.patch 517_tigervnc-format-security.patch diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-rh692048.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-rh692048.patch deleted file mode 100644 index 924c1cf6..00000000 --- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-rh692048.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", -+ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", - #else - "VncAuth,None", - #endif -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -67,7 +67,6 @@ const std::list Security::GetEn - list result; - list::iterator i; - -- result.push_back(secTypeVeNCrypt); - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i < 0x100) - result.push_back(*i); -@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType) - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i == secType) - return true; -- if (secType == secTypeVeNCrypt) -- return true; - - return false; - } -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200 -@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "VncAuth,TLSVnc", -+ "VncAuth", - #else - "VncAuth", - #endif diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec index 08078d46..c20076de 100644 --- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec @@ -147,8 +147,6 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 Patch4: tigervnc-cookie.patch Patch10: tigervnc11-ldnow.patch Patch11: tigervnc11-gethomedir.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=692048 -Patch13: tigervnc11-rh692048.patch Patch101: tigervnc-ac-compatibility.patch Patch102: tigervnc-xorg-1.7.5-remove-copyisolatin1lowered.patch @@ -466,7 +464,6 @@ rm -rf %{_builddir}/%{name}-%{version}%{?snap:-%{snap}} %patch4 -p1 -b .cookie %patch10 -p1 -b .ldnow %patch11 -p1 -b .gethomedir -%patch13 -p1 -b .rh692048 tar xzf %SOURCE11 pushd fltk-* diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-rh692048.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-rh692048.patch deleted file mode 100644 index 924c1cf6..00000000 --- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-rh692048.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", -+ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", - #else - "VncAuth,None", - #endif -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200 -@@ -67,7 +67,6 @@ const std::list Security::GetEn - list result; - list::iterator i; - -- result.push_back(secTypeVeNCrypt); - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i < 0x100) - result.push_back(*i); -@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType) - for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++) - if (*i == secType) - return true; -- if (secType == secTypeVeNCrypt) -- return true; - - return false; - } -diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx ---- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100 -+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200 -@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes - ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", - #ifdef HAVE_GNUTLS -- "VncAuth,TLSVnc", -+ "VncAuth", - #else - "VncAuth", - #endif diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec index aaf0ce38..5df424de 100644 --- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec @@ -45,7 +45,6 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 Patch4: tigervnc-cookie.patch Patch10: tigervnc11-ldnow.patch Patch11: tigervnc11-gethomedir.patch -Patch13: tigervnc11-rh692048.patch Patch16: tigervnc-xorg-manpages.patch %description @@ -140,7 +139,6 @@ This package contains icons for TigerVNC viewer %patch4 -p1 -b .cookie %patch10 -p1 -b .ldnow %patch11 -p1 -b .gethomedir -%patch13 -p1 -b .rh692048 tar xzf %SOURCE11 pushd fltk-*