Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] util-linux-2.37.2
@ 2021-08-22 16:22 sgn
  2021-08-22 16:24 ` [PR PATCH] [Updated] util-linux-2.37.2 sgn
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2021-08-22 16:22 UTC (permalink / raw)
  To: ml

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages util-linux-2.37.2
https://github.com/void-linux/void-packages/pull/32634

util-linux-2.37.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.37.2-32634.patch --]
[-- Type: text/x-diff, Size: 10558 bytes --]

From bcb08c010699299098adb2a2513faa08cb232fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:53:42 +0700
Subject: [PATCH 1/2] util-linux: update to 2.37.2.

---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 -------------------
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 ----------
 srcpkgs/util-linux/template                   |  6 +--
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..8e622ca3cdc0 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.1
-revision=3
+version=2.37.2
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 11d0ebc1d77e55a4c2a4860ea278686947729bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:48:54 +0700
Subject: [PATCH 2/2] util-linux-common: update to 2.37.2.

---
 .../patches/relative-path.patch               | 34 +++++++++++++++++++
 srcpkgs/util-linux-common/template            | 19 +++++++----
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/util-linux-common/patches/relative-path.patch

diff --git a/srcpkgs/util-linux-common/patches/relative-path.patch b/srcpkgs/util-linux-common/patches/relative-path.patch
new file mode 100644
index 000000000000..ee9e2f20cd73
--- /dev/null
+++ b/srcpkgs/util-linux-common/patches/relative-path.patch
@@ -0,0 +1,34 @@
+Index: util-linux-2.37.2/configure
+===================================================================
+--- util-linux-2.37.2.orig/configure
++++ util-linux-2.37.2/configure
+@@ -38267,7 +38267,7 @@ ac_config_headers="$ac_config_headers co
+ # Don't use configure.ac to replace install paths! See Makefile PATHFILES for
+ # more details.
+ #
+-ac_config_files="$ac_config_files Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/blkid.h libfdisk/docs/Makefile libfdisk/docs/version.xml libfdisk/src/libfdisk.h libmount/docs/Makefile libmount/docs/version.xml libmount/src/libmount.h libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h po/Makefile.in po-man/Makefile"
++ac_config_files="$ac_config_files Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/blkid.h libblkid/blkid.pc libfdisk/docs/Makefile libfdisk/docs/version.xml libfdisk/src/libfdisk.h libfdisk/fdisk.pc libmount/docs/Makefile libmount/docs/version.xml libmount/src/libmount.h libmount/mount.pc libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h libsmartcols/smartcols.pc libuuid/uuid.pc po/Makefile.in po-man/Makefile"
+ 
+ 
+ cat >confcache <<\_ACEOF
+@@ -40185,15 +40185,20 @@ do
+     "libblkid/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libblkid/docs/Makefile" ;;
+     "libblkid/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libblkid/docs/version.xml" ;;
+     "libblkid/src/blkid.h") CONFIG_FILES="$CONFIG_FILES libblkid/src/blkid.h" ;;
++    "libblkid/blkid.pc") CONFIG_FILES="$CONFIG_FILES libblkid/blkid.pc" ;;
+     "libfdisk/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libfdisk/docs/Makefile" ;;
+     "libfdisk/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libfdisk/docs/version.xml" ;;
+     "libfdisk/src/libfdisk.h") CONFIG_FILES="$CONFIG_FILES libfdisk/src/libfdisk.h" ;;
++    "libfdisk/fdisk.pc") CONFIG_FILES="$CONFIG_FILES libfdisk/fdisk.pc ;;
+     "libmount/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libmount/docs/Makefile" ;;
+     "libmount/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libmount/docs/version.xml" ;;
+     "libmount/src/libmount.h") CONFIG_FILES="$CONFIG_FILES libmount/src/libmount.h" ;;
++    "libmount/mount.pc") CONFIG_FILES="$CONFIG_FILES libmount/mount.pc ;;
+     "libsmartcols/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libsmartcols/docs/Makefile" ;;
+     "libsmartcols/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libsmartcols/docs/version.xml" ;;
+     "libsmartcols/src/libsmartcols.h") CONFIG_FILES="$CONFIG_FILES libsmartcols/src/libsmartcols.h" ;;
++    "libsmartcols/smartcols.pc") CONFIG_FILES="$CONFIG_FILES libsmartcols/smartcols.pc ;;
++    "libuuid/uuid.pc") CONFIG_FILES="$CONFIG_FILES libuuid/uuid.pc ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "po-man/Makefile") CONFIG_FILES="$CONFIG_FILES po-man/Makefile" ;;
+ 
diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 4edf7bb75564..30acfc597664 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.1
+version=2.37.2
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -14,10 +14,10 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 post_extract() {
 	# hung inside xbps-src
@@ -44,9 +44,9 @@ do_install() {
 util-linux-libs_package() {
 	short_desc+=" - meta libraries"
 	build_style=meta
-	depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
-	 libmount-${version}_${revision} libsmartcols-${version}_${revision}
-	 libuuid-${version}_${revision}"
+	depends="libfdisk>=${version}_${revision} libblkid>=${version}_${revision}
+	 libmount>=${version}_${revision} libsmartcols>=${version}_${revision}
+	 libuuid>=${version}_${revision}"
 }
 
 libfdisk_package() {
@@ -108,13 +108,20 @@ libblkid-devel_package() {
 libuuid_package() {
 	short_desc="UUID library"
 	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	license="BSD-3-Clause"
 	pkg_install() {
+		{
+			grep Copyright libuuid/src/*.c
+			cat Documentation/licenses/COPYING.BSD-3-Clause
+		} >uuid.license
+		vlicense uuid.license
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
 libuuid-devel_package() {
 	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
+	license="BSD-3-Clause"
 	pkg_install() {
 		vmove usr/lib/libuuid.a
 		vmove usr/lib/libuuid.so

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] util-linux-2.37.2
  2021-08-22 16:22 [PR PATCH] util-linux-2.37.2 sgn
@ 2021-08-22 16:24 ` sgn
  2021-08-23  0:07 ` sgn
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-08-22 16:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages util-linux-2.37.2
https://github.com/void-linux/void-packages/pull/32634

util-linux-2.37.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.37.2-32634.patch --]
[-- Type: text/x-diff, Size: 10664 bytes --]

From bcb08c010699299098adb2a2513faa08cb232fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:53:42 +0700
Subject: [PATCH 1/2] util-linux: update to 2.37.2.

---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 -------------------
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 ----------
 srcpkgs/util-linux/template                   |  6 +--
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..8e622ca3cdc0 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.1
-revision=3
+version=2.37.2
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 959295e2d4b0018103ef0ef96936e2d3e226b97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:48:54 +0700
Subject: [PATCH 2/2] util-linux-common: update to 2.37.2.

---
 .../patches/relative-path.patch               | 36 +++++++++++++++++++
 srcpkgs/util-linux-common/template            | 19 ++++++----
 2 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/util-linux-common/patches/relative-path.patch

diff --git a/srcpkgs/util-linux-common/patches/relative-path.patch b/srcpkgs/util-linux-common/patches/relative-path.patch
new file mode 100644
index 000000000000..4bcd57d9e4d3
--- /dev/null
+++ b/srcpkgs/util-linux-common/patches/relative-path.patch
@@ -0,0 +1,36 @@
+ Otherwise, includedir and libdir will show absolute path instead of
+ relative to prefix and exec_prefix
+Index: util-linux-2.37.2/configure
+===================================================================
+--- util-linux-2.37.2.orig/configure
++++ util-linux-2.37.2/configure
+@@ -38267,7 +38267,7 @@ ac_config_headers="$ac_config_headers co
+ # Don't use configure.ac to replace install paths! See Makefile PATHFILES for
+ # more details.
+ #
+-ac_config_files="$ac_config_files Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/blkid.h libfdisk/docs/Makefile libfdisk/docs/version.xml libfdisk/src/libfdisk.h libmount/docs/Makefile libmount/docs/version.xml libmount/src/libmount.h libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h po/Makefile.in po-man/Makefile"
++ac_config_files="$ac_config_files Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/blkid.h libblkid/blkid.pc libfdisk/docs/Makefile libfdisk/docs/version.xml libfdisk/src/libfdisk.h libfdisk/fdisk.pc libmount/docs/Makefile libmount/docs/version.xml libmount/src/libmount.h libmount/mount.pc libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h libsmartcols/smartcols.pc libuuid/uuid.pc po/Makefile.in po-man/Makefile"
+ 
+ 
+ cat >confcache <<\_ACEOF
+@@ -40185,15 +40185,20 @@ do
+     "libblkid/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libblkid/docs/Makefile" ;;
+     "libblkid/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libblkid/docs/version.xml" ;;
+     "libblkid/src/blkid.h") CONFIG_FILES="$CONFIG_FILES libblkid/src/blkid.h" ;;
++    "libblkid/blkid.pc") CONFIG_FILES="$CONFIG_FILES libblkid/blkid.pc" ;;
+     "libfdisk/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libfdisk/docs/Makefile" ;;
+     "libfdisk/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libfdisk/docs/version.xml" ;;
+     "libfdisk/src/libfdisk.h") CONFIG_FILES="$CONFIG_FILES libfdisk/src/libfdisk.h" ;;
++    "libfdisk/fdisk.pc") CONFIG_FILES="$CONFIG_FILES libfdisk/fdisk.pc ;;
+     "libmount/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libmount/docs/Makefile" ;;
+     "libmount/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libmount/docs/version.xml" ;;
+     "libmount/src/libmount.h") CONFIG_FILES="$CONFIG_FILES libmount/src/libmount.h" ;;
++    "libmount/mount.pc") CONFIG_FILES="$CONFIG_FILES libmount/mount.pc ;;
+     "libsmartcols/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libsmartcols/docs/Makefile" ;;
+     "libsmartcols/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libsmartcols/docs/version.xml" ;;
+     "libsmartcols/src/libsmartcols.h") CONFIG_FILES="$CONFIG_FILES libsmartcols/src/libsmartcols.h" ;;
++    "libsmartcols/smartcols.pc") CONFIG_FILES="$CONFIG_FILES libsmartcols/smartcols.pc ;;
++    "libuuid/uuid.pc") CONFIG_FILES="$CONFIG_FILES libuuid/uuid.pc ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "po-man/Makefile") CONFIG_FILES="$CONFIG_FILES po-man/Makefile" ;;
+ 
diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 4edf7bb75564..30acfc597664 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.1
+version=2.37.2
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -14,10 +14,10 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 post_extract() {
 	# hung inside xbps-src
@@ -44,9 +44,9 @@ do_install() {
 util-linux-libs_package() {
 	short_desc+=" - meta libraries"
 	build_style=meta
-	depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
-	 libmount-${version}_${revision} libsmartcols-${version}_${revision}
-	 libuuid-${version}_${revision}"
+	depends="libfdisk>=${version}_${revision} libblkid>=${version}_${revision}
+	 libmount>=${version}_${revision} libsmartcols>=${version}_${revision}
+	 libuuid>=${version}_${revision}"
 }
 
 libfdisk_package() {
@@ -108,13 +108,20 @@ libblkid-devel_package() {
 libuuid_package() {
 	short_desc="UUID library"
 	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	license="BSD-3-Clause"
 	pkg_install() {
+		{
+			grep Copyright libuuid/src/*.c
+			cat Documentation/licenses/COPYING.BSD-3-Clause
+		} >uuid.license
+		vlicense uuid.license
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
 libuuid-devel_package() {
 	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
+	license="BSD-3-Clause"
 	pkg_install() {
 		vmove usr/lib/libuuid.a
 		vmove usr/lib/libuuid.so

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] util-linux-2.37.2
  2021-08-22 16:22 [PR PATCH] util-linux-2.37.2 sgn
  2021-08-22 16:24 ` [PR PATCH] [Updated] util-linux-2.37.2 sgn
@ 2021-08-23  0:07 ` sgn
  2021-08-23 16:03 ` sgn
  2021-08-26 12:20 ` [PR PATCH] [Merged]: util-linux-2.37.2 sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-08-23  0:07 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages util-linux-2.37.2
https://github.com/void-linux/void-packages/pull/32634

util-linux-2.37.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.37.2-32634.patch --]
[-- Type: text/x-diff, Size: 11716 bytes --]

From bcb08c010699299098adb2a2513faa08cb232fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:53:42 +0700
Subject: [PATCH 1/2] util-linux: update to 2.37.2.

---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 -------------------
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 ----------
 srcpkgs/util-linux/template                   |  6 +--
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..8e622ca3cdc0 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.1
-revision=3
+version=2.37.2
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 0731db40502b832f97df7241e244f8df0f25a511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:48:54 +0700
Subject: [PATCH 2/2] util-linux-common: update to 2.37.2.

---
 .../patches/relative-path.patch               | 36 +++++++++++++++++++
 srcpkgs/util-linux-common/template            | 29 +++++++++------
 2 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/util-linux-common/patches/relative-path.patch

diff --git a/srcpkgs/util-linux-common/patches/relative-path.patch b/srcpkgs/util-linux-common/patches/relative-path.patch
new file mode 100644
index 000000000000..4bcd57d9e4d3
--- /dev/null
+++ b/srcpkgs/util-linux-common/patches/relative-path.patch
@@ -0,0 +1,36 @@
+ Otherwise, includedir and libdir will show absolute path instead of
+ relative to prefix and exec_prefix
+Index: util-linux-2.37.2/configure
+===================================================================
+--- util-linux-2.37.2.orig/configure
++++ util-linux-2.37.2/configure
+@@ -38267,7 +38267,7 @@ ac_config_headers="$ac_config_headers co
+ # Don't use configure.ac to replace install paths! See Makefile PATHFILES for
+ # more details.
+ #
+-ac_config_files="$ac_config_files Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/blkid.h libfdisk/docs/Makefile libfdisk/docs/version.xml libfdisk/src/libfdisk.h libmount/docs/Makefile libmount/docs/version.xml libmount/src/libmount.h libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h po/Makefile.in po-man/Makefile"
++ac_config_files="$ac_config_files Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/blkid.h libblkid/blkid.pc libfdisk/docs/Makefile libfdisk/docs/version.xml libfdisk/src/libfdisk.h libfdisk/fdisk.pc libmount/docs/Makefile libmount/docs/version.xml libmount/src/libmount.h libmount/mount.pc libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h libsmartcols/smartcols.pc libuuid/uuid.pc po/Makefile.in po-man/Makefile"
+ 
+ 
+ cat >confcache <<\_ACEOF
+@@ -40185,15 +40185,20 @@ do
+     "libblkid/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libblkid/docs/Makefile" ;;
+     "libblkid/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libblkid/docs/version.xml" ;;
+     "libblkid/src/blkid.h") CONFIG_FILES="$CONFIG_FILES libblkid/src/blkid.h" ;;
++    "libblkid/blkid.pc") CONFIG_FILES="$CONFIG_FILES libblkid/blkid.pc" ;;
+     "libfdisk/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libfdisk/docs/Makefile" ;;
+     "libfdisk/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libfdisk/docs/version.xml" ;;
+     "libfdisk/src/libfdisk.h") CONFIG_FILES="$CONFIG_FILES libfdisk/src/libfdisk.h" ;;
++    "libfdisk/fdisk.pc") CONFIG_FILES="$CONFIG_FILES libfdisk/fdisk.pc ;;
+     "libmount/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libmount/docs/Makefile" ;;
+     "libmount/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libmount/docs/version.xml" ;;
+     "libmount/src/libmount.h") CONFIG_FILES="$CONFIG_FILES libmount/src/libmount.h" ;;
++    "libmount/mount.pc") CONFIG_FILES="$CONFIG_FILES libmount/mount.pc ;;
+     "libsmartcols/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libsmartcols/docs/Makefile" ;;
+     "libsmartcols/docs/version.xml") CONFIG_FILES="$CONFIG_FILES libsmartcols/docs/version.xml" ;;
+     "libsmartcols/src/libsmartcols.h") CONFIG_FILES="$CONFIG_FILES libsmartcols/src/libsmartcols.h" ;;
++    "libsmartcols/smartcols.pc") CONFIG_FILES="$CONFIG_FILES libsmartcols/smartcols.pc ;;
++    "libuuid/uuid.pc") CONFIG_FILES="$CONFIG_FILES libuuid/uuid.pc ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "po-man/Makefile") CONFIG_FILES="$CONFIG_FILES po-man/Makefile" ;;
+ 
diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 4edf7bb75564..0d94f16d34e8 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.1
+version=2.37.2
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -14,10 +14,10 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 post_extract() {
 	# hung inside xbps-src
@@ -44,14 +44,14 @@ do_install() {
 util-linux-libs_package() {
 	short_desc+=" - meta libraries"
 	build_style=meta
-	depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
-	 libmount-${version}_${revision} libsmartcols-${version}_${revision}
-	 libuuid-${version}_${revision}"
+	depends="libfdisk>=${version}_${revision} libblkid>=${version}_${revision}
+	 libmount>=${version}_${revision} libsmartcols>=${version}_${revision}
+	 libuuid>=${version}_${revision}"
 }
 
 libfdisk_package() {
 	short_desc="Library for fdisk(8)"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libfdisk.so.*"
 	}
@@ -70,7 +70,7 @@ libfdisk-devel_package() {
 }
 libmount_package() {
 	short_desc="Library for mount(8)"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libmount.so.*"
 	}
@@ -88,7 +88,7 @@ libmount-devel_package() {
 }
 libblkid_package() {
 	short_desc="Library to handle device identification"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libblkid.so.*"
 	}
@@ -107,14 +107,21 @@ libblkid-devel_package() {
 }
 libuuid_package() {
 	short_desc="UUID library"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
+	license="BSD-3-Clause"
 	pkg_install() {
+		{
+			grep Copyright libuuid/src/*.c
+			cat Documentation/licenses/COPYING.BSD-3-Clause
+		} >uuid.license
+		vlicense uuid.license
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
 libuuid-devel_package() {
 	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
+	license="BSD-3-Clause"
 	pkg_install() {
 		vmove usr/lib/libuuid.a
 		vmove usr/lib/libuuid.so
@@ -135,7 +142,7 @@ libsmartcols-devel_package() {
 }
 libsmartcols_package() {
 	short_desc="Table or Tree library from util-linux"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove usr/lib/libsmartcols.so.*
 	}

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] util-linux-2.37.2
  2021-08-22 16:22 [PR PATCH] util-linux-2.37.2 sgn
  2021-08-22 16:24 ` [PR PATCH] [Updated] util-linux-2.37.2 sgn
  2021-08-23  0:07 ` sgn
@ 2021-08-23 16:03 ` sgn
  2021-08-26 12:20 ` [PR PATCH] [Merged]: util-linux-2.37.2 sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-08-23 16:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages util-linux-2.37.2
https://github.com/void-linux/void-packages/pull/32634

util-linux-2.37.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-util-linux-2.37.2-32634.patch --]
[-- Type: text/x-diff, Size: 8288 bytes --]

From bcb08c010699299098adb2a2513faa08cb232fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:53:42 +0700
Subject: [PATCH 1/2] util-linux: update to 2.37.2.

---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 -------------------
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 ----------
 srcpkgs/util-linux/template                   |  6 +--
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..8e622ca3cdc0 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.1
-revision=3
+version=2.37.2
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 7accb5177d0aeaded64b4a303cac96927bba0601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 22 Aug 2021 21:48:54 +0700
Subject: [PATCH 2/2] util-linux-common: update to 2.37.2.

---
 srcpkgs/util-linux-common/template | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 4edf7bb75564..0d94f16d34e8 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.1
+version=2.37.2
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -14,10 +14,10 @@ makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel"
 checkdepends="xz tar iproute2 socat procps-ng bc"
 short_desc="Miscellaneous linux utilities - common files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
+checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 
 post_extract() {
 	# hung inside xbps-src
@@ -44,14 +44,14 @@ do_install() {
 util-linux-libs_package() {
 	short_desc+=" - meta libraries"
 	build_style=meta
-	depends="libfdisk-${version}_${revision} libblkid-${version}_${revision}
-	 libmount-${version}_${revision} libsmartcols-${version}_${revision}
-	 libuuid-${version}_${revision}"
+	depends="libfdisk>=${version}_${revision} libblkid>=${version}_${revision}
+	 libmount>=${version}_${revision} libsmartcols>=${version}_${revision}
+	 libuuid>=${version}_${revision}"
 }
 
 libfdisk_package() {
 	short_desc="Library for fdisk(8)"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libfdisk.so.*"
 	}
@@ -70,7 +70,7 @@ libfdisk-devel_package() {
 }
 libmount_package() {
 	short_desc="Library for mount(8)"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libmount.so.*"
 	}
@@ -88,7 +88,7 @@ libmount-devel_package() {
 }
 libblkid_package() {
 	short_desc="Library to handle device identification"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove "usr/lib/libblkid.so.*"
 	}
@@ -107,14 +107,21 @@ libblkid-devel_package() {
 }
 libuuid_package() {
 	short_desc="UUID library"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
+	license="BSD-3-Clause"
 	pkg_install() {
+		{
+			grep Copyright libuuid/src/*.c
+			cat Documentation/licenses/COPYING.BSD-3-Clause
+		} >uuid.license
+		vlicense uuid.license
 		vmove "usr/lib/libuuid.so.*"
 	}
 }
 libuuid-devel_package() {
 	depends="libuuid>=${version}_${revision}<=${version}_9999"
 	short_desc="UUID library development files"
+	license="BSD-3-Clause"
 	pkg_install() {
 		vmove usr/lib/libuuid.a
 		vmove usr/lib/libuuid.so
@@ -135,7 +142,7 @@ libsmartcols-devel_package() {
 }
 libsmartcols_package() {
 	short_desc="Table or Tree library from util-linux"
-	depends="${sourcepkg}>=${version}_1<=${version}_9999"
+	depends="${sourcepkg}>=${version}_1"
 	pkg_install() {
 		vmove usr/lib/libsmartcols.so.*
 	}

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: util-linux-2.37.2
  2021-08-22 16:22 [PR PATCH] util-linux-2.37.2 sgn
                   ` (2 preceding siblings ...)
  2021-08-23 16:03 ` sgn
@ 2021-08-26 12:20 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-08-26 12:20 UTC (permalink / raw)
  To: ml

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

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

util-linux-2.37.2
https://github.com/void-linux/void-packages/pull/32634

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-26 12:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-22 16:22 [PR PATCH] util-linux-2.37.2 sgn
2021-08-22 16:24 ` [PR PATCH] [Updated] util-linux-2.37.2 sgn
2021-08-23  0:07 ` sgn
2021-08-23 16:03 ` sgn
2021-08-26 12:20 ` [PR PATCH] [Merged]: util-linux-2.37.2 sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).