mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 19:37:10 +00:00
Alex Kiernan
521fbc32cb
The third field in the /etc/shadow file (sp_lstchg) contains the date of the last password change expressed as the number of days since Jan 1, 1970. Backport the upstream changes to honour SOURCE_DATE_EPOCH for build reproducibility. (From OE-Core rev: 807a2f76e86d34fa69b0b2b369287985cc9eff78) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
From 3d921155e0a761f61c8f1ec37328724aee1e2eda Mon Sep 17 00:00:00 2001
|
|
From: Chris Lamb <chris@chris-lamb.co.uk>
|
|
Date: Sun, 31 Mar 2019 15:59:45 +0100
|
|
Subject: [PATCH 2/2] gettime: Use secure_getenv over getenv.
|
|
|
|
Upstream-Status: Backport
|
|
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
|
---
|
|
README | 1 +
|
|
configure.ac | 3 +++
|
|
lib/defines.h | 6 ++++++
|
|
libmisc/gettime.c | 2 +-
|
|
4 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/README b/README
|
|
index 952ac5787f06..26cfff1e8fa8 100644
|
|
--- a/README
|
|
+++ b/README
|
|
@@ -51,6 +51,7 @@ Brian R. Gaeke <brg@dgate.org>
|
|
Calle Karlsson <ckn@kash.se>
|
|
Chip Rosenthal <chip@unicom.com>
|
|
Chris Evans <lady0110@sable.ox.ac.uk>
|
|
+Chris Lamb <chris@chris-lamb.co.uk>
|
|
Cristian Gafton <gafton@sorosis.ro>
|
|
Dan Walsh <dwalsh@redhat.com>
|
|
Darcy Boese <possum@chardonnay.niagara.com>
|
|
diff --git a/configure.ac b/configure.ac
|
|
index da236722766b..a738ad662cc3 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -110,6 +110,9 @@ AC_REPLACE_FUNCS(sgetgrent sgetpwent sgetspent)
|
|
AC_REPLACE_FUNCS(snprintf strcasecmp strdup strerror strstr)
|
|
|
|
AC_CHECK_FUNC(setpgrp)
|
|
+AC_CHECK_FUNC(secure_getenv, [AC_DEFINE(HAS_SECURE_GETENV,
|
|
+ 1,
|
|
+ [Defined to 1 if you have the declaration of 'secure_getenv'])])
|
|
|
|
if test "$ac_cv_header_shadow_h" = "yes"; then
|
|
AC_CACHE_CHECK(for working shadow group support,
|
|
diff --git a/lib/defines.h b/lib/defines.h
|
|
index cded1417fd12..2fb1b56eca6b 100644
|
|
--- a/lib/defines.h
|
|
+++ b/lib/defines.h
|
|
@@ -382,4 +382,10 @@ extern char *strerror ();
|
|
# endif
|
|
#endif
|
|
|
|
+#ifdef HAVE_SECURE_GETENV
|
|
+# define shadow_getenv(name) secure_getenv(name)
|
|
+# else
|
|
+# define shadow_getenv(name) getenv(name)
|
|
+#endif
|
|
+
|
|
#endif /* _DEFINES_H_ */
|
|
diff --git a/libmisc/gettime.c b/libmisc/gettime.c
|
|
index 53eaf51670bb..0e25a4b75061 100644
|
|
--- a/libmisc/gettime.c
|
|
+++ b/libmisc/gettime.c
|
|
@@ -52,7 +52,7 @@
|
|
unsigned long long epoch;
|
|
|
|
fallback = time (NULL);
|
|
- source_date_epoch = getenv ("SOURCE_DATE_EPOCH");
|
|
+ source_date_epoch = shadow_getenv ("SOURCE_DATE_EPOCH");
|
|
|
|
if (!source_date_epoch)
|
|
return fallback;
|
|
--
|
|
2.17.1
|
|
|