PR#50978: Issue 50971 - Back out use of `env' and `sed' detection. - 389-ds-base

389-ds-base

#50978 Issue 50971 - Back out use of `env' and `sed' detection.

Closed 3 years ago by spichugi. Opened 4 years ago by jashankj.

jashankj/389-ds-base jashankj/2020/03/24/env-revert into master

Issue 50971 - Back out use of `env' and `sed' detection.

Jashank Jeremy • 4 years ago

2697838

autogen.sh

file modified

+3 -10

		`@@ -59,15 +59,8 @@`
		`return 0`
		`}`

		- # We use GNU sed-isms, so if `gsed' exists, use that instead.
		`- sed=sed`
		`- if command -v gsed >/dev/null`
		`- then`
		`- sed=gsed`
		`- fi`
		`-`
		`# Check autoconf version`
		- AC_VERSION=`autoconf --version \| $sed '/^autoconf/ {s/^.* $[1-9][0-9.]*$$/\1/; q}'`
		+ AC_VERSION=`autoconf --version \| sed '/^autoconf/ {s/^.* $[1-9][0-9.]*$$/\1/; q}'`
		`if checkvers "$AC_VERSION" $ac_need_maj $ac_need_min ; then`
		`echo Found valid autoconf version $AC_VERSION`
		`else`
		`@@ -76,7 +69,7 @@`
		`fi`

		`# Check automake version`
		- AM_VERSION=`automake --version \| $sed '/^automake/ {s/^.* $[1-9][0-9.]*$$/\1/; q}'`
		+ AM_VERSION=`automake --version \| sed '/^automake/ {s/^.* $[1-9][0-9.]*$$/\1/; q}'`
		`if checkvers "$AM_VERSION" $am_need_maj $am_need_min $am_need_rev ; then`
		`echo Found valid automake version $AM_VERSION`
		`else`
		`@@ -90,7 +83,7 @@`
		`# letter - note that the shell -lt and -gt comparisons will fail with`
		`# test: 6b: integer expression expected if the number to compare`
		`# contains a non-digit`
		- LT_VERSION=`libtool --version \| $sed '/GNU libtool/ {s/^.* $[1-9][0-9a-zA-Z.]*$$/\1/; s/[a-zA-Z]//g; q}'`
		+ LT_VERSION=`libtool --version \| sed '/GNU libtool/ {s/^.* $[1-9][0-9a-zA-Z.]*$$/\1/; s/[a-zA-Z]//g; q}'`
		`if checkvers "$LT_VERSION" $lt_need_maj $lt_need_min $lt_need_rev ; then`
		`echo Found valid libtool version $LT_VERSION`
		`else`

buildnum.py

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/env python3`
		`+ #!/usr/bin/python3`
		`# --- BEGIN COPYRIGHT BLOCK ---`
		`# Copyright (C) 2020 Red Hat, Inc.`
		`# All rights reserved.`

jashankj commented 4 years ago

Bug Description:

As noted by @vashirov, both Debian and Fedora packaging guidelines forbid use of `env' in Python shebangs.

Fix Description:

Back out parts of changes introduced in PR 50969; these changes will be rolled into the FreeBSD port. FreeBSD users will not be able to build from a tarball.

Relates: https://pagure.io/389-ds-base/issue/50971

Author: Jashank Jeremy (@jashankj)

Review by: [ - ]

firstyear commented 4 years ago

Why are you backing out the sed changes too? Shouldn't it just be the env line?

vashirov commented 4 years ago

As I noted in https://pagure.io/389-ds-base/issue/50971#comment-635737, the case with buildnum.py is fine, since it's not packaged for the end user to use. This script runs at build time only. So I think it's fine to leave it as it is right now. Same for gsed - this change is good and doesn't break the build.