Re: nsjail: update to 3.0

Re: nsjail: update to 3.0

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668104867

Comment:
> Don't you have this option?

We disabled all but rebase. Preparing clean git history is here job of person proposing changes, not of person accepting them.

From the fact that proposed update failed to build at first I guess you didn't build and test locally. Did you? If so, what was tested? Any issues?

Re: nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by LamaRaz on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597

Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.

Re: nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

New comment by LamaRaz on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597

Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.

that said, I have no idea how to squash it on my side and no interest in figuring it out. If this is inadequate someone else can update nsjail at a later time, my problem was solved with xbps-src.

Re: nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by LamaRaz on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597

Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.

Re: nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by LamaRaz on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597

Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.

Re: nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

New comment by LamaRaz on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668128592

Comment:
xbps-src had no issues and I have no idea how to squash it. My attempt despite using HEAD~2 squashed more than was in my branch. My problem was solved, if this pull req is inadequate someone else can update nsjail at a later time and close this.

Re: nsjail: update to 3.0

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 519 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668296349

Comment:
To squash:

`git rebase -i HEAD~2`

Then replace the second commit with `f` or `s` (fixup or squash).

Exit the editor and it will squash them.

https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history <-- I recommed this greatly for interactive rebase, this tutorial is made for this exact scenario when a reviewer asks you to do something :D

Re: [PR PATCH] [Updated] nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by LamaRaz against master on the void-packages repository

https://github.com/LamaRaz/void-packages patch-4
https://github.com/void-linux/void-packages/pull/24015

nsjail: update to 3.0


A patch file from https://github.com/void-linux/void-packages/pull/24015.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-4-24015.patch --]
[-- Type: text/x-diff, Size: 3374 bytes --]

From dfbab3dd22271f8d43df022fd52b0dc3922a40ce Mon Sep 17 00:00:00 2001
From: LamaRaz <51037101+LamaRaz@users.noreply.github.com>
Date: Mon, 3 Aug 2020 00:52:14 -0400
Subject: [PATCH] nsjail: update to 3.0

---
 .../nsjail/patches/fix-format-warnings.patch  | 44 -------------------
 srcpkgs/nsjail/template                       | 10 ++---
 2 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/nsjail/patches/fix-format-warnings.patch

diff --git a/srcpkgs/nsjail/patches/fix-format-warnings.patch b/srcpkgs/nsjail/patches/fix-format-warnings.patch
deleted file mode 100644
index 274d6c6d2f2..00000000000
--- a/srcpkgs/nsjail/patches/fix-format-warnings.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9f064737de83ee0fa39bac5c6671a8251fec437e Mon Sep 17 00:00:00 2001
-From: Robert Swiecki <robert@swiecki.net>
-Date: Thu, 12 Sep 2019 22:21:49 +0200
-Subject: [PATCH] user: better formatting directives for printf'like functions
-
----
- user.cc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git user.cc user.cc
-index d2342aa..e7050dc 100644
---- user.cc
-+++ user.cc
-@@ -257,22 +257,22 @@ bool initNsFromChild(nsjconf_t* nsjconf) {
- 	groupsString += "]";
- 
- 	if (!setResGid(nsjconf->gids[0].inside_id)) {
--		PLOG_E("setresgid(%u)", nsjconf->gids[0].inside_id);
-+		PLOG_E("setresgid(%lu)", (unsigned long)nsjconf->gids[0].inside_id);
- 		return false;
- 	}
- 
--	LOG_D("setgroups(%lu, %s)", groups.size(), groupsString.c_str());
-+	LOG_D("setgroups(%zu, %s)", groups.size(), groupsString.c_str());
- 	if (setgroups(groups.size(), groups.data()) == -1) {
- 		/* Indicate error if specific groups were requested */
- 		if (groups.size() > 0) {
--			PLOG_E("setgroups(%lu, %s) failed", groups.size(), groupsString.c_str());
-+			PLOG_E("setgroups(%zu, %s) failed", groups.size(), groupsString.c_str());
- 			return false;
- 		}
--		PLOG_D("setgroups(%lu, %s) failed", groups.size(), groupsString.c_str());
-+		PLOG_D("setgroups(%zu, %s) failed", groups.size(), groupsString.c_str());
- 	}
- 
- 	if (!setResUid(nsjconf->uids[0].inside_id)) {
--		PLOG_E("setresuid(%u)", nsjconf->uids[0].inside_id);
-+		PLOG_E("setresuid(%lu)", (unsigned long)nsjconf->uids[0].inside_id);
- 		return false;
- 	}
- 
--- 
-2.24.0
-
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 8672653477a..3628c969eb2 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
-version=2.9
-revision=4
+version=3.0
+revision=1
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"
@@ -10,9 +10,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://nsjail.com"
 distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz
-https://github.com/google/kafel/archive/722b93a630e53ca472a4c69f61cb3dfc44ea5041.tar.gz"
-checksum="f8578a48330d3d089c9234a2b562be08043f8fe77453c322724acdf403d0afc3
- 49d2327c794c90aca50a9933c00d453705534b16e5f42d8c8e19c3d274f5e5f8"
+https://github.com/google/kafel/archive/8e69b8efae415cde3debffbb1e379d9e7a16835a.tar.gz"
+checksum="cfa66d3ed136b2e221752287b95e544915e8a6760aa866f023b604d14a374919
+ 4a6c9a1a70ed99bbed767adc106081b017a3090307ea88cc7e329b82daa1373b"
 
 archs="aarch64* armv5tel* armv6l* armv7l* x86_64*"
 

Re: nsjail: update to 3.0

[LamaRaz]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by LamaRaz on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668347051

Comment:
Seems like it worked this time

Re: nsjail: update to 3.0

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668364486

Comment:
Yep, it worked, thanks.

Re: nsjail: update to 3.0

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24015#issuecomment-668364486

Comment:
Yep, it worked, thanks.

Hopefully a committer can merge soon.

Re: [PR PATCH] [Merged]: nsjail: update to 3.0

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

There's a merged pull request on the void-packages repository

nsjail: update to 3.0
https://github.com/void-linux/void-packages/pull/24015

Description: