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

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. From d242b011a8f0d84781bbf7667a44a12646903ca4 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. Signed-off-by: Frank Vanbever <frank.vanbever@mind.be>
  10. ---
  11. configure.ac | 23 -----------------------
  12. 1 file changed, 23 deletions(-)
  13. diff --git a/configure.ac b/configure.ac
  14. index 66d6f4f2..746b1fb4 100644
  15. --- a/configure.ac
  16. +++ b/configure.ac
  17. @@ -3,7 +3,6 @@
  18. # Get the hash of the last commit, to be used if it is not an
  19. # official release.
  20. -AC_DEFUN([MSC_GIT_HASH], m4_esyscmd_s(git log -1 --format="%h" --abbrev-commit))
  21. AC_DEFUN([MSC_MAJOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MAJOR " | awk {'print $3'} | sed 's/\"//g'))
  22. AC_DEFUN([MSC_MINOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MINOR " | awk {'print $3'} | sed 's/\"//g'))
  23. AC_DEFUN([MSC_PATCHLEVEL], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_PATCHLEVEL " | awk {'print $3'} | sed 's/\"//g'))
  24. @@ -25,9 +24,6 @@ m4_define([msc_version],
  25. m4_define([msc_version_with_patchlevel],
  26. [msc_version_major.msc_version_minor.msc_version_patchlevel])
  27. -m4_define([msc_version_git],
  28. - [m4_esyscmd_s(git describe)])
  29. -
  30. m4_define([msc_version_info],
  31. [msc_version_c_plus_a:msc_version_patchlevel:msc_version_minor])
  32. @@ -73,11 +69,6 @@ AC_MSG_ERROR([\
  33. ])
  34. fi
  35. -# Libinjection version
  36. -AC_DEFUN([LIBINJECTION_VERSION], m4_esyscmd_s(cd "others/libinjection" && git describe && cd ../..))
  37. -
  38. -# SecLang test version
  39. -AC_DEFUN([SECLANG_TEST_VERSION], m4_esyscmd_s(cd "test/test-cases/secrules-language-tests" && git log -1 --format="%h" --abbrev-commit && cd ../../..))
  40. # Check for yajl
  41. @@ -224,10 +215,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL])
  42. MSC_VERSION=msc_version
  43. AC_SUBST([MSC_VERSION])
  44. -MSC_GIT_VERSION=msc_version_git
  45. -AC_SUBST([MSC_GIT_VERSION])
  46. -
  47. -
  48. AC_ARG_ENABLE(debug-logs,
  49. [AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
  50. @@ -419,16 +406,6 @@ AC_OUTPUT
  51. # Print a fancy summary
  52. -echo " "
  53. -echo " "
  54. -echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
  55. -echo " "
  56. -echo " Mandatory dependencies"
  57. -AS_ECHO_N(" + libInjection ....")
  58. -echo LIBINJECTION_VERSION
  59. -AS_ECHO_N(" + SecLang tests ....")
  60. -echo SECLANG_TEST_VERSION
  61. -
  62. echo " "
  63. echo " Optional dependencies"
  64. --
  65. 2.39.2