2
1

0001-configure.ac-drop-usage-of-git-at-configure-time.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  3. Date: Sun, 1 Aug 2021 23:21:35 +0200
  4. Subject: [PATCH] configure.ac: drop usage of git at configure time
  5. The usage of git is only to print some messages at configure time,
  6. which is not very useful, and causes a significant number of warning
  7. when regenerating the configure script.
  8. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  9. ---
  10. configure.ac | 23 -----------------------
  11. 1 file changed, 23 deletions(-)
  12. diff --git a/configure.ac b/configure.ac
  13. index 20163e1e..14e5892a 100644
  14. --- a/configure.ac
  15. +++ b/configure.ac
  16. @@ -3,7 +3,6 @@
  17. # Get the hash of the last commit, to be used if it is not an
  18. # official release.
  19. -AC_DEFUN([MSC_GIT_HASH], m4_esyscmd_s(git log -1 --format="%h" --abbrev-commit))
  20. AC_DEFUN([MSC_MAJOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MAJOR " | awk {'print $3'} | sed 's/\"//g'))
  21. AC_DEFUN([MSC_MINOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MINOR " | awk {'print $3'} | sed 's/\"//g'))
  22. AC_DEFUN([MSC_PATCHLEVEL], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_PATCHLEVEL " | awk {'print $3'} | sed 's/\"//g'))
  23. @@ -25,9 +24,6 @@ m4_define([msc_version],
  24. m4_define([msc_version_with_patchlevel],
  25. [msc_version_major.msc_version_minor.msc_version_patchlevel])
  26. -m4_define([msc_version_git],
  27. - [m4_esyscmd_s(git describe)])
  28. -
  29. m4_define([msc_version_info],
  30. [msc_version_c_plus_a:msc_version_patchlevel:msc_version_minor])
  31. @@ -73,11 +69,6 @@ AC_MSG_ERROR([\
  32. ])
  33. fi
  34. -# Libinjection version
  35. -AC_DEFUN([LIBINJECTION_VERSION], m4_esyscmd_s(cd "others/libinjection" && git describe && cd ../..))
  36. -
  37. -# SecLang test version
  38. -AC_DEFUN([SECLANG_TEST_VERSION], m4_esyscmd_s(cd "test/test-cases/secrules-language-tests" && git log -1 --format="%h" --abbrev-commit && cd ../../..))
  39. # Check for yajl
  40. @@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL])
  41. MSC_VERSION=msc_version
  42. AC_SUBST([MSC_VERSION])
  43. -MSC_GIT_VERSION=msc_version_git
  44. -AC_SUBST([MSC_GIT_VERSION])
  45. -
  46. -
  47. AC_ARG_ENABLE(debug-logs,
  48. [AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
  49. @@ -412,16 +399,6 @@ AC_OUTPUT
  50. # Print a fancy summary
  51. -echo " "
  52. -echo " "
  53. -echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
  54. -echo " "
  55. -echo " Mandatory dependencies"
  56. -echo -n " + libInjection ...."
  57. -echo LIBINJECTION_VERSION
  58. -echo -n " + SecLang tests ...."
  59. -echo SECLANG_TEST_VERSION
  60. -
  61. echo " "
  62. echo " Optional dependencies"
  63. --
  64. 2.31.1