pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

corefx-git: Remobe merged patches upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat May 14 14:56:08 2016 +0200
Changeset:	9a2319686f7c6c9e86432a8f56c1d2693302df03

Modified Files:
	corefx-git/distinfo
Removed Files:
	corefx-git/patches/patch-src_Native_Common_pal__config.h.in
	corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt
	corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.cpp
	corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.h
	corefx-git/patches/patch-src_Native_configure.cmake

Log Message:
corefx-git: Remobe merged patches upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9a2319686f7c6c9e86432a8f56c1d2693302df03

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 corefx-git/distinfo                                   |  5 -----
 .../patches/patch-src_Native_Common_pal__config.h.in  | 12 ------------
 ...c_Native_System.Net.Security.Native_CMakeLists.txt | 18 ------------------
 ..._Native_System.Net.Security.Native_pal__gssapi.cpp | 19 -------------------
 ...rc_Native_System.Net.Security.Native_pal__gssapi.h | 13 -------------
 corefx-git/patches/patch-src_Native_configure.cmake   | 19 -------------------
 6 files changed, 86 deletions(-)

diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index ec78fc4..c641c55 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1,6 +1 @@
 $NetBSD$
-SHA1 (patch-src_Native_Common_pal__config.h.in) = 08b4e586eeed9e904547b2c169a0e19db6682a40
-SHA1 (patch-src_Native_System.Net.Security.Native_CMakeLists.txt) = 5be5902a707925dfd9d3ff613dbf41512b984dbd
-SHA1 (patch-src_Native_System.Net.Security.Native_pal__gssapi.cpp) = 5919f3284c6e80a0b6e8c807b6c6dfd2de0bd994
-SHA1 (patch-src_Native_System.Net.Security.Native_pal__gssapi.h) = 3ef35fb72afe48e5ce80a9a528965eedd24f8ddd
-SHA1 (patch-src_Native_configure.cmake) = 407d20fe5e4d2ab6af70faf0c69e9db4a7d50df3
diff --git a/corefx-git/patches/patch-src_Native_Common_pal__config.h.in b/corefx-git/patches/patch-src_Native_Common_pal__config.h.in
deleted file mode 100644
index 51f8237..0000000
--- a/corefx-git/patches/patch-src_Native_Common_pal__config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/Native/Common/pal_config.h.in.orig	2016-05-03 12:05:51.000000000 +0000
-+++ src/Native/Common/pal_config.h.in
-@@ -58,6 +58,7 @@
- #cmakedefine01 HAVE_GSSFW_HEADERS
- #cmakedefine01 HAVE_GSS_SPNEGO_MECHANISM
- #cmakedefine01 HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X
-+#cmakedefine01 HAVE_HEIMDAL_HEADERS
- 
- // Mac OS X has stat64, but it is deprecated since plain stat now
- // provides the same 64-bit aware struct when targeting OS X > 10.5
diff --git a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt b/corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt
deleted file mode 100644
index ebbf94b..0000000
--- a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- src/Native/System.Net.Security.Native/CMakeLists.txt.orig	2016-05-03 12:05:51.000000000 +0000
-+++ src/Native/System.Net.Security.Native/CMakeLists.txt
-@@ -9,6 +9,13 @@ if (HAVE_GSSFW_HEADERS)
-    if(LIBGSS STREQUAL LIBGSS-NOTFOUND)
-       message(FATAL_ERROR "Cannot find GSS.Framework and System.Net.Security.Native cannot build without it. Try installing GSS.Framework (or the appropriate package for your platform)")
-    endif()
-+elseif(HAVE_HEIMDAL_HEADERS)
-+   find_library(LIBGSS NAMES gssapi)
-+   if(LIBGSS STREQUAL LIBGSS-NOTFOUND)
-+      message(FATAL_ERROR "Cannot find libgssapi and System.Net.Security.Native cannot build without it. Try installing heimdal (or the appropriate package for your platform)")
-+   endif()
-+elseif(HeimdalGssApi)
-+     message(FATAL_ERROR "HeimdalGssApi option was set but gssapi headers could not be found and System.Net.Security.Native cannot build without the headers. Try installing heimdal (or the appropriate package for your platform)")
- else()
-    find_library(LIBGSS NAMES gssapi_krb5)
-    if(LIBGSS STREQUAL LIBGSS-NOTFOUND)
diff --git a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.cpp b/corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.cpp
deleted file mode 100644
index 22203cc..0000000
--- a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- src/Native/System.Net.Security.Native/pal_gssapi.cpp.orig	2016-05-03 12:05:51.000000000 +0000
-+++ src/Native/System.Net.Security.Native/pal_gssapi.cpp
-@@ -9,9 +9,14 @@
- #if HAVE_GSSFW_HEADERS
- #include <GSS/GSS.h>
- #else
-+#if HAVE_HEIMDAL_HEADERS
-+#include <gssapi/gssapi.h>
-+#include <gssapi/gssapi_krb5.h>
-+#else
- #include <gssapi/gssapi_ext.h>
- #include <gssapi/gssapi_krb5.h>
- #endif
-+#endif
- 
- #include <assert.h>
- #include <string.h>
diff --git a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.h b/corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.h
deleted file mode 100644
index 4b9a9e7..0000000
--- a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_pal__gssapi.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/Native/System.Net.Security.Native/pal_gssapi.h.orig	2016-05-03 12:05:51.000000000 +0000
-+++ src/Native/System.Net.Security.Native/pal_gssapi.h
-@@ -4,7 +4,7 @@
- 
- #pragma once
- 
--#if HAVE_GSSFW_HEADERS
-+#if HAVE_GSSFW_HEADERS || HAVE_HEIMDAL_HEADERS
- typedef struct gss_name_t_desc_struct GssName;
- typedef struct gss_ctx_id_t_desc_struct GssCtxId;
- typedef struct gss_cred_id_t_desc_struct GssCredId;
diff --git a/corefx-git/patches/patch-src_Native_configure.cmake b/corefx-git/patches/patch-src_Native_configure.cmake
deleted file mode 100644
index 90314ac..0000000
--- a/corefx-git/patches/patch-src_Native_configure.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- src/Native/configure.cmake.orig	2016-05-03 12:05:51.000000000 +0000
-+++ src/Native/configure.cmake
-@@ -437,6 +437,14 @@ check_cxx_source_compiles(
-     "
-     HAVE_CURL_SSLVERSION_TLSv1_012)
- 
-+option(HeimdalGssApi "use heimdal implementation of GssApi" OFF)
-+
-+if (HeimdalGssApi)
-+   check_include_files(
-+       gssapi/gssapi.h
-+       HAVE_HEIMDAL_HEADERS)
-+endif()
-+
- check_include_files(
-     GSS/GSS.h
-     HAVE_GSSFW_HEADERS)


Home | Main Index | Thread Index | Old Index