From 476752f77eab769e3c78e88702d41b3b25226e4e Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 9 Jun 2025 15:22:31 -0400 Subject: [PATCH] socklog: 2.1.0 -> 2.1.1 Changes (from package/CHANGES): ``` socklog 2.1.1 Fri, 11 Oct 2024 00:00:17 +0000 * doc/install.html: add link to sha256sum.asc. * doc/install.html: change mail address. * doc/index.html: remove reference to socklog 2.0.x. * doc/*.html: remove $Id$. * debian/: remove; obsolete. * pathexec.h, pathexec_env.c, pathexec_run.c, seek_set.c, sgetopt.c, sgetopt.h, socklog-check.c, socklog-conf.c, socklog.c, subgetopt.c, subgetopt.h, trycpp.c, tryflock.c, trypoll.c, trysgact.c, trysgprm.c, tryto.c, tryulong64.c, trywaitp.c, uncat.c, x86cpuid.c: incorporate lib changes from runit-2.2.0 and adapt socklog programs to properly build with modern toolchains (thx Gentoo, Debian, Void Linux). * prot.c, prot.h, chkshsgr.c, tryshsgr.c, hasshsgr.h?, warn-shsgr: remove; obsolete. * Makefile, TARGETS: no longer check for "shortsetgroups" (thx Leah Neukirchen). * socklog.c: replace prot_gid() with setgroups() and prot_uid() with setuid(). ``` --- pkgs/by-name/so/socklog/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/so/socklog/package.nix b/pkgs/by-name/so/socklog/package.nix index 1a50a47c40126..0db8396200168 100644 --- a/pkgs/by-name/so/socklog/package.nix +++ b/pkgs/by-name/so/socklog/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "socklog"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://smarden.org/socklog/socklog-${version}.tar.gz"; - sha256 = "0mdlmhiq2j2fip7c4l669ams85yc3c1s1d89am7dl170grw9m1ma"; + hash = "sha256-6xk3JB1seyoEArSf/evwIrsvzaPgDBsaF66Lzx5KObo="; }; sourceRoot = "admin/socklog-${version}"; @@ -21,16 +21,6 @@ stdenv.mkDerivation rec { "doc" ]; - postPatch = '' - # Fails to run as user without supplementary groups - echo "int main() { return 0; }" >src/chkshsgr.c - - # Fixup implicit function declarations - sed -i src/pathexec_run.c -e '1i#include ' - sed -i src/prot.c -e '1i#include ' -e '2i#include ' - sed -i src/seek_set.c -e '1i#include ' - ''; - configurePhase = '' echo "$NIX_CC/bin/cc $NIX_CFLAGS_COMPILE" >src/conf-cc echo "$NIX_CC/bin/cc -s" >src/conf-ld