From 1b734073b023ab63003748431298dffab5ab4c25 Mon Sep 17 00:00:00 2001
From: Marcel Pociot <m.pociot@gmail.com>
Date: Fri, 2 Jun 2023 22:47:59 +0200
Subject: [PATCH] Merge refactor

---
 config/ext.json    | 16 ++++++++--------
 config/lib.json    | 12 ++++++------
 config/source.json | 18 ++++++++++--------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/config/ext.json b/config/ext.json
index 59e07925..727907f8 100644
--- a/config/ext.json
+++ b/config/ext.json
@@ -195,6 +195,13 @@
             "openssl"
         ]
     },
+    "password-argon2": {
+        "type": "builtin",
+        "arg-type": "with-prefix",
+        "lib-depends": [
+            "libargon2"
+        ]
+    },
     "pcntl": {
         "type": "builtin",
         "unix-only": true
@@ -302,13 +309,6 @@
             "libsodium"
         ]
     },
-    "password-argon2": {
-        "type": "builtin",
-        "arg-type": "with-prefix",
-        "lib-depends": [
-            "libargon2"
-        ]
-    },
     "sqlite3": {
         "type": "builtin",
         "arg-type": "with-prefix",
@@ -435,4 +435,4 @@
             "zstd"
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/config/lib.json b/config/lib.json
index 6f5d0682..a68fbf74 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -127,6 +127,12 @@
             "libxml2"
         ]
     },
+    "libargon2": {
+        "source": "libargon2",
+        "static-libs-unix": [
+            "libargon2.a"
+        ]
+    },
     "libavif": {
         "source": "libavif",
         "static-libs-unix": [
@@ -469,11 +475,5 @@
             "zstd.h",
             "zstd_errors.h"
         ]
-    },
-    "libargon2": {
-        "source": "libargon2",
-        "static-libs-unix": [
-            "libargon2.a"
-        ]
     }
 }
\ No newline at end of file
diff --git a/config/source.json b/config/source.json
index 977ae8ad..c61239ac 100644
--- a/config/source.json
+++ b/config/source.json
@@ -125,6 +125,16 @@
             "path": "LICENSE"
         }
     },
+    "libargon2": {
+        "type": "git",
+        "path": "",
+        "rev": "master",
+        "url": "https://github.com/mpociot/phc-winner-argon2",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
@@ -427,13 +437,5 @@
             "type": "file",
             "path": "LICENSE"
         }
-    },
-    "libargon2": {
-        "type": "ghtar",
-        "repo": "P-H-C/phc-winner-argon2",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
     }
 }
\ No newline at end of file