[packages/apache1] - rel 14; fix build (and modules builds) under gcc 5

[arekm]

commit 4bcbfb893caf2d250288a56399dff742c8b6cf15
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Oct 2 08:51:58 2015 +0200

    - rel 14; fix build (and modules builds) under gcc 5

 apache-std.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 apache1.spec     |  4 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/apache1.spec b/apache1.spec
index b475689..2f9ecb5 100644
--- a/apache1.spec
+++ b/apache1.spec
@@ -32,7 +32,7 @@ Summary(uk.UTF-8):	Найпопулярніший Web-Server
 Summary(zh_CN.UTF-8):	Internet 上应用最广泛的 Web 服务程序。
 Name:		apache1
 Version:	1.3.42
-Release:	13
+Release:	14
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://archive.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -113,6 +113,7 @@ Patch41:	%{name}-security_check_forensic_tempfiles.patch
 Patch42:	%{name}-lingerd.patch
 Patch43:	%{name}-getline.patch
 Patch44:	%{name}-format-security.patch
+Patch45:	apache-std.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	bash
 BuildRequires:	db-devel >= 4.1
@@ -1368,6 +1369,7 @@ cp -a lingerd-*/{apache-1.3/ap_lingerd.c,li_config.h} src/main
 %endif
 %patch43 -p1
 %patch44 -p1
+%patch45 -p0
 
 # make manual link with full path
 %{__sed} -i -e 's,href="manual/,href="/manual/,i' htdocs/index.html.*
diff --git a/apache-std.patch b/apache-std.patch
new file mode 100644
index 0000000..9768d9b
--- /dev/null
+++ b/apache-std.patch
@@ -0,0 +1,43 @@
+From: Salvador Ortiz Garcia <sog at msg.com.mx>
+To: dev at perl.apache.org
+Date: Sat, 29 Nov 2008 04:20:51 -0600
+Message-Id: <1227954051.4548.162.camel at monica.msg.com.mx>
+
+Hi all,
+
+This afternoon I try to compile my standard bundle (mod_perl 1.30,
+apache 1.3.41, libapreq-1.33, mod_ssl-2.8.31) in Fedora 10 that ships
+with gcc 4.3.2 only to discover that the change announced in 
+<http://www.gnu.org/software/gcc/gcc-4.2/changes.html> broke the
+compilation of apache-1.3.41/src/os/unix/os-inline.c when using -std=c99
+(default for Fedora's perl)
+
+I known that the problem is apache related, not mod_perl's, but there
+are many mod_perl 1.x users out there that can be in trouble.
+
+The attached patch fixes the problem.
+
+Any one have contacts with legacy apache maintainers?
+
+Regards.
+
+Salvador Ortiz.
+
+========= CUT ======
+--- src/os/unix/os.h.orig       2008-11-29 00:11:23.000000000 -0600
++++ src/os/unix/os.h    2008-11-29 00:15:15.000000000 -0600
+@@ -33,7 +33,12 @@
+ /* Compiler supports inline, so include the inlineable functions as
+  * part of the header
+  */
++#ifdef __GNUC_STDC_INLINE__
++#define INLINE extern ap_inline __attribute__((gnu_inline))
++#else
+ #define INLINE extern ap_inline
++#endif
++
+ 
+ INLINE int ap_os_is_path_absolute(const char *file);
+
+
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache1.git/commitdiff/4bcbfb893caf2d250288a56399dff742c8b6cf15