about summary refs log tree commit diff
path: root/pkgs/applications/networking/irc/wraith/dlopen.patch
diff options
context:
space:
mode:
authorEric Litak <elitak@gmail.com>2016-04-08 14:10:57 -0700
committerEric Litak <elitak@gmail.com>2016-04-08 14:12:13 -0700
commit8fe327a4322baa8279f09eb3a87ffd92dbdc8a18 (patch)
tree39b2236acea9f7cdf090a23d2190dc70cdc91691 /pkgs/applications/networking/irc/wraith/dlopen.patch
parent133e6e1ea649f835a7527a961ca2fef3edf4e5f7 (diff)
downloadnixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.tar
nixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.tar.gz
nixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.tar.bz2
nixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.tar.lz
nixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.tar.xz
nixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.tar.zst
nixlib-8fe327a4322baa8279f09eb3a87ffd92dbdc8a18.zip
wraith: init at 1.4.6
Diffstat (limited to 'pkgs/applications/networking/irc/wraith/dlopen.patch')
-rw-r--r--pkgs/applications/networking/irc/wraith/dlopen.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/applications/networking/irc/wraith/dlopen.patch b/pkgs/applications/networking/irc/wraith/dlopen.patch
new file mode 100644
index 000000000000..bfc854ef9e9c
--- /dev/null
+++ b/pkgs/applications/networking/irc/wraith/dlopen.patch
@@ -0,0 +1,48 @@
+diff --git a/src/libcrypto.cc b/src/libcrypto.cc
+index 0339258..68746c8 100644
+--- a/src/libcrypto.cc
++++ b/src/libcrypto.cc
+@@ -95,17 +95,9 @@ int load_libcrypto() {
+   }
+ 
+   sdprintf("Loading libcrypto");
++  dlerror(); // Clear Errors
++  libcrypto_handle = dlopen("@openssl@/lib/libcrypto.so", RTLD_LAZY|RTLD_GLOBAL);
+ 
+-  bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.0.9.8 libcrypto.so.7 libcrypto.so.6").split(' '));
+-
+-  for (size_t i = 0; i < libs_list.length(); ++i) {
+-    dlerror(); // Clear Errors
+-    libcrypto_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY|RTLD_GLOBAL);
+-    if (libcrypto_handle) {
+-      sdprintf("Found libcrypto: %s", bd::String(libs_list[i]).c_str());
+-      break;
+-    }
+-  }
+   if (!libcrypto_handle) {
+     fprintf(stderr, STR("Unable to find libcrypto\n"));
+     return(1);
+diff --git a/src/libssl.cc b/src/libssl.cc
+index b432c7b..8940998 100644
+--- a/src/libssl.cc
++++ b/src/libssl.cc
+@@ -68,17 +68,9 @@ int load_libssl() {
+   }
+ 
+   sdprintf("Loading libssl");
++  dlerror(); // Clear Errors
++  libssl_handle = dlopen("@openssl@/lib/libssl.so", RTLD_LAZY);
+ 
+-  bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.0.9.8 libssl.so.7 libssl.so.6").split(' '));
+-
+-  for (size_t i = 0; i < libs_list.length(); ++i) {
+-    dlerror(); // Clear Errors
+-    libssl_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY);
+-    if (libssl_handle) {
+-      sdprintf("Found libssl: %s", bd::String(libs_list[i]).c_str());
+-      break;
+-    }
+-  }
+   if (!libssl_handle) {
+     fprintf(stderr, STR("Unable to find libssl\n"));
+     return(1);