You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

44 lines
1.7 KiB

  1. Description: Make builds reproducible
  2. Don't use __DATE__ __TIME__. Use changelog date instead.
  3. Sort exported symbols.
  4. Author: Jean-Michel Vourgère <nirgal@debian.org>
  5. Forwarded: no
  6. Last-Update: 2015-08-11
  7. Index: apache2/server/buildmark.c
  8. ===================================================================
  9. --- apache2.orig/server/buildmark.c
  10. +++ apache2/server/buildmark.c
  11. @@ -17,11 +17,7 @@
  12. #include "ap_config.h"
  13. #include "httpd.h"
  14. -#if defined(__DATE__) && defined(__TIME__)
  15. -static const char server_built[] = __DATE__ " " __TIME__;
  16. -#else
  17. -static const char server_built[] = "unknown";
  18. -#endif
  19. +static const char server_built[] = "";
  20. AP_DECLARE(const char *) ap_get_server_built()
  21. {
  22. Index: apache2/server/Makefile.in
  23. ===================================================================
  24. --- apache2.orig/server/Makefile.in
  25. +++ apache2/server/Makefile.in
  26. @@ -1,3 +1,4 @@
  27. +export LC_ALL = C
  28. CLEAN_TARGETS = gen_test_char test_char.h \
  29. ApacheCoreOS2.def httpd.exp export_files \
  30. @@ -85,8 +86,8 @@ httpd.exp: exports.c export_vars.h
  31. @echo "#! ." > $@
  32. @echo "* This file was AUTOGENERATED at build time." >> $@
  33. @echo "* Please do not edit by hand." >> $@
  34. - $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
  35. - $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
  36. + $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' | sort >> $@
  37. + $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' | sort >> $@
  38. # developer stuff