From 5cec5994df8a55ee99472615c631d4c08be6a338 Mon Sep 17 00:00:00 2001 From: Paul Haerle Date: Sun, 28 Jan 2024 16:29:02 +0000 Subject: [PATCH 1/7] resolv_wrapper: fix meta description & homepage Those where seemingly copied over from uid_wrapper by mistake. --- pkgs/development/libraries/resolv_wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 58863d6e26425c..0465aafab51a62 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A wrapper for the user, group and hosts NSS API"; - homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; + description = "A wrapper for DNS name resolving or DNS faking"; + homepage = "https://git.samba.org/?p=resolv_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.linux; }; From 7e1a6774575c8601fe195d9fc140911216d868ba Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 29 Jan 2024 09:47:40 +0100 Subject: [PATCH 2/7] resolv_wrapper: add meta.changelog --- pkgs/development/libraries/resolv_wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 0465aafab51a62..5f527457de7916 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=resolv_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.linux; + changelog = "https://git.samba.org/?p=resolv_wrapper.git;a=blob;f=CHANGELOG;hb=HEAD"; }; } From 6dfc84ea0ec16e1ed45d38a65a1558bda9500c8f Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 29 Jan 2024 09:50:55 +0100 Subject: [PATCH 3/7] uid_wrapper: fix description (mistakenly copied from nss_wrapper) --- pkgs/development/libraries/uid_wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 61f7242b5d8c46..93b45ef9653866 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A wrapper for the user, group and hosts NSS API"; + description = "A testing tool to fake privilege separation"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.all; From 0cffa218b36239dc381f0a95b5a58e6cfbeb641e Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 29 Jan 2024 09:51:28 +0100 Subject: [PATCH 4/7] uid_wrapper: add changelog --- pkgs/development/libraries/uid_wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 93b45ef9653866..88e446eccadbd9 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.all; + changelog = "https://git.samba.org/?p=uid_wrapper.git;a=blob;f=CHANGELOG;hb=HEAD"; }; } From 16287431fbeacae3e9412f39a59f4c98d4968975 Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 29 Jan 2024 09:52:06 +0100 Subject: [PATCH 5/7] socket_wrapper: add changelog --- pkgs/development/libraries/socket_wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 0a7f5ac91eaa93..c3b98a5dd3040a 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.all; + changelog = "https://git.samba.org/?p=socket_wrapper.git;a=blob;f=CHANGELOG;hb=HEAD"; }; } From 2199446a2e6b3a4a7619aaf1b4f741febb7d627d Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 29 Jan 2024 09:52:57 +0100 Subject: [PATCH 6/7] nss_wrapper: add changelog --- pkgs/development/libraries/nss_wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 324c5269dfbc21..6a4f05edb0571d 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; broken = stdenv.isDarwin; + changelog = "https://git.samba.org/?p=nss_wrapper.git;a=blob;f=CHANGELOG;hb=HEAD"; }; } From 6e7d536cf621098debfed5f9f5423819e00ad9ba Mon Sep 17 00:00:00 2001 From: Paul Haerle Date: Thu, 28 Mar 2024 23:35:53 +0000 Subject: [PATCH 7/7] uid_wrapper: link to version-specific changelog Co-authored-by: Sandro --- pkgs/development/libraries/uid_wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 88e446eccadbd9..54d6674fa6db1f 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.all; - changelog = "https://git.samba.org/?p=uid_wrapper.git;a=blob;f=CHANGELOG;hb=HEAD"; + changelog = "https://git.samba.org/?p=uid_wrapper.git;a=blob;f=CHANGELOG;hb=refs/tags/uid_wrapper-${version}"; }; }