From ca88d4185442d186287d9694a0b5c4c8ae793b47 Mon Sep 17 00:00:00 2001
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Wed, 12 Oct 2016 17:23:57 +0000
Subject: Update ice ports to 3.6.3

A few critical patches got merged upstream, a few new were required
to maintain LibreSSL support and fix other new issues. Note that slice2py
moved from devel/py-ice to devel/ice.

Approved by:	mentors (implicit)
---
 ...rmissionsVerifier-CryptPermissionsVerifierI.cpp | 69 +++-------------------
 1 file changed, 8 insertions(+), 61 deletions(-)

(limited to 'devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp')

diff --git a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
index c9b023c3d26a..68883e884abe 100644
--- a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
+++ b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
@@ -1,64 +1,11 @@
---- cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp.orig	2015-06-23 15:30:20.000000000 +0000
-+++ cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp	2015-06-27 17:04:09.625743300 +0000
-@@ -17,6 +17,8 @@
- 
- #if defined(__GLIBC__)
- #   include <crypt.h>
-+#elif defined(__FreeBSD__)
-+#   include <unistd.h>
- #elif defined(__APPLE__)
- #   include <CoreFoundation/CoreFoundation.h>
- #   include <Security/Security.h>
-@@ -33,6 +35,28 @@
- namespace
- {
- 
-+#if defined(__FreeBSD__)
-+IceUtil::Mutex* _staticMutex = 0;
-+
-+class Init
-+{
-+public:
-+
-+    Init()
-+    {
-+        _staticMutex = new IceUtil::Mutex;
-+    }
-+
-+    ~Init()
-+    {
-+        delete _staticMutex;
-+        _staticMutex = 0;
-+    }
-+};
-+
-+Init init;
-+#endif
-+
- class CryptPermissionsVerifierI : public PermissionsVerifier
- {
- public:
-@@ -140,7 +164,7 @@
-     {
-         return false;
-     }
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) || defined(__FreeBSD__)
-     size_t i = p->second.rfind('$');
-     string salt;
-     if(i == string::npos)
-@@ -162,9 +186,14 @@
-             return false;
-         }
-     }
-+#   if defined(__GLIBC__)
-     struct crypt_data data;
-     data.initialized = 0;
+--- cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp~	2016-10-05 16:59:08.000000000 +0200
++++ cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp	2016-10-11 23:40:30.829983908 +0200
+@@ -200,7 +200,7 @@
      return p->second == crypt_r(password.c_str(), salt.c_str(), &data);
-+#   else
-+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
+ #   else
+     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
+-    return p->second == crypt(password.c_str(), salt.c_str())
 +    return p->second == crypt(password.c_str(), salt.c_str());
-+#   endif
- #elif defined(__APPLE__) || defined(_WIN32)    
+ #   endif
+ #elif defined(__APPLE__) || defined(_WIN32)
      //
-     // Pbkdf2 string format:
-- 
cgit v1.2.3