#7 Fix missing expand of localstatedir in runstatedir option
Closed 3 months ago by fberat. Opened 2 years ago by odubaj.
rpms/ odubaj/autoconf rawhide  into  rawhide

@@ -0,0 +1,65 @@ 

+ diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4

+ index 157fe6a..e751942 100644

+ --- a/lib/autoconf/status.m4

+ +++ b/lib/autoconf/status.m4

+ @@ -644,6 +644,35 @@ esac

+  _ACEOF

+  ])dnl

+  

+ +m4_ifndef([AC_LOCALSTATEDIR_CHECKED],

+ +[cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

+ +# If the template does not know about localstatedir, expand it.

+ +# FIXME: This hack should be removed a few years after 2.60.

+ +ac_localstatedir_hack=; ac_localstatedir_seen=

+ +m4_define([_AC_localstatedir_vars],

+ +         [runstatedir])]dnl

+ +[m4_define([_AC_localstatedir_subst], [  s&@$][1@&$$][1&g])]dnl

+ +[ac_sed_dataroot='

+ +/localstatedir/ {

+ +  p

+ +  q

+ +}

+ +m4_map_args_sep([/@], [@/p], [

+ +], _AC_localstatedir_vars)'

+ +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in

+ +*localstatedir*) ac_localstatedir_seen=yes;;

+ +*@[]m4_join([@*|*@], _AC_localstatedir_vars)@*)

+ +  AC_MSG_WARN([$ac_file_inputs seems to ignore the --localstatedir setting])

+ +_ACEOF

+ +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

+ +  ac_localstatedir_hack='

+ +m4_map_args_sep([_AC_localstatedir_subst(], [)], [

+ +], _AC_localstatedir_vars)

+ +  s&\\\${localstatedir}&$localstatedir&g' ;;

+ +esac

+ +_ACEOF

+ +])dnl

+ +

+  # Neutralize VPATH when `$srcdir' = `.'.

+  # Shell code in configure.ac might set extrasub.

+  # FIXME: do we really want to maintain this feature?

+ @@ -670,6 +699,8 @@ m4_map_args_sep([$0_ADJUST_DIR(], [)], [

+       [, [INSTALL]])AC_PROVIDE_IFELSE([AC_PROG_MKDIR_P], [, [MKDIR_P]]))

+  m4_ifndef([AC_DATAROOTDIR_CHECKED], [$ac_datarootdir_hack

+  ])dnl

+ +m4_ifndef([AC_LOCALSTATEDIR_CHECKED], [$ac_localstatedir_hack

+ +])dnl

+  "

+  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" m4_defn([_AC_SUBST_CMDS]) \

+    >$ac_tmp/out || AC_MSG_ERROR([could not create $ac_file])

+ @@ -681,6 +712,15 @@ m4_ifndef([AC_DATAROOTDIR_CHECKED],

+        "$ac_tmp/out"`; test -z "$ac_out"; } &&

+    AC_MSG_WARN([$ac_file contains a reference to the variable `datarootdir'

+  which seems to be undefined.  Please make sure it is defined])

+ +])dnl

+ +

+ +m4_ifndef([AC_LOCALSTATEDIR_CHECKED],

+ +[test -z "$ac_localstatedir_hack$ac_localstatedir_seen" &&

+ +  { ac_out=`sed -n '/\${localstatedir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&

+ +  { ac_out=`sed -n '/^[[	 ]]*localstatedir[[	 ]]*:*=/p' \

+ +      "$ac_tmp/out"`; test -z "$ac_out"; } &&

+ +  AC_MSG_WARN([$ac_file contains a reference to the variable `localstatedir'

+ +which seems to be undefined.  Please make sure it is defined])

+  ])dnl

+  

+    rm -f "$ac_tmp/stdin"

file modified
+5 -1
@@ -6,7 +6,7 @@ 

  Summary:    A GNU tool for automatically configuring source code

  Name:       autoconf

  Version:    2.69

- Release:    36%{?dist}

+ Release:    37%{?dist}

  License:    GPLv2+ and GFDL

  Source0:    https://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz

  Source1:    config.site
@@ -16,6 +16,7 @@ 

  Patch1:     autoconf-2.69-perl-5.22-autoscan.patch            

  Patch2:     autoconf-2.69-bash-5-LINENO.patch

  Patch3:     autoconf-2.69-backport-runstatedir-option.patch

+ Patch4:     autoconf-2.69-fix-runstatedir-option.patch

  

  BuildArch:  noarch

  
@@ -126,6 +127,9 @@ 

  

  

  %changelog

+ * Mon Mar 08 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.69-37

+ - Fix missing expand of localstatedir in runstatedir option

+ 

  * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.69-36

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

  

file modified
+1
@@ -18,6 +18,7 @@ 

      test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc

      test "$sharedstatedir" = '${prefix}/com' && sharedstatedir=/var

      test "$localstatedir" = '${prefix}/var' && localstatedir=/var

+     test "$runstatedir" = '${localstatedir}/run' && runstatedir=/run

  

      ARCH=`uname -m`

      for i in x86_64 ppc64 s390x aarch64; do

no initial comment

rebased onto 5c0ff2f

2 years ago

Build succeeded.

After irc discussion, this PR is related to:
https://bugzilla.redhat.com/show_bug.cgi?id=1831941
https://bugzilla.redhat.com/show_bug.cgi?id=1935653
Please backreference tham in the commit message.

Pull-Request has been closed by fberat

3 months ago