diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/applications/networking/irc/wraith | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/irc/wraith')
3 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch b/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch index e5fa2feb2019..16e65be00a25 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch @@ -1,8 +1,8 @@ --- a/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) - #EGG_CHECK_ZLIB -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5 -$as_echo_n "checking for path to OpenSSL... " >&6; } diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix index 3b1fa79aa266..30aec18c107f 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "wraith"; - version = "1.4.7"; + version = "1.4.10"; src = fetchurl { url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; - sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j"; + sha256 = "1h8159g6wh1hi69cnhqkgwwwa95fa6z1zrzjl219mynbf6vjjzkw"; }; hardeningDisable = [ "format" ]; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch b/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch index bfc854ef9e9c..5bf11eb72692 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch @@ -1,15 +1,15 @@ diff --git a/src/libcrypto.cc b/src/libcrypto.cc -index 0339258..68746c8 100644 +index 5139f66..517103f 100644 --- a/src/libcrypto.cc +++ b/src/libcrypto.cc -@@ -95,17 +95,9 @@ int load_libcrypto() { +@@ -100,17 +100,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(' ')); +- 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) { - dlerror(); // Clear Errors @@ -23,17 +23,17 @@ index 0339258..68746c8 100644 fprintf(stderr, STR("Unable to find libcrypto\n")); return(1); diff --git a/src/libssl.cc b/src/libssl.cc -index b432c7b..8940998 100644 +index 6010abc..86e29fc 100644 --- a/src/libssl.cc +++ b/src/libssl.cc -@@ -68,17 +68,9 @@ int load_libssl() { +@@ -78,17 +78,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(' ')); +- 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) { - dlerror(); // Clear Errors |