Skip to content

socklog: 2.1.0 -> 2.1.1#415389

Closed
mdaniels5757 wants to merge 1 commit intoNixOS:masterfrom
mdaniels5757:update-socklog
Closed

socklog: 2.1.0 -> 2.1.1#415389
mdaniels5757 wants to merge 1 commit intoNixOS:masterfrom
mdaniels5757:update-socklog

Conversation

@mdaniels5757
Copy link
Member

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 <small>$Id$</small>.
  * 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().

Fixes GCC 14 build. (Tracking: #388196 #356812)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

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 <small>$Id$</small>.
  * 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().
```
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 9, 2025
@nix-owners nix-owners bot requested a review from joachifm June 9, 2025 19:31
@mdaniels5757
Copy link
Member Author

nixpkgs-review result for #415389

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 415389

Logs: https://github.com/mdaniels5757/nixpkgs-review-gha/actions/runs/15542831027

Download packages from cache:
  • x86_64-linux
    nix-store -r --add-root nixpkgs-pr-415389-x86_64-linux \
      --option binary-caches 'https://cache.nixos.org/ https://mdaniels5757-nix.cachix.org' \
      --option trusted-public-keys '
      cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
      mdaniels5757-nix.cachix.org-1:iT2D2XMbTS301DFoC8sTOSP86fXMPiGrvPnrEsQN5uo=
      ' \
      /nix/store/8lg3lxdabadhjdizpzb266xf04qvrpqg-socklog-2.1.1 \
      /nix/store/8pk7s36fi25wl04xl1hxpdxq6fjpl208-socklog-2.1.1-doc \
      /nix/store/qfmc916gridx5psyy0hqg1c7kwnn4c57-socklog-2.1.1-man
  • aarch64-linux
    nix-store -r --add-root nixpkgs-pr-415389-aarch64-linux \
      --option binary-caches 'https://cache.nixos.org/ https://mdaniels5757-nix.cachix.org' \
      --option trusted-public-keys '
      cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
      mdaniels5757-nix.cachix.org-1:iT2D2XMbTS301DFoC8sTOSP86fXMPiGrvPnrEsQN5uo=
      ' \
      /nix/store/fwqznkk9jr9v43qqsqm8imapd1lv6lja-socklog-2.1.1 \
      /nix/store/h0ggb76m46vacgb97rznpjzzn0ciayqg-socklog-2.1.1-doc \
      /nix/store/8hm0x77hscd48hcv99yrjmyzcm49q6hj-socklog-2.1.1-man

x86_64-linux (sandbox = true)

✅ 3 packages built:
  • socklog
  • socklog.doc
  • socklog.man

aarch64-linux (sandbox = true)

✅ 3 packages built:
  • socklog
  • socklog.doc
  • socklog.man

x86_64-darwin (sandbox = true)

❌ 3 packages failed to build:
  • socklog
  • socklog.doc
  • socklog.man

Error logs: `x86_64-darwin`
socklog
   28 |   byte_copy((char *)&sa.sin_addr, 4, ip);
      |            ^
2 warnings generated.
./load check-socklog-inet unix.a byte.a `cat socket.lib`
ld: warning: option -s is obsolete and being ignored
./check-local socklog socklog-check socklog-conf tryto uncat
Checking socklog...
listening on socklog.check.socket, starting.
foo
0
socklog: fatal: bind(): permission denied
fatal: unable to bind socket: permission denied
/private/tmp/nix-build-socklog-2.1.1.drv-0/admin/socklog-2.1.1/compile/socklog.check: line 18: kill: (10229) - No such process
0
U: foo
U: bar
U: baz
0
socklog failed.
make: *** [Makefile:6: check] Error 1

aarch64-darwin (sandbox = true)

❌ 3 packages failed to build:
  • socklog
  • socklog.doc
  • socklog.man

Error logs: `aarch64-darwin`
socklog
   28 |   byte_copy((char *)&sa.sin_addr, 4, ip);
      |            ^
2 warnings generated.
./load check-socklog-inet unix.a byte.a `cat socket.lib`
ld: warning: option -s is obsolete and being ignored
./check-local socklog socklog-check socklog-conf tryto uncat
Checking socklog...
listening on socklog.check.socket, starting.
foo
0
socklog: fatal: bind(): permission denied
fatal: unable to bind socket: permission denied
/private/tmp/nix-build-socklog-2.1.1.drv-0/admin/socklog-2.1.1/compile/socklog.check: line 18: kill: (6255) - No such process
0
U: foo
U: bar
U: baz
0
socklog failed.
make: *** [Makefile:6: check] Error 1

@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 9, 2025

Unfortunately I don't have a darwin box, so I can't troubleshoot the test failure further. Any help would be appreciated!

@mdaniels5757
Copy link
Member Author

Duplicate of #414979

@mdaniels5757 mdaniels5757 deleted the update-socklog branch June 10, 2025 13:36
@mdaniels5757 mdaniels5757 restored the update-socklog branch June 19, 2025 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant