| 1 |
commit: dc67add1a5356531eaaec698807661461abc27e4 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 5 05:28:55 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 5 05:47:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc67add1 |
| 7 |
|
| 8 |
sys-libs/glibc: add comment on bumping pax-utils bound |
| 9 |
|
| 10 |
It's important that we remember to do this when bumping |
| 11 |
glibc releases. Added a comment as a reminder and used |
| 12 |
a variable so that both uses are consistent within *DEPEND. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/811462 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-libs/glibc/glibc-2.34.ebuild | 7 +++++-- |
| 18 |
sys-libs/glibc/glibc-9999.ebuild | 11 +++++++---- |
| 19 |
2 files changed, 12 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild |
| 22 |
index cacddc9065e..0466160c931 100644 |
| 23 |
--- a/sys-libs/glibc/glibc-2.34.ebuild |
| 24 |
+++ b/sys-libs/glibc/glibc-2.34.ebuild |
| 25 |
@@ -45,6 +45,9 @@ IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +m |
| 26 |
|
| 27 |
# Minimum kernel version that glibc requires |
| 28 |
MIN_KERN_VER="3.2.0" |
| 29 |
+# Minimum pax-utils version needed (which contains any new syscall changes for |
| 30 |
+# its seccomp filter!). Please double check this! |
| 31 |
+MIN_PAX_UTILS_VER="1.3.3" |
| 32 |
|
| 33 |
# Here's how the cross-compile logic breaks down ... |
| 34 |
# CTARGET - machine that will target the binaries |
| 35 |
@@ -98,7 +101,7 @@ fi |
| 36 |
|
| 37 |
BDEPEND=" |
| 38 |
${PYTHON_DEPS} |
| 39 |
- >=app-misc/pax-utils-1.3.3 |
| 40 |
+ >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} |
| 41 |
sys-devel/bison |
| 42 |
doc? ( sys-apps/texinfo ) |
| 43 |
!compile-locales? ( |
| 44 |
@@ -130,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} |
| 45 |
sys-apps/grep |
| 46 |
virtual/awk |
| 47 |
sys-apps/gentoo-functions |
| 48 |
- !<app-misc/pax-utils-1.3.3 |
| 49 |
+ !<app-misc/pax-utils-${MIN_PAX_UTILS_VER} |
| 50 |
!<net-misc/openssh-8.1_p1-r2 |
| 51 |
" |
| 52 |
|
| 53 |
|
| 54 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 55 |
index 564367df0b9..0466160c931 100644 |
| 56 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 57 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 58 |
@@ -17,8 +17,8 @@ SLOT="2.2" |
| 59 |
EMULTILIB_PKG="true" |
| 60 |
|
| 61 |
# Gentoo patchset (ignored for live ebuilds) |
| 62 |
-PATCH_VER=16 |
| 63 |
-PATCH_DEV=slyfox |
| 64 |
+PATCH_VER=2 |
| 65 |
+PATCH_DEV=dilfridge |
| 66 |
|
| 67 |
if [[ ${PV} == 9999* ]]; then |
| 68 |
inherit git-r3 |
| 69 |
@@ -45,6 +45,9 @@ IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +m |
| 70 |
|
| 71 |
# Minimum kernel version that glibc requires |
| 72 |
MIN_KERN_VER="3.2.0" |
| 73 |
+# Minimum pax-utils version needed (which contains any new syscall changes for |
| 74 |
+# its seccomp filter!). Please double check this! |
| 75 |
+MIN_PAX_UTILS_VER="1.3.3" |
| 76 |
|
| 77 |
# Here's how the cross-compile logic breaks down ... |
| 78 |
# CTARGET - machine that will target the binaries |
| 79 |
@@ -98,7 +101,7 @@ fi |
| 80 |
|
| 81 |
BDEPEND=" |
| 82 |
${PYTHON_DEPS} |
| 83 |
- >=app-misc/pax-utils-1.3.3 |
| 84 |
+ >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} |
| 85 |
sys-devel/bison |
| 86 |
doc? ( sys-apps/texinfo ) |
| 87 |
!compile-locales? ( |
| 88 |
@@ -130,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} |
| 89 |
sys-apps/grep |
| 90 |
virtual/awk |
| 91 |
sys-apps/gentoo-functions |
| 92 |
- !<app-misc/pax-utils-1.3.3 |
| 93 |
+ !<app-misc/pax-utils-${MIN_PAX_UTILS_VER} |
| 94 |
!<net-misc/openssh-8.1_p1-r2 |
| 95 |
" |
Archives