nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 13:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

wraith: 1.4.7 -> 1.4.10

Browse Source
This commit is contained in:
ajs124 2021-12-15 18:58:34 +00:00
parent 96dedc92e5
commit 08595059e8
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/irc/wraith/configure.patch
View File

@ -1,8 +1,8 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -6029,53 +6029,8 @@ @@ -6143,53 +6143,8 @@ rm -f confcache
#AC_CHECK_HEADERS(openssl/ssl.h openssl/crypto.h)
#AC_CHECK_HEADERS(zlib.h) #AC_CHECK_HEADERS(zlib.h)
#EGG_CHECK_ZLIB
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5
-$as_echo_n "checking for path to OpenSSL... " >&6; } -$as_echo_n "checking for path to OpenSSL... " >&6; }

4
pkgs/applications/networking/irc/wraith/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wraith"; pname = "wraith";
version = "1.4.7"; version = "1.4.10";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j"; sha256 = "1h8159g6wh1hi69cnhqkgwwwa95fa6z1zrzjl219mynbf6vjjzkw";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];

12
pkgs/applications/networking/irc/wraith/dlopen.patch
View File

@ -1,15 +1,15 @@
diff --git a/src/libcrypto.cc b/src/libcrypto.cc diff --git a/src/libcrypto.cc b/src/libcrypto.cc
index 0339258..68746c8 100644 index 5139f66..517103f 100644
--- a/src/libcrypto.cc --- a/src/libcrypto.cc
+++ b/src/libcrypto.cc +++ b/src/libcrypto.cc
@@ -95,17 +95,9 @@ int load_libcrypto() { @@ -100,17 +100,9 @@ int load_libcrypto() {
} }
sdprintf("Loading libcrypto"); sdprintf("Loading libcrypto");
+ dlerror(); // Clear Errors + dlerror(); // Clear Errors
+ libcrypto_handle = dlopen("@openssl@/lib/libcrypto.so", RTLD_LAZY|RTLD_GLOBAL); + 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(' ')); - 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(' '));
- -
- for (size_t i = 0; i < libs_list.length(); ++i) { - for (size_t i = 0; i < libs_list.length(); ++i) {
- dlerror(); // Clear Errors - dlerror(); // Clear Errors
@ -23,17 +23,17 @@ index 0339258..68746c8 100644
fprintf(stderr, STR("Unable to find libcrypto\n")); fprintf(stderr, STR("Unable to find libcrypto\n"));
return(1); return(1);
diff --git a/src/libssl.cc b/src/libssl.cc diff --git a/src/libssl.cc b/src/libssl.cc
index b432c7b..8940998 100644 index 6010abc..86e29fc 100644
--- a/src/libssl.cc --- a/src/libssl.cc
+++ b/src/libssl.cc +++ b/src/libssl.cc
@@ -68,17 +68,9 @@ int load_libssl() { @@ -78,17 +78,9 @@ int load_libssl() {
} }
sdprintf("Loading libssl"); sdprintf("Loading libssl");
+ dlerror(); // Clear Errors + dlerror(); // Clear Errors
+ libssl_handle = dlopen("@openssl@/lib/libssl.so", RTLD_LAZY); + 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(' ')); - 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(' '));
- -
- for (size_t i = 0; i < libs_list.length(); ++i) { - for (size_t i = 0; i < libs_list.length(); ++i) {
- dlerror(); // Clear Errors - dlerror(); // Clear Errors

4
pkgs/top-level/all-packages.nix
View File

@ -33898,9 +33898,7 @@ with pkgs;
wprecon = callPackage ../tools/security/wprecon { }; wprecon = callPackage ../tools/security/wprecon { };
wraith = callPackage ../applications/networking/irc/wraith { wraith = callPackage ../applications/networking/irc/wraith { };
openssl = openssl_1_0_2;
};
wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };