commit cc064d04f3d33c61d51c0455c0abc7ca96b071e6
Author: Jan Rękorajski <[email protected]>
Date: Sun Dec 28 19:13:47 2014 +0000
- fix building with apache 2.4
papi-apache24.patch | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
papi.spec | 2 ++
2 files changed, 66 insertions(+)
---
diff --git a/papi.spec b/papi.spec
index c549edd..fbb3284 100644
--- a/papi.spec
+++ b/papi.spec
@@ -13,6 +13,7 @@ Patch0: %{name}-glibc.patch
Patch1: %{name}-apache2.patch
Patch2: %{name}-install.patch
Patch3: format-security.patch
+Patch4: %{name}-apache24.patch
URL: http://openprinting.sourceforge.net/
BuildRequires: apache-devel >= 2.0
BuildRequires: apr-devel >= 1:1.0
@@ -101,6 +102,7 @@ Statyczne Biblioteki Free Standards Group Open Printing API.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
diff --git a/papi-apache24.patch b/papi-apache24.patch
new file mode 100644
index 0000000..6b76ede
--- /dev/null
+++ b/papi-apache24.patch
@@ -0,0 +1,64 @@
+--- papi-1.0_beta/source/mod_ipp/mod_ipp.c.orig 2014-12-28
18:46:04.022200871 +0000
++++ papi-1.0_beta/source/mod_ipp/mod_ipp.c 2014-12-28 19:08:43.342152920
+0000
+@@ -152,7 +152,7 @@
+ #endif
+ }
+
+-void _log_rerror(const char * file, int line, int level, request_rec *r,
++void _log_rerror(const char * file, int line, int level, const request_rec *r,
+ const char *fmt, ...)
+ {
+ va_list args;
+@@ -170,14 +170,14 @@
+ va_end(args);
+
+ #ifdef APACHE2
+- ap_log_rerror(file, line, level, APR_SUCCESS, r, "%s", message);
++ ap_log_rerror(file, line, 0, level, APR_SUCCESS, r, "%s", message);
+ #else
+ ap_log_rerror(file, line, level, r, message);
+ #endif
+ }
+
+ static int
+-ipp_handler(request_rec *r)
++ipp_handler(struct request_rec *r)
+ {
+ papi_attribute_t **request = NULL, **response = NULL;
+ IPPListenerConfig *config;
+@@ -218,7 +218,7 @@
+ status = ipp_read_message(read_data, r, &request, IPP_TYPE_REQUEST);
+
+ if (status != PAPI_OK)
+- _log_rerror(APLOG_MARK, APLOG_ERR, r,
++ _log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "read failed: %s\n", papiStatusString(status));
+ #ifdef DEBUG
+ papiAttributeListPrint(stderr, request, "request (%d) ", getpid());
+@@ -279,7 +279,7 @@
+ status = ipp_process_request(request, &response, read_data, r);
+ if (status != PAPI_OK) {
+ errno = 0;
+- _log_rerror(APLOG_MARK, APLOG_ERR, r,
++ _log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "request failed: %s\n", papiStatusString(status));
+ discard_data(r);
+ }
+@@ -306,7 +306,7 @@
+
+ status = ipp_write_message(write_data, r, response);
+ if (status != PAPI_OK)
+- _log_rerror(APLOG_MARK, APLOG_ERR, r,
++ _log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "write failed: %s\n", papiStatusString(status));
+ #ifdef DEBUG
+ fprintf(stderr, "write result: %s\n", papiStatusString(status));
+@@ -319,7 +319,7 @@
+ #ifndef APACHE2
+ ap_kill_timeout(r);
+ if (ap_rflush(r) < 0)
+- _log_rerror(APLOG_MARK, APLOG_ERR, r,
++ _log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "flush failed, response may not have been sent");
+ #endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/papi.git/commitdiff/cc064d04f3d33c61d51c0455c0abc7ca96b071e6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
