[apache2] 01/01: Sort exported symbols list

[Jean-Michel Vourgère]

This is an automated email from the git hooks/post-receive script.

nirgal pushed a commit to branch master
in repository apache2.

commit 403976ccd920cd999b3e0b9f196c5eaa7e22393f
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Tue Aug 11 12:44:01 2015 +0200

    Sort exported symbols list
---
 debian/changelog                        |  1 +
 debian/patches/reproducible_builds.diff | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d99ce1..8ecad70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apache2 (2.4.16-3) UNRELEASED; urgency=medium
 
   * Have apache2.postrm removes content of /var/lib/apache2, not the
     directory itself. Closes: #793862
+  * d/p/reproducible_builds.diff: Sort exported symbols list.
 
  -- Jean-Michel Vourgère <nirgal at debian.org>  Tue, 11 Aug 2015 11:12:04 +0200
 
diff --git a/debian/patches/reproducible_builds.diff b/debian/patches/reproducible_builds.diff
index a48de52..2ba9d3f 100644
--- a/debian/patches/reproducible_builds.diff
+++ b/debian/patches/reproducible_builds.diff
@@ -1,9 +1,9 @@
 Description: Make builds reproducible
- Don't use __DATE__ __TIME__.
- Use changelog date instead.
+ Don't use __DATE__ __TIME__. Use changelog date instead.
+ Sort exported symbols.
 Author: Jean-Michel Vourgère <nirgal at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-05-28
+Forwarded: no
+Last-Update: 2015-08-11
 
 Index: apache2/server/buildmark.c
 ===================================================================
@@ -22,3 +22,18 @@ Index: apache2/server/buildmark.c
  
  AP_DECLARE(const char *) ap_get_server_built()
  {
+Index: apache2/server/Makefile.in
+===================================================================
+--- apache2.orig/server/Makefile.in
++++ apache2/server/Makefile.in
+@@ -80,8 +80,8 @@ httpd.exp: exports.c export_vars.h
+ 	@echo "#! ." > $@
+ 	@echo "* This file was AUTOGENERATED at build time." >> $@
+ 	@echo "* Please do not edit by hand." >> $@
+-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
++	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' | sort >> $@
++	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' | sort >> $@
+ 
+ 
+ #   developer stuff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git