You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2021/06/02 07:11:47 UTC
svn commit: r1890381 - in /httpd/httpd/branches/2.4.x: ./ Makefile.in STATUS
Author: rpluem
Date: Wed Jun 2 07:11:47 2021
New Revision: 1890381
URL: http://svn.apache.org/viewvc?rev=1890381&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/Makefile.in
httpd/httpd/branches/2.4.x/STATUS
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1889806
Modified: httpd/httpd/branches/2.4.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.in?rev=1890381&r1=1890380&r2=1890381&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/Makefile.in Wed Jun 2 07:11:47 2021
@@ -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 \
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1890381&r1=1890380&r2=1890381&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 2 07:11:47 2021
@@ -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 ]