From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 2 Jun 2021 07:11:47 +0000 (+0000)
Subject: Merge r1889806 from trunk:
X-Git-Tag: candidate-2.4.49~3^2~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86ee45ff08c708acb8c14516f892dbf8fce5548f;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1889806 from trunk:

* Correctly record changes for the latest release in case there have been no
  changes at all for this release so far.

Reviewed by: rpluem, jorton, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1890381 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index 9ae3c9760f9..e822b045f2c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,9 +158,9 @@ docs:
 update-changes:
 	@for i in `find changes-entries -type f`; do \
 	    cp CHANGES CHANGES.tmp ; \
-	    awk -v fname=$$i 'BEGIN{done = 0} \
-	                    done == 0 && /^Changes with Apache /{ active = 1; print; next}; \
-	                    /^ *\*/ && active == 1 && done == 0{rec=$$0; while(getline<fname){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
+	    awk -v fname=$$i 'BEGIN{done = 0; active = 0} \
+	                    done == 0 && active == 0 && /^Changes with Apache /{ active = 1; print; next}; \
+	                    /^( *\*|Changes with Apache )/ && active == 1 && done == 0{rec=$$0; while(getline<fname){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
 	    CHANGES.tmp > CHANGES ; \
 	    rm CHANGES.tmp ; \
 	    if [ -n "$(SVN)" ] ; then \
diff --git a/STATUS b/STATUS
index 3d4b91d0755..88f7737b2d1 100644
--- a/STATUS
+++ b/STATUS
@@ -142,14 +142,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Buildsystem: Correctly record changes for the latest release in case
-     there have been no changes at all for this release so far.
-     Trunk version of patch:
-        https://svn.apache.org/r1889806
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1889806 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, ylavic
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]