From b66ff5fec301fd5bca890a73f81c4c11e31a7f5f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 9 Oct 2024 22:08:07 -0700 Subject: ndisc6: Fix reproducible build includes the CFLAGS used to build the package in the binary via PACKAGE_CONFIGURE_INVOCATION which then includes the absolute build path via (eg.) the -ffile-prefix-map flag. Here we remove using variables like PACKAGE_CONFIGURE_INVOCATION in code Signed-off-by: Khem Raj (cherry picked from commit 70c663b7ae90283d25ca3704852ca96aa808e31a) Signed-off-by: Armin Kuster --- ...of-variables-indicating-buildtime-informa.patch | 85 ++++++++++++++++++++++ .../recipes-support/ndisc6/ndisc6_1.0.8.bb | 1 + 2 files changed, 86 insertions(+) create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch new file mode 100644 index 0000000000..7bfb17bf08 --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch @@ -0,0 +1,85 @@ +From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001 +From: Santiago Vila +Date: Wed, 9 Oct 2024 22:05:09 -0700 +Subject: [PATCH] Remove use of variables indicating buildtime information + +We should not really care about the build date or the build host + +Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + rdnss/rdnssd.c | 2 -- + src/addrinfo.c | 2 -- + src/ndisc.c | 2 -- + src/tcpspray.c | 2 -- + src/traceroute.c | 2 -- + 5 files changed, 10 deletions(-) + +diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c +index b87edb2..7201525 100644 +--- a/rdnss/rdnssd.c ++++ b/rdnss/rdnssd.c +@@ -741,8 +741,6 @@ version (void) + { + printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"), + VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"), +diff --git a/src/addrinfo.c b/src/addrinfo.c +index cd73722..6316abd 100644 +--- a/src/addrinfo.c ++++ b/src/addrinfo.c +@@ -148,8 +148,6 @@ static int quick_usage (const char *path) + static int version (void) + { + printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007); +diff --git a/src/ndisc.c b/src/ndisc.c +index b190b18..6e222a0 100644 +--- a/src/ndisc.c ++++ b/src/ndisc.c +@@ -920,9 +920,7 @@ version (void) + { + printf (_( + "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); + +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007); +diff --git a/src/tcpspray.c b/src/tcpspray.c +index 39d8939..6347795 100644 +--- a/src/tcpspray.c ++++ b/src/tcpspray.c +@@ -302,8 +302,6 @@ version (void) + { + printf (_( + "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); +diff --git a/src/traceroute.c b/src/traceroute.c +index 489bc55..604b6af 100644 +--- a/src/traceroute.c ++++ b/src/traceroute.c +@@ -1251,8 +1251,6 @@ version (void) + { + printf (_( + "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index fb00b83516..21579d64c1 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf