No functional changes until the next patch. Signed-off-by: Roland Hieber <[email protected]> --- patches/fcgi-2.4.0/0001-fix-buildsystem.patch | 15 ++++++--------- .../0002-prepare-for-new-autotools.patch | 9 +++------ patches/fcgi-2.4.0/0003-include-stdio.h.patch | 9 +++------ patches/fcgi-2.4.0/series | 3 ++- 4 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/patches/fcgi-2.4.0/0001-fix-buildsystem.patch b/patches/fcgi-2.4.0/0001-fix-buildsystem.patch index 4880823f79d8..a15794d4cb9c 100644 --- a/patches/fcgi-2.4.0/0001-fix-buildsystem.patch +++ b/patches/fcgi-2.4.0/0001-fix-buildsystem.patch @@ -8,13 +8,13 @@ Subject: [PATCH] fix buildsystem Signed-off-by: Michael Olbrich <[email protected]> --- - cgi-fcgi/Makefile.am | 2 +- - examples/Makefile.am | 4 ++-- - libfcgi/Makefile.am | 5 +++-- + cgi-fcgi/Makefile.am | 2 +- + examples/Makefile.am | 4 ++-- + libfcgi/Makefile.am | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cgi-fcgi/Makefile.am b/cgi-fcgi/Makefile.am -index 4a5c685..04b4483 100644 +index 4a5c685bce01..04b4483bd307 100644 --- a/cgi-fcgi/Makefile.am +++ b/cgi-fcgi/Makefile.am @@ -2,7 +2,7 @@ @@ -27,7 +27,7 @@ index 4a5c685..04b4483 100644 INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ $(INCLUDEDIR)/fcgiapp.h \ diff --git a/examples/Makefile.am b/examples/Makefile.am -index 484d3e8..930f203 100644 +index 484d3e897437..930f2030e830 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -11,7 +11,7 @@ noinst_PROGRAMS = authorizer \ @@ -47,7 +47,7 @@ index 484d3e8..930f203 100644 +echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am -index 0f14615..d7346f5 100644 +index 0f1461566a35..d7346f5eb26c 100644 --- a/libfcgi/Makefile.am +++ b/libfcgi/Makefile.am @@ -1,7 +1,7 @@ @@ -67,6 +67,3 @@ index 0f14615..d7346f5 100644 +libfcgi___la_LDFLAGS = -rpath @libdir@ +libfcgi___la_LIBADD = libfcgi.la --- -1.7.2.3 - diff --git a/patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch b/patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch index fbc6d3131b44..b7d442057bbf 100644 --- a/patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch +++ b/patches/fcgi-2.4.0/0002-prepare-for-new-autotools.patch @@ -6,11 +6,11 @@ we need AM_INIT_AUTOMAKE([foreign]) or automake fails with missing files Signed-off-by: Michael Olbrich <[email protected]> --- - configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index e1941d0..1f94dde 100755 +index e1941d008704..1f94ddeea03b 100755 --- a/configure.in +++ b/configure.in @@ -4,8 +4,8 @@ dnl This file is an input file used by the GNU "autoconf" program to @@ -24,6 +24,3 @@ index e1941d0..1f94dde 100755 AM_CONFIG_HEADER(fcgi_config.h) --- -1.7.2.3 - diff --git a/patches/fcgi-2.4.0/0003-include-stdio.h.patch b/patches/fcgi-2.4.0/0003-include-stdio.h.patch index a78131d0845a..e10d9c7621de 100644 --- a/patches/fcgi-2.4.0/0003-include-stdio.h.patch +++ b/patches/fcgi-2.4.0/0003-include-stdio.h.patch @@ -6,11 +6,11 @@ fcgi failed to compile. EOF wasn't defined because stdio.h wasn't included. Signed-off-by: George McCollister <[email protected]> --- - include/fcgiapp.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + include/fcgiapp.h | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/include/fcgiapp.h b/include/fcgiapp.h -index d7236f6..c39a671 100644 +index d7236f6f3f2a..c39a6715021c 100644 --- a/include/fcgiapp.h +++ b/include/fcgiapp.h @@ -34,6 +34,8 @@ @@ -22,6 +22,3 @@ index d7236f6..c39a671 100644 /* * Error codes. Assigned to avoid conflict with EOF and errno(2). */ --- -1.7.2.3 - diff --git a/patches/fcgi-2.4.0/series b/patches/fcgi-2.4.0/series index 444776df4941..cf1dab231793 100644 --- a/patches/fcgi-2.4.0/series +++ b/patches/fcgi-2.4.0/series @@ -1,5 +1,6 @@ # generated by git-ptx-patches +#tag:base --start-number 1 0001-fix-buildsystem.patch 0002-prepare-for-new-autotools.patch 0003-include-stdio.h.patch -# 36557fb0b64a93d0502c776d964302aa - git-ptx-patches magic +# 95fd96128b53d07d1cad2014dcacc9e0 - git-ptx-patches magic -- 2.20.1 _______________________________________________ ptxdist mailing list [email protected]
