gentoo auto-resync : 18:07:2023 - 00:58:24

5 files changed, 93 insertions, 1 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index f043f9136f6a..0f7b9b7a0e2f 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/distrobuilder/Manifest b/app-containers/distrobuilder/Manifest
index 73decbb3ef7f..cc6b202217df 100644
--- a/app-containers/distrobuilder/Manifest
+++ b/app-containers/distrobuilder/Manifest
@@ -1,4 +1,8 @@
+AUX distrobuilder-2.1-glibc-2.36-fix.patch 1180 BLAKE2B 0ab58a2ac5f744b110a9ef414259a9e6f024915a6812e0dc9d64b554448817f3b2f6f58319d4bf63baa31de59b93a6202b0dafe658a4906f1b8f212739a4edc5 SHA512 b95e0920dba8366053b54c14b5bcb65e89ee3e381d22c2e3efe9d1962b05b3d4b2c0ee3b71b9acf67cae72166fe075264f1c560cc621e21088625013a4645895
 DIST distrobuilder-2.0-deps.tar.xz 368438228 BLAKE2B 511e57d20b6d7be469e005a97cca073dc2c6bd67da550c17adb8f37e40c4cf74357da48f73dcf081eee7530d10857c006b82f5444813044eee8ec60f72e61046 SHA512 d7bdaacf5e1d106f3beac4d338c587e48373dc0fc7926670699fc9ca7cd4bb2e102268988c506361bec57610b3e9d3a287a70168adf5bf9f62f797742cdeac27
 DIST distrobuilder-2.0.tar.gz 179411 BLAKE2B bc008edc05f3e89872de87711cb51dd0797e93c03cbd2a077f43d4f1c28a1f14984c42f7181fc9c5501d96667e159ef263a92f43e20484534d47c64af88e85fa SHA512 3b85a992893689232f55b7cedbf2617fde95cf0af053424a585040781df592cd1f34800fe43bc5eb37e3740fea921ca9893b749fd280132794dc77f0ca4d9934
+DIST distrobuilder-2.1.tar.gz 5599048 BLAKE2B 90e82a20a3ef61d13148951956bb1f74cc3494ca86e339c188a1c9009dcb27c0cb9a298c639c6de891df67915b48d107557f6b698a45cbe35c54d41a45bac1ab SHA512 80184d27305f5659f1367563161220b966b1957810da61e8f3b9f32cf408795319b43dd650bc9f867b3ac73ef2b3251972bb11999d92feb34bfd9cdae7ff7b7b
+DIST distrobuilder-2.1.tar.gz.asc 833 BLAKE2B fb3aadbc989438b0606c88e74fdd86e809b6373b907b37372cbbc0ca99415821f61772205967e0a7aa26b0bdaceb66df4ab39da1f08c339edeb84e66a04aab56 SHA512 0220fa34d966e2b3a244af21a894f5db7556b891ee3205b605ef633699553f0f53d876412c855010a0ef685fcfe376997790cf51d59fd46b7c9ba539507de4e3
 EBUILD distrobuilder-2.0.ebuild 741 BLAKE2B 3e7a66aad713d0272509c26a94ba7f8764c1ae434e15bb08db5386069c4225fef64eeaacc1bd85abc9f80b2d03606257b02fc38ba43f891fa8a52810ca843675 SHA512 febbf926fe3904caa603ec9108c9fdc9da39fa0fe50262324fa388b0eb1d2cf542f1d026d1687beef05f220139ad4a92fe0caef60b7bab82de44ce27bd08442a
-MISC metadata.xml 504 BLAKE2B c00c4a2700f4ce8552dc57654e1a8e97dbbcdd0634fde708c1b383b76a209c4aaadc1d9cb8ef8e6471e0a94e3e6452f510bc163d11372e49051949034dc46585 SHA512 a20feba70d275ed435797184cf75ad2df847abd7c26dc26e549054e28aebf42dddea880f278207ad591d101ca3d85a9f2d67ad6bda31b884e01a8b8ae095228a
+EBUILD distrobuilder-2.1.ebuild 1151 BLAKE2B c2d88d895d13778dd3135fd78049720d368f1c4ee65f03d152d9028ab3f22c77b36a510e59b2292a9aaf3779478881fe01b37f9d3773e2cb69b509b8d42eb8ff SHA512 070e2fd157bafa8d32fcf8e47aa98312ba39216754582de29862e74d2af3c71f0905b73f03e928b712c7ed529dea74907c8df0f4a502825069b6f945146d2e8d
+MISC metadata.xml 586 BLAKE2B d7fd625233c6bb5bafa2b0ee4ad9e45e39433fec0358fb8a0a2deaa117276e990a8795e6d5bd9e30402fa32c892bccc35f44b40ba95b4a8fc230d26afd88ea27 SHA512 42da39e6f8f2079cdda344216c9ba55a37198e8cbc8dfd45fcc50eb0833a55fa39807f17777b736f9d9cd2b8a1f340a24033fb0e494fdd28dd5661d041443e00
diff --git a/app-containers/distrobuilder/distrobuilder-2.1.ebuild b/app-containers/distrobuilder/distrobuilder-2.1.ebuild
new file mode 100644
index 000000000000..88ab03786eb3
--- /dev/null
+++ b/app-containers/distrobuilder/distrobuilder-2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info
+
+DESCRIPTION="System container image builder for LXC and LXD"
+HOMEPAGE="https://linuxcontainers.org/distrobuilder/introduction/"
+
+SRC_URI="https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="verify-sig"
+
+RDEPEND="app-crypt/gnupg
+	dev-util/debootstrap
+	dev-vcs/git
+	net-misc/rsync
+	sys-fs/squashfs-tools"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Test deps aren't vendored.
+RESTRICT="test"
+
+CONFIG_CHECK="~OVERLAY_FS"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+PATCHES=( "${FILESDIR}"/distrobuilder-2.1-glibc-2.36-fix.patch )
+
+GOPATH="${S}/_dist"
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+	emake
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+	emake check
+}
+
+src_install() {
+	export GOPATH="${S}/_dist"
+	dobin ${GOPATH}/bin/distrobuilder
+	dodoc -r doc/*
+}
diff --git a/app-containers/distrobuilder/files/distrobuilder-2.1-glibc-2.36-fix.patch b/app-containers/distrobuilder/files/distrobuilder-2.1-glibc-2.36-fix.patch
new file mode 100644
index 000000000000..5fd5ade014bb
--- /dev/null
+++ b/app-containers/distrobuilder/files/distrobuilder-2.1-glibc-2.36-fix.patch
@@ -0,0 +1,34 @@
+diff --git a/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h b/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h
+index 2c28133a8..a6975ab4d 100644
+--- a/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h
++++ b/vendor/github.com/lxc/lxd/lxd/include/syscall_wrappers.h
+@@ -26,10 +26,10 @@ static inline int lxd_close_range(unsigned int fd, unsigned int max_fd, unsigned
+ 	return syscall(__NR_close_range, fd, max_fd, flags);
+ }
+ 
+-static inline int open_tree(int dfd, const char *filename, unsigned int flags)
++/* static inline int open_tree(int dfd, const char *filename, unsigned int flags)
+ {
+ 	return syscall(__NR_open_tree, dfd, filename, flags);
+-}
++}*/
+ 
+ /*
+  * mount_setattr()
+@@ -40,7 +40,7 @@ struct lxc_mount_attr {
+ 	__u64 propagation;
+ 	__u64 userns_fd;
+ };
+-
++/*
+ static inline int mount_setattr(int dfd, const char *path, unsigned int flags,
+ 				struct lxc_mount_attr *attr, size_t size)
+ {
+@@ -53,6 +53,7 @@ static inline int move_mount(int from_dfd, const char *from_pathname, int to_dfd
+ 	return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd,
+ 		       to_pathname, flags);
+ }
++*/
+ 
+ /* arg1 of prctl() */
+ #ifndef PR_SCHED_CORE
diff --git a/app-containers/distrobuilder/metadata.xml b/app-containers/distrobuilder/metadata.xml
index dfdfc1731f80..5a061dc2f595 100644
--- a/app-containers/distrobuilder/metadata.xml
+++ b/app-containers/distrobuilder/metadata.xml
@@ -13,4 +13,7 @@
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">lxc/distrobuilder</remote-id>
+	</upstream>
 </pkgmetadata>