From 756bc47b6f56edcff7e1408b0fac760177276a7e Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 7 Mar 2024 11:55:21 +0000 Subject: [PATCH] Add upstream tracking notes for patches. --- httpd-2.4.43-apxs.patch | 3 +++ httpd-2.4.43-corelimit.patch | 3 +++ httpd-2.4.43-r1861793+.patch | 5 +++-- httpd-2.4.46-htcacheclean-dont-break.patch | 3 +++ httpd-2.4.48-r1828172+.patch | 2 ++ httpd-2.4.48-r1842929+.patch | 3 +++ httpd-2.4.51-r1894152.patch | 2 ++ httpd-2.4.54-gettid.patch | 3 +++ httpd-2.4.58-r1912477+.patch | 2 ++ httpd-2.4.58-r1913912+.patch | 2 ++ httpd-2.4.58-r1914013.patch | 2 ++ httpd-2.4.58-r1914365.patch | 2 ++ 12 files changed, 30 insertions(+), 2 deletions(-) diff --git a/httpd-2.4.43-apxs.patch b/httpd-2.4.43-apxs.patch index b1185b2..808d6a8 100644 --- a/httpd-2.4.43-apxs.patch +++ b/httpd-2.4.43-apxs.patch @@ -1,3 +1,6 @@ + +Upstream-Status: local customisation + diff --git a/support/apxs.in b/support/apxs.in index b2705fa..c331631 100644 --- a/support/apxs.in diff --git a/httpd-2.4.43-corelimit.patch b/httpd-2.4.43-corelimit.patch index dd4b874..8c9899c 100644 --- a/httpd-2.4.43-corelimit.patch +++ b/httpd-2.4.43-corelimit.patch @@ -1,3 +1,6 @@ + +Upstream-Status: local customisation + diff --git a/server/core.c b/server/core.c index 79b2a82..dc0f17a 100644 --- a/server/core.c diff --git a/httpd-2.4.43-r1861793+.patch b/httpd-2.4.43-r1861793+.patch index 08e96cb..89d0328 100644 --- a/httpd-2.4.43-r1861793+.patch +++ b/httpd-2.4.43-r1861793+.patch @@ -1,5 +1,6 @@ -diff --git a/configure.in b/configure.in -index cb43246..0bb6b0d 100644 + +Upstream-Status: proposed for 2.4.59 + --- httpd-2.4.43/configure.in.r1861793+ +++ httpd-2.4.43/configure.in @@ -465,6 +465,28 @@ diff --git a/httpd-2.4.46-htcacheclean-dont-break.patch b/httpd-2.4.46-htcacheclean-dont-break.patch index e52318a..919e9e3 100644 --- a/httpd-2.4.46-htcacheclean-dont-break.patch +++ b/httpd-2.4.46-htcacheclean-dont-break.patch @@ -1,3 +1,6 @@ + +Upstream-Status: r1915508, proposed for 2.4.59 + diff --git a/support/htcacheclean.c b/support/htcacheclean.c index 958ba6d..0a7fe3c 100644 --- a/support/htcacheclean.c diff --git a/httpd-2.4.48-r1828172+.patch b/httpd-2.4.48-r1828172+.patch index 37f1855..5f3be4c 100644 --- a/httpd-2.4.48-r1828172+.patch +++ b/httpd-2.4.48-r1828172+.patch @@ -1,6 +1,8 @@ https://github.com/apache/httpd/pull/209 +Upstream-Status: in trunk, not proposed for 2.4.x + diff --git a/modules/generators/cgi_common.h b/modules/generators/cgi_common.h new file mode 100644 index 0000000000..69df73ce68 diff --git a/httpd-2.4.48-r1842929+.patch b/httpd-2.4.48-r1842929+.patch index f83a21d..c1837e7 100644 --- a/httpd-2.4.48-r1842929+.patch +++ b/httpd-2.4.48-r1842929+.patch @@ -1,3 +1,6 @@ + +Upstream-Status: in trunk, not proposed for 2.4.x + diff --git a/Makefile.in b/Makefile.in index 6747aea..40c7076 100644 --- a/Makefile.in diff --git a/httpd-2.4.51-r1894152.patch b/httpd-2.4.51-r1894152.patch index 95f5081..10c4b3f 100644 --- a/httpd-2.4.51-r1894152.patch +++ b/httpd-2.4.51-r1894152.patch @@ -1,6 +1,8 @@ # ./pullrev.sh 1894152 http://svn.apache.org/viewvc?view=revision&revision=1894152 +Upstream-Status: in trunk, not proposed for 2.4.x + --- httpd-2.4.51/modules/filters/mod_deflate.c.r1894152 +++ httpd-2.4.51/modules/filters/mod_deflate.c @@ -835,6 +835,7 @@ diff --git a/httpd-2.4.54-gettid.patch b/httpd-2.4.54-gettid.patch index dfc447b..88c956d 100644 --- a/httpd-2.4.54-gettid.patch +++ b/httpd-2.4.54-gettid.patch @@ -1,3 +1,6 @@ + +Upstream-Status: everything but last hunk merged for 2.4.59 + From d4e5b6e1e5585d341d1e51f1ddc637c099111076 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 7 Jul 2020 09:48:01 +0100 diff --git a/httpd-2.4.58-r1912477+.patch b/httpd-2.4.58-r1912477+.patch index 6458df8..eb3deff 100644 --- a/httpd-2.4.58-r1912477+.patch +++ b/httpd-2.4.58-r1912477+.patch @@ -5,6 +5,8 @@ http://svn.apache.org/viewvc?view=revision&revision=1912718 http://svn.apache.org/viewvc?view=revision&revision=1913654 http://svn.apache.org/viewvc?view=revision&revision=1914438 +Upstream-Status: in trunk, not proposed for 2.4.x + --- httpd-2.4.58/modules/dav/fs/config6.m4.r1912477+ +++ httpd-2.4.58/modules/dav/fs/config6.m4 @@ -20,4 +20,10 @@ diff --git a/httpd-2.4.58-r1913912+.patch b/httpd-2.4.58-r1913912+.patch index c8ea8fa..f8fd4a4 100644 --- a/httpd-2.4.58-r1913912+.patch +++ b/httpd-2.4.58-r1913912+.patch @@ -3,6 +3,8 @@ http://svn.apache.org/viewvc?view=revision&revision=1913912 http://svn.apache.org/viewvc?view=revision&revision=1915067 +Upstream-Status: merged for 2.4.59 + --- httpd-2.4.58/modules/ssl/mod_ssl.c.r1913912 +++ httpd-2.4.58/modules/ssl/mod_ssl.c @@ -25,8 +25,7 @@ diff --git a/httpd-2.4.58-r1914013.patch b/httpd-2.4.58-r1914013.patch index f9e0786..02dcac3 100644 --- a/httpd-2.4.58-r1914013.patch +++ b/httpd-2.4.58-r1914013.patch @@ -1,6 +1,8 @@ # ./pullrev.sh 1914013 http://svn.apache.org/viewvc?view=revision&revision=1914013 +Upstream-Status: merged for 2.4.59 + --- httpd-2.4.58/modules/filters/mod_xml2enc.c +++ httpd-2.4.58/modules/filters/mod_xml2enc.c @@ -209,7 +209,7 @@ diff --git a/httpd-2.4.58-r1914365.patch b/httpd-2.4.58-r1914365.patch index e7390eb..8512de3 100644 --- a/httpd-2.4.58-r1914365.patch +++ b/httpd-2.4.58-r1914365.patch @@ -1,6 +1,8 @@ # ./pullrev.sh 1914365 http://svn.apache.org/viewvc?view=revision&revision=1914365 +Upstream-Status: in trunk, not proposed for 2.4.x + --- httpd-2.4.58/modules/ssl/ssl_engine_init.c.r1914365 +++ httpd-2.4.58/modules/ssl/ssl_engine_init.c @@ -1421,8 +1421,10 @@