From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] glibc: neutralise supply chain attack
Date: Thu, 05 Jan 2023 13:30:49 +0100 [thread overview]
Message-ID: <20230105123049.nn6XRYDAIxokVmzGBceCoNGjKnRiY4Q3mFtar7iLtdA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41469@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages glibc-patch
https://github.com/void-linux/void-packages/pull/41469
glibc: neutralise supply chain attack
Relies on vasilek.cz is questionable by some of our users.
@paper42 @oreo639 @CameronNemo
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/41469.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-patch-41469.patch --]
[-- Type: text/x-diff, Size: 1807 bytes --]
From 9fbb22c41525cf64285c57c56e11b47f0502a8dd 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: Thu, 5 Jan 2023 18:22:47 +0700
Subject: [PATCH] glibc: neutralise supply chain attack
Relies on vasilek.cz is questionable by some of our users.
---
srcpkgs/glibc/template | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 452b55c12762..afcb1c4741e1 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -8,8 +8,12 @@ short_desc="GNU C library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
homepage="http://www.gnu.org/software/libc"
-distfiles="https://vasilek.cz/paste/glibc-${version}-${_patchver}.tar.xz"
-checksum=656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57
+distfiles="${GNU_SITE}/glibc/glibc-${version}.tar.xz
+ https://github.com/bminor/glibc/compare/glibc-${version}...${_patchver#*g}.patch"
+#distfiles="https://vasilek.cz/paste/glibc-${version}-${_patchver}.tar.xz"
+checksum="1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75
+ 8a1ee7bb3f3b015c4cb9da03695ec0a614730127cf8ff1c19a4b625f95ecbecf"
+skip_extraction="glibc-${version}...${_patchver#*g}.patch"
# Do not strip these files, objcopy errors out.
nostrip_files="
XBS5_ILP32_OFFBIG
@@ -59,6 +63,12 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
broken="no point in building this for musl"
fi
+post_extract() {
+ if [ -f $XBPS_SRCDISTDIR/${pkgname}-${version}/glibc-${version}...${_patchver#*g}.patch ]; then
+ patch -Np1 -s -F0 <$XBPS_SRCDISTDIR/${pkgname}-${version}/glibc-${version}...${_patchver#*g}.patch
+ fi
+}
+
do_configure() {
mkdir build
cd build
next prev parent reply other threads:[~2023-01-05 12:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-05 11:46 [PR PATCH] " sgn
2023-01-05 12:30 ` sgn [this message]
2023-01-05 12:45 ` oreo639
2023-01-05 12:47 ` oreo639
2023-01-05 12:48 ` oreo639
2023-01-05 12:49 ` oreo639
2023-01-05 12:49 ` oreo639
2023-01-05 12:51 ` oreo639
2023-01-05 12:55 ` oreo639
2023-01-05 12:55 ` oreo639
2023-01-05 12:56 ` oreo639
2023-01-05 13:05 ` oreo639
2023-01-05 13:06 ` oreo639
2023-01-05 13:12 ` oreo639
2023-01-05 13:13 ` oreo639
2023-01-05 13:15 ` oreo639
2023-01-05 13:16 ` oreo639
2023-01-05 13:17 ` oreo639
2023-01-05 13:22 ` oreo639
2023-01-05 14:10 ` [PR PATCH] [Updated] " sgn
2023-01-05 14:11 ` sgn
2023-01-05 17:41 ` CameronNemo
2023-01-05 21:00 ` leahneukirchen
2023-01-05 22:08 ` oreo639
2023-01-05 22:13 ` oreo639
2023-01-05 22:52 ` oreo639
2023-04-06 1:51 ` github-actions
2023-04-21 1:52 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230105123049.nn6XRYDAIxokVmzGBceCoNGjKnRiY4Q3mFtar7iLtdA@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).