diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2022-04-01 15:00:07 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2022-04-01 15:00:07 +0200 |
| commit | f6c62f7b39ac7f955c15a6faea582f762e15cd84 (patch) | |
| tree | fb098776bc2a4c1e6276f889ef75263620acff68 | |
| parent | b1544a5ecf3c27c4f7e24825c0264820b8f2d649 (diff) | |
init_buildsystem: Move hostname ip entry to the end of /etc/hosts
Closes: #990278
| -rw-r--r-- | debian/patches/init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch | 36 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch b/debian/patches/init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch new file mode 100644 index 0000000..cf3b633 --- /dev/null +++ b/debian/patches/init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch @@ -0,0 +1,36 @@ +From: Ariel D'Alessandro <ariel.dalessandro@collabora.com> +Date: Mon, 21 Jun 2021 12:04:54 -0300 +Subject: init_buildsystem: Move hostname ip entry to the end of /etc/hosts + +spymemcached package is FTBFS because a test expects a reverse lookup of +127.0.0.1 to return localhost, but current /etc/hosts configuration +returns the hostname instead. + +Let's move this `hostname/ip` entry to the end of /etc/hosts so the +reverse lookup of 127.0.0.1 returns localhost, which makes sense to be +the default case usually. + +Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> + +Bug-Debian: https://bugs.debian.org/990278 +--- + init_buildsystem | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/init_buildsystem b/init_buildsystem +index d83296d..7d855ad 100755 +--- a/init_buildsystem ++++ b/init_buildsystem +@@ -1079,11 +1079,7 @@ fi + test -e $BUILD_ROOT/.build/init_buildsystem.data || HOST=`hostname` + test -e $BUILD_ROOT/etc/hosts || echo "127.0.0.1 localhost" > $BUILD_ROOT/etc/hosts + if ! grep -F "127.0.0.1 $HOST" $BUILD_ROOT/etc/hosts > /dev/null ; then +- # this makes a reverse lookup on 127.0.0.1 return the host name, +- # which is bad, but 127.0.0.2 does not work on all unix systems +- echo "127.0.0.1 $HOST" > $BUILD_ROOT/etc/hosts.new +- test -f $BUILD_ROOT/etc/hosts && cat $BUILD_ROOT/etc/hosts >> $BUILD_ROOT/etc/hosts.new +- mv $BUILD_ROOT/etc/hosts.new $BUILD_ROOT/etc/hosts ++ echo "127.0.0.1 $HOST" >> $BUILD_ROOT/etc/hosts + fi + + # XXX: still needed? diff --git a/debian/patches/series b/debian/patches/series index 5402100..36e12ce 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ fallback-stable-dist.patch Force-locale-to-C.UTF-8.patch Force-the-local-timezone-to-be-UTC.patch Unset-TERM-to-prevent-unexpectedly-colorized-output-from-.patch +init_buildsystem-Move-hostname-ip-entry-to-the-end-of-etc.patch |