rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream tracking notes for patches.

Browse Source
This commit is contained in:
Joe Orton 2024-03-07 11:55:21 +00:00
parent 7fa757742f
commit 756bc47b6f
12 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
httpd-2.4.43-apxs.patch
View File

@ -1,3 +1,6 @@
Upstream-Status: local customisation
diff --git a/support/apxs.in b/support/apxs.in diff --git a/support/apxs.in b/support/apxs.in
index b2705fa..c331631 100644 index b2705fa..c331631 100644
--- a/support/apxs.in --- a/support/apxs.in

3
httpd-2.4.43-corelimit.patch
View File

@ -1,3 +1,6 @@
Upstream-Status: local customisation
diff --git a/server/core.c b/server/core.c diff --git a/server/core.c b/server/core.c
index 79b2a82..dc0f17a 100644 index 79b2a82..dc0f17a 100644
--- a/server/core.c --- a/server/core.c

5
httpd-2.4.43-r1861793+.patch
View File

@ -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.r1861793+
+++ httpd-2.4.43/configure.in +++ httpd-2.4.43/configure.in
@@ -465,6 +465,28 @@ @@ -465,6 +465,28 @@

3
httpd-2.4.46-htcacheclean-dont-break.patch
View File

@ -1,3 +1,6 @@
Upstream-Status: r1915508, proposed for 2.4.59
diff --git a/support/htcacheclean.c b/support/htcacheclean.c diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index 958ba6d..0a7fe3c 100644 index 958ba6d..0a7fe3c 100644
--- a/support/htcacheclean.c --- a/support/htcacheclean.c

2
httpd-2.4.48-r1828172+.patch
View File

@ -1,6 +1,8 @@
https://github.com/apache/httpd/pull/209 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 diff --git a/modules/generators/cgi_common.h b/modules/generators/cgi_common.h
new file mode 100644 new file mode 100644
index 0000000000..69df73ce68 index 0000000000..69df73ce68

3
httpd-2.4.48-r1842929+.patch
View File

@ -1,3 +1,6 @@
Upstream-Status: in trunk, not proposed for 2.4.x
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 6747aea..40c7076 100644 index 6747aea..40c7076 100644
--- a/Makefile.in --- a/Makefile.in

2
httpd-2.4.51-r1894152.patch
View File

@ -1,6 +1,8 @@
# ./pullrev.sh 1894152 # ./pullrev.sh 1894152
http://svn.apache.org/viewvc?view=revision&revision=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.r1894152
+++ httpd-2.4.51/modules/filters/mod_deflate.c +++ httpd-2.4.51/modules/filters/mod_deflate.c
@@ -835,6 +835,7 @@ @@ -835,6 +835,7 @@

3
httpd-2.4.54-gettid.patch
View File

@ -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 d4e5b6e1e5585d341d1e51f1ddc637c099111076 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com> From: Joe Orton <jorton@redhat.com>
Date: Tue, 7 Jul 2020 09:48:01 +0100 Date: Tue, 7 Jul 2020 09:48:01 +0100

2
httpd-2.4.58-r1912477+.patch
View File

@ -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=1913654
http://svn.apache.org/viewvc?view=revision&revision=1914438 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.r1912477+
+++ httpd-2.4.58/modules/dav/fs/config6.m4 +++ httpd-2.4.58/modules/dav/fs/config6.m4
@@ -20,4 +20,10 @@ @@ -20,4 +20,10 @@

2
httpd-2.4.58-r1913912+.patch
View File

@ -3,6 +3,8 @@
http://svn.apache.org/viewvc?view=revision&revision=1913912 http://svn.apache.org/viewvc?view=revision&revision=1913912
http://svn.apache.org/viewvc?view=revision&revision=1915067 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.r1913912
+++ httpd-2.4.58/modules/ssl/mod_ssl.c +++ httpd-2.4.58/modules/ssl/mod_ssl.c
@@ -25,8 +25,7 @@ @@ -25,8 +25,7 @@

2
httpd-2.4.58-r1914013.patch
View File

@ -1,6 +1,8 @@
# ./pullrev.sh 1914013 # ./pullrev.sh 1914013
http://svn.apache.org/viewvc?view=revision&revision=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
+++ httpd-2.4.58/modules/filters/mod_xml2enc.c +++ httpd-2.4.58/modules/filters/mod_xml2enc.c
@@ -209,7 +209,7 @@ @@ -209,7 +209,7 @@

2
httpd-2.4.58-r1914365.patch
View File

@ -1,6 +1,8 @@
# ./pullrev.sh 1914365 # ./pullrev.sh 1914365
http://svn.apache.org/viewvc?view=revision&revision=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.r1914365
+++ httpd-2.4.58/modules/ssl/ssl_engine_init.c +++ httpd-2.4.58/modules/ssl/ssl_engine_init.c
@@ -1421,8 +1421,10 @@ @@ -1421,8 +1421,10 @@