wraith: 1.4.7 -> 1.4.10

ajs124 08595059 96dedc92

+11 -13
+2 -2
pkgs/applications/networking/irc/wraith/configure.patch
··· 1 1 --- a/configure 2 2 +++ b/configure 3 - @@ -6029,53 +6029,8 @@ 3 + @@ -6143,53 +6143,8 @@ rm -f confcache 4 + #AC_CHECK_HEADERS(openssl/ssl.h openssl/crypto.h) 4 5 #AC_CHECK_HEADERS(zlib.h) 5 - #EGG_CHECK_ZLIB 6 6 7 7 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5 8 8 -$as_echo_n "checking for path to OpenSSL... " >&6; }
+2 -2
pkgs/applications/networking/irc/wraith/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "wraith"; 5 - version = "1.4.7"; 5 + version = "1.4.10"; 6 6 src = fetchurl { 7 7 url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; 8 - sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j"; 8 + sha256 = "1h8159g6wh1hi69cnhqkgwwwa95fa6z1zrzjl219mynbf6vjjzkw"; 9 9 }; 10 10 hardeningDisable = [ "format" ]; 11 11 buildInputs = [ openssl ];
+6 -6
pkgs/applications/networking/irc/wraith/dlopen.patch
··· 1 1 diff --git a/src/libcrypto.cc b/src/libcrypto.cc 2 - index 0339258..68746c8 100644 2 + index 5139f66..517103f 100644 3 3 --- a/src/libcrypto.cc 4 4 +++ b/src/libcrypto.cc 5 - @@ -95,17 +95,9 @@ int load_libcrypto() { 5 + @@ -100,17 +100,9 @@ int load_libcrypto() { 6 6 } 7 7 8 8 sdprintf("Loading libcrypto"); 9 9 + dlerror(); // Clear Errors 10 10 + libcrypto_handle = dlopen("@openssl@/lib/libcrypto.so", RTLD_LAZY|RTLD_GLOBAL); 11 11 12 - - 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(' ')); 12 + - bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.1.1 libcrypto.so.1.0.0 libcrypto.so.0.9.8 libcrypto.so.10 libcrypto.so.9 libcrypto.so.8 libcrypto.so.7 libcrypto.so.6").split(' ')); 13 13 - 14 14 - for (size_t i = 0; i < libs_list.length(); ++i) { 15 15 - dlerror(); // Clear Errors ··· 23 23 fprintf(stderr, STR("Unable to find libcrypto\n")); 24 24 return(1); 25 25 diff --git a/src/libssl.cc b/src/libssl.cc 26 - index b432c7b..8940998 100644 26 + index 6010abc..86e29fc 100644 27 27 --- a/src/libssl.cc 28 28 +++ b/src/libssl.cc 29 - @@ -68,17 +68,9 @@ int load_libssl() { 29 + @@ -78,17 +78,9 @@ int load_libssl() { 30 30 } 31 31 32 32 sdprintf("Loading libssl"); 33 33 + dlerror(); // Clear Errors 34 34 + libssl_handle = dlopen("@openssl@/lib/libssl.so", RTLD_LAZY); 35 35 36 - - 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(' ')); 36 + - bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.1.1 libssl.so.1.0.0 libssl.so.0.9.8 libssl.so.10 libssl.so.9 libssl.so.8 libssl.so.7 libssl.so.6").split(' ')); 37 37 - 38 38 - for (size_t i = 0; i < libs_list.length(); ++i) { 39 39 - dlerror(); // Clear Errors
+1 -3
pkgs/top-level/all-packages.nix
··· 33898 33898 33899 33899 wprecon = callPackage ../tools/security/wprecon { }; 33900 33900 33901 - wraith = callPackage ../applications/networking/irc/wraith { 33902 - openssl = openssl_1_0_2; 33903 - }; 33901 + wraith = callPackage ../applications/networking/irc/wraith { }; 33904 33902 33905 33903 wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; 33906 33904