From f5f9bd035109e85b8b0452ed37d7b6ed439a86ee Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 7 Jul 2022 03:14:57 +0200
Subject: [PATCH 1/4] voms: 2021-05-04 -> 2022-06-14

fix build with openssl 3
---
 pkgs/tools/networking/voms/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix
index 06639a5ef129..35da87481c6d 100644
--- a/pkgs/tools/networking/voms/default.nix
+++ b/pkgs/tools/networking/voms/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec{
   pname = "voms-unstable";
-  version = "2021-05-04";
+  version = "2022-06-14";
 
   src = fetchFromGitHub {
     owner = "italiangrid";
     repo = "voms";
-    rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8";
-    sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y=";
+    rev = "8e99bb96baaf197f0f557836e2829084bb1bb00e"; # develop branch
+    hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss=";
   };
 
   nativeBuildInputs = [

From 5a6722b0e101c364a27bc870c1da997b665c49bf Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Mon, 11 Jul 2022 02:12:38 +0800
Subject: [PATCH 2/4] voms: make meta.description more clearly

---
 pkgs/tools/networking/voms/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix
index 35da87481c6d..2dd5643e740b 100644
--- a/pkgs/tools/networking/voms/default.nix
+++ b/pkgs/tools/networking/voms/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec{
   ];
 
   meta = with lib; {
-    description = "The VOMS native service and APIs";
+    description = "The C/C++ VOMS server, client and APIs v2.x";
     homepage = "https://italiangrid.github.io/voms/";
     changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
     license = licenses.asl20;

From f0b4a5da478003f11da0aaaa38be02afacd4e4d9 Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Mon, 11 Jul 2022 01:48:19 +0800
Subject: [PATCH 3/4] voms: default to symlink $out/etc to /etc

---
 pkgs/tools/networking/voms/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/tools/networking/voms/default.nix b/pkgs/tools/networking/voms/default.nix
index 2dd5643e740b..a16648b9a833 100644
--- a/pkgs/tools/networking/voms/default.nix
+++ b/pkgs/tools/networking/voms/default.nix
@@ -11,6 +11,10 @@
 , gsoap
 , openssl
 , zlib
+  # Configuration overridable with .override
+  # If not null, the builder will
+  # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
+, externalEtc ? "/etc"
 }:
 
 stdenv.mkDerivation rec{
@@ -24,6 +28,10 @@ stdenv.mkDerivation rec{
     hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss=";
   };
 
+  passthru = {
+    inherit externalEtc;
+  };
+
   nativeBuildInputs = [
     autoreconfHook
     bison
@@ -59,6 +67,13 @@ stdenv.mkDerivation rec{
     "--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h"
   ];
 
+  postFixup = ''
+    ${lib.optionalString (externalEtc != null) ''
+      mv "$out"/etc{,.orig}
+      ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
+    ''}
+  '';
+
   meta = with lib; {
     description = "The C/C++ VOMS server, client and APIs v2.x";
     homepage = "https://italiangrid.github.io/voms/";

From e2e8e38186060cf7af23bcb813c0506afc2ca965 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 7 Jul 2022 03:17:37 +0200
Subject: [PATCH 4/4] xrootd: 5.4.2 -> 5.4.3

fix build with openssl 3
---
 pkgs/tools/networking/xrootd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix
index 0dc5c7a5eb04..17e9f660ac0d 100644
--- a/pkgs/tools/networking/xrootd/default.nix
+++ b/pkgs/tools/networking/xrootd/default.nix
@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "xrootd";
-  version = "5.4.2";
+  version = "5.4.3";
 
   src = fetchFromGitHub {
     owner = "xrootd";
     repo = "xrootd";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-k6uAJbUhpwnRrSeGn4JQiHDBrGJNQDf5vG2a+je5ByU=";
+    hash = "sha256-BlMYm4ffSpUxqMjlDVZC59KOuLvwsk/BeBB3VBjAwjs=";
   };
 
   outputs = [ "bin" "out" "dev" "man" ];