kbuild: deb-pkg improve maintainer address generation (d5940c60) · Commits · 戴 / test

There is multiple issues with the genaration of maintainer string It uses DEBEMAIL and EMAIL enviroment variables, which may contain angle brackets, creating invalid maintainer strings. The documented KBUILD_BUILD_USER and KBUILD_BUILD_HOST variables are not used. Undocumented and uncommon NAME variable is used. Refactor the Maintainer string to: - use EMAIL or DEBEMAIL directly if they are in form "name <user@host>" - use KBUILD_BUILD_USER and KBUILD_BUILD_HOST if set before falling back to autodetection - no longer use NAME variable or the useless Anonymous string The logic is switched from multiline if/then/fi statements to compact shell variable substition commands. Reported-by:

Mathieu Malaterre <malat@debian.org> Signed-off-by:

Riku Voipio <riku.voipio@linaro.org> Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com>

scripts/package/mkdebian

+13 −14

Original line number	Original line	Diff line number	Diff line
	@@ -71,22 +71,21 @@ if [ "$ARCH" = "um" ] ; then
	packagename=user-mode-linux-$version		packagename=user-mode-linux-$version
	fi		fi

	# Try to determine maintainer and email values		email=${DEBEMAIL-$EMAIL}
	if [ -n "$DEBEMAIL" ]; then
	email=$DEBEMAIL		# use email string directly if it contains <email>
	elif [ -n "$EMAIL" ]; then		if echo $email \| grep -q '<.*>'; then
	email=$EMAIL		maintainer=$email
	else
	email=$(id -nu)@$(hostname -f 2>/dev/null \|\| hostname)
	fi
	if [ -n "$DEBFULLNAME" ]; then
	name=$DEBFULLNAME
	elif [ -n "$NAME" ]; then
	name=$NAME
	else		else
	name="Anonymous"		# or construct the maintainer string
			user=${KBUILD_BUILD_USER-$(id -nu)}
			name=${DEBFULLNAME-$user}
			if [ -z "$email" ]; then
			buildhost=${KBUILD_BUILD_HOST-$(hostname -f 2>/dev/null \|\| hostname)}
			email="$user@$buildhost"
	fi		fi
	maintainer="$name <$email>"		maintainer="$name <$email>"
			fi

	# Try to determine distribution		# Try to determine distribution
	if [ -n "$KDEB_CHANGELOG_DIST" ]; then		if [ -n "$KDEB_CHANGELOG_DIST" ]; then

Admin message