Bump

Makefile

@@ -12,11 +12,11 @@ all: .libs/mod_proxy_protocol.so
 
 # build the so in the current directory
 .libs/mod_proxy_protocol.so: mod_proxy_protocol.c
-	$(APXS) -c mod_proxy_protocol.c
+	$(APXS) -c -Wc,-Wall mod_proxy_protocol.c
 
 # install the so - usually needs root access
 install: .libs/mod_proxy_protocol.so
-	$(APXS) -i mod_proxy_protocol.c
+	$(APXS) -i mod_proxy_protocol.la
 
 # generate the html doc
 docs: mod_proxy_protocol.html

README.md

@@ -4,6 +4,10 @@ This is an [Apache](http://httpd.apache.org/) module that implements the
 server side of HAProxy's
 [Proxy Protocol](http://blog.haproxy.com/haproxy/proxy-protocol/).
 
+Note: as of Apache 2.4.30 this code has been merged into
+[mod_remoteip](https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html),
+with the `ProxyProtocol` directive renamed to `RemoteIPProxyProtocol`.
+
 ## Build and Install
 
 You'll need the apache development packages installed (typically something

debian/changelog

@@ -1,3 +1,15 @@
+mod-proxy-protocol (0.2-3) UNRELEASED; urgency=medium
+
+  * Add patch for CVE-2019-10097
+
+ -- Mario Fetka <mario.fetka@gmail.com>  Wed, 12 Feb 2020 11:54:28 +0100
+
+mod-proxy-protocol (0.2-1) xenial; urgency=low
+
+  * Merged patch to fix http/2 issues.
+
+ -- Roadrunner2 <roadrunner2@github.com>  Tue, 20 Mar 2018 02:11:49 -0700
+
 mod-proxy-protocol (0.1-1) trusty; urgency=low
 
   * Initial release

debian/control

@@ -8,7 +8,7 @@ Homepage: https://github.com/roadrunner2/mod-proxy-protocol
 
 Package: libapache2-mod-proxy-protocol
 Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-api-20120211, apache2 (>= 2.4.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-api-20120211
 Description: Apache module for proxy protocol
  The proxy protocol is a way for upstream proxies and load-balancers to
  for the ip-address of the client to the server. This package contains

debian/docs

@@ -1,5 +1,4 @@
 README.md
 mod_proxy_protocol.xml
 mod_proxy_protocol.xml.meta
-mod_proxy_protocol.html
 debian/README.Debian

debian/lintian-overrides

@@ -0,0 +1,2 @@
+libapache2-mod-proxy-protocol: apache2-module-depends-on-real-apache2-package
+libapache2-mod-proxy-protocol: copyright-should-refer-to-common-license-file-for-apache-2

debian/rules

@@ -4,7 +4,7 @@
 
 build:
 	dh_testdir
-	make all docs
+	make all # docs
 
 clean:
 	dh_testdir