libapache2-mod-rpaf upload to stable-proposed-updates
I would like to make an upload to stable in order to fix bugs #636893
(drop yada using) and #653330 (configuration file ignored).
The full debdiff between this new package version and the version
0.5-3+squeeze1 currently in Squeeze is attached.
Sven, would you like to sponsor this upload?
diff -u libapache2-mod-rpaf-0.5/debian/rules libapache2-mod-rpaf-0.5/debian/rules
--- libapache2-mod-rpaf-0.5/debian/rules
+++ libapache2-mod-rpaf-0.5/debian/rules
@@ -2,260 +2,13 @@
-# Generated automatically from debian/packages
-# by yada v0.55, of Tue, 15 Dec 2009
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU 2>/dev/null)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2>/dev/null)
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
+%:
+ dh $@
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
-DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
-DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
-DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU 2>/dev/null)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2>/dev/null)
-DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM 2>/dev/null)
+override_dh_auto_clean:
+ rm -rf .libs *.la *.lo
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
- DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
- ifeq ($(DEB_HOST_ARCH_CPU),i486)
- DEB_HOST_ARCH_OS := i386
- else
- ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
- DEB_HOST_ARCH_OS := amd64
- endif
- endif
-endif
-ifeq ($(DEB_HOST_ARCH_OS),)
- DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
- ifeq ($(DEB_HOST_ARCH_OS),gnu)
- DEB_HOST_ARCH_OS := hurd
- endif
-endif
-ifeq ($(DEB_BUILD_ARCH_CPU),)
- DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
- ifeq ($(DEB_BUILD_ARCH_CPU),i486)
- DEB_BUILD_ARCH_OS := i386
- else
- ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
- DEB_BUILD_ARCH_OS := amd64
- endif
- endif
-endif
-ifeq ($(DEB_BUILD_ARCH_OS),)
- DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
- ifeq ($(DEB_BUILD_ARCH_OS),gnu)
- DEB_BUILD_ARCH_OS := hurd
- endif
-endif
+override_dh_auto_build:
+ apxs2 -S CFLAGS="$(CFLAGS) -D_LARGEFILE64_SOURCE $(CPPFLAGS)" -c -o mod_rpaf.so mod_rpaf-2.0.c
-LEFT_PARENTHESIS:=(
-VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]* $(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
+override_dh_auto_test:
-SHELL=/bin/bash
-
-.PHONY: default
-default:
- @echo "Specify a target:"; \
- echo " build compile the package"; \
- echo " build-arch compile the architecture-dependent package"; \
- echo " build-indep compile the architecture-independent package"; \
- echo " binary make all binary packages"; \
- echo " binary-arch make all architecture-dependent binary packages"; \
- echo " binary-indep make all architecture-independent binary packages"; \
- echo " clean clean up the source package"; \
- echo; \
- echo " clean-install-tree clean up only under debian/"; \
- echo
-
-# Build the package and prepare the install tree
-
-.PHONY: build-only build
-build-only: debian/build-stamp
-build: build-only
-
-.PHONY: build-arch-only build-arch
-build-arch-only: debian/build-arch-stamp
-build-arch: build-arch-only
-
-.PHONY: build-indep-only build-indep
-build-indep-only: debian/build-indep-stamp
-build-indep: build-indep-only
-
-# Make sure these rules and the control file are up-to-date
-
-.PHONY: rules control templates
-rules: debian/rules
-debian/rules: $(shell which yada) debian/packages-tmp
- yada rebuild rules
-
-control: debian/control
-debian/control: $(shell which yada) debian/packages-tmp
- yada rebuild control
-
-templates: debian/templates debian/po/POTFILES.in
-debian/templates: $(shell which yada) debian/packages-tmp
- yada rebuild templates
-debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
- yada rebuild templates
-
-debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
- @[ -f $(shell which yada) -a -f debian/rules ]
- yada patch "debian/patches/*.patch"
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export SOURCE="libapache2-mod-rpaf" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
- echo -E 'APXS2=$${APXS2:-apxs2}';\
- echo -E 'CFLAGS=$${CFLAGS:--Wall -g}';\
- echo -E 'if [ "$${DEB_BUILD_OPTIONS#*noopt}" != "$$DEB_BUILD_OPTIONS" ]; then';\
- echo -E ' CFLAGS="$$CFLAGS -O0"';\
- echo -E 'else';\
- echo -E ' CFLAGS="$$CFLAGS -O2"';\
- echo -E 'fi';\
- echo -E '';\
- echo -E 'if [ -d apache2-build ]; then';\
- echo -E ' rm -rf apache2-build';\
- echo -E 'fi';\
- echo -E 'mkdir apache2-build';\
- echo -E 'pushd apache2-build';\
- echo -E ' cp -a ../mod_rpaf-2.0.c mod_rpaf.c';\
- echo -E ' $$APXS2 -c -S CFLAGS="`$$APXS2 -q CFLAGS` `apr-1-config --cppflags` $$CFLAGS" mod_rpaf.c';\
- echo -E 'popd') | /bin/bash
- touch debian/build-stamp
-
-debian/build-arch-stamp:
- @[ -f $(shell which yada) -a -f debian/rules ]
- yada patch "debian/patches/*.patch"
- touch debian/build-arch-stamp
-
-debian/build-indep-stamp: debian/build-arch-stamp
- @[ -f $(shell which yada) -a -f debian/rules ]
- yada patch "debian/patches/*.patch"
- touch debian/build-indep-stamp
-
-.PHONY: install-tree
-install-tree: install-tree-any
-install-tree-any: \
- debian/tmp-libapache2-mod-rpaf/DEBIAN/control
-
-debian/tmp-libapache2-mod-rpaf/DEBIAN/control: debian/build-stamp debian/control
- rm -rf debian/tmp-libapache2-mod-rpaf
- umask 022 && install -d debian/tmp-libapache2-mod-rpaf/DEBIAN
- install -d debian/tmp-libapache2-mod-rpaf/usr/share/doc/libapache2-mod-rpaf
- umask 022; yada generate copyright libapache2-mod-rpaf \
- > debian/tmp-libapache2-mod-rpaf/usr/share/doc/libapache2-mod-rpaf/copyright
- install -m 644 -p debian/changelog \
- debian/tmp-libapache2-mod-rpaf/usr/share/doc/libapache2-mod-rpaf/changelog.Debian
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export ROOT="$$(pwd)/debian/tmp-libapache2-mod-rpaf" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export CONTROL="$$(pwd)/debian/tmp-libapache2-mod-rpaf/DEBIAN" \
- && export PACKAGE="libapache2-mod-rpaf" \
- && export SOURCE="libapache2-mod-rpaf" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
- echo -E 'APXS2=$${APXS2:-apxs2}';\
- echo -E 'LIBEXECDIR=$$($$APXS2 -q LIBEXECDIR)';\
- echo -E 'yada install -dir $$LIBEXECDIR';\
- echo -E '$$APXS2 -i -S LIBEXECDIR="$$ROOT$$LIBEXECDIR" apache2-build/mod_rpaf.la';\
- echo -E 'yada install -conf -into /etc/apache2/mods-available debian/conf/*.conf';\
- echo -E 'yada install -conf -into /etc/apache2/mods-available debian/conf/*.load';\
- echo -E 'yada install -doc debian/doc/README.Debian') | /bin/sh
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export ROOT="$$(pwd)/debian/tmp-libapache2-mod-rpaf" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export CONTROL="$$(pwd)/debian/tmp-libapache2-mod-rpaf/DEBIAN" \
- && export PACKAGE="libapache2-mod-rpaf" \
- && export SOURCE="libapache2-mod-rpaf" \
- && export VERSION="$(VERSION)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
- echo -E 'yada perl';\
- echo -E 'yada python';\
- echo -E 'yada strip';\
- echo -E 'yada shlibdeps') | /bin/sh
- yada compress libapache2-mod-rpaf
- yada generate maintscripts libapache2-mod-rpaf
- find debian/tmp-libapache2-mod-rpaf -type f -print \
- | sed -n 's/^debian\/tmp-libapache2-mod-rpaf\(\/etc\/.*\)$$/\1/p' \
- > debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles
- test -s debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles || rm -f debian/tmp-libapache2-mod-rpaf/DEBIAN/conffiles
- yada rebuild control
- yada generate substvars libapache2-mod-rpaf
- umask 022 && dpkg-gencontrol -isp -plibapache2-mod-rpaf -Pdebian/tmp-libapache2-mod-rpaf
-
-# Build package files
-
-.PHONY: binary binary-arch binary-indep
-binary: binary-arch binary-indep
-binary-arch: binary-arch-any
-
-.PHONY: binary-arch-any
-binary-arch-any: \
- binary-package-libapache2-mod-rpaf
-binary-indep:
-
-.PHONY: binary-package-libapache2-mod-rpaf
-binary-package-libapache2-mod-rpaf: check-root debian/tmp-libapache2-mod-rpaf/DEBIAN/control
- @[ -f $(shell which yada) -a -f debian/rules ]
- chown -R 0.0 debian/tmp-libapache2-mod-rpaf
- chmod -R u=rwX,go=rX debian/tmp-libapache2-mod-rpaf
- @if [ -d debian/tmp-libapache2-mod-rpaf/usr/doc/libapache2-mod-rpaf ]; then \
- echo "*** Yada warning: /usr/doc/libapache2-mod-rpaf should be /usr/share/doc/libapache2-mod-rpaf";\
- fi
- dpkg-deb --build debian/tmp-libapache2-mod-rpaf ..
-
-.PHONY: check-root
-check-root:
- @[ `id -u` = 0 ] || (echo "You must be root to do this!"; false)
-
-debian/packages-tmp: debian/packages
- yada rebuild packages
-
-## Clean up afterwards
-
-.PHONY: clean clean-install-tree clean-build
-
-clean: clean-install-tree clean-build debian/control debian/rules
- rm -f debian/packages-tmp debian/packages-tmp-new debian/packages-tmp-include
-
-clean-build:
- @[ -f $(shell which yada) -a -f debian/rules ]
- rm -f debian/build-stamp debian/build-arch-stamp debian/build-indep-stamp
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export SOURCE="libapache2-mod-rpaf" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
- echo -E 'rm -rf *-build || true') | /bin/sh
- yada unpatch
- rm -rf debian/tmp
-
-clean-install-tree: debian/rules
- @[ -f $(shell which yada) -a -f debian/rules ]
- rm -f debian/install-tree-stamp
- rm -rf debian/tmp-* debian/files* debian/substvars debian/shlibs.local debian/ucf
+override_dh_auto_install:
diff -u libapache2-mod-rpaf-0.5/debian/changelog libapache2-mod-rpaf-0.5/debian/changelog
--- libapache2-mod-rpaf-0.5/debian/changelog
+++ libapache2-mod-rpaf-0.5/debian/changelog
@@ -1,3 +1,11 @@
+libapache2-mod-rpaf (0.5-3+squeeze2) stable; urgency=low
+
+ * Drop yada build-deps, use debhelper to build (Closes: #636893)
+ * Fixed module naming stuff in rpaf.conf (Thanks to Alexander
+ Kuznetsov). Closes: #653330.
+
+ -- Sergey B Kirpichev <skirpichev@gmail.com> Thu, 27 Dec 2012 16:30:48 +0400
+
libapache2-mod-rpaf (0.5-3+squeeze1) stable-security; urgency=high
* New maintainer (See: #636732)
diff -u libapache2-mod-rpaf-0.5/debian/control libapache2-mod-rpaf-0.5/debian/control
--- libapache2-mod-rpaf-0.5/debian/control
+++ libapache2-mod-rpaf-0.5/debian/control
@@ -3,14 +3,14 @@
Section: web
Priority: extra
Standards-Version: 3.7.2
-Build-Depends: apache2-threaded-dev (>= 2.0.50-10), yada (>= 0.55)
+Build-Depends: debhelper (>= 8.0.0~), apache2-prefork-dev (>= 2.2.3) | apache2-threaded-dev (>= 2.2.3)
Homepage: http://stderr.net/apache/rpaf/
Vcs-Browser: http://svn.debian.org/wsvn/cvsdebuild/trunk/debian/dists/libapache2-mod-rpaf/
Vcs-Svn: svn://svn.debian.org/cvsdebuild/trunk/debian/dists/libapache2-mod-rpaf
Package: libapache2-mod-rpaf
Architecture: any
-Depends: apache2.2-common (>= 2.2.16-6+squeeze7), ${libapache2-mod-rpaf:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2.2-common
Description: module for Apache2 which takes the last IP from the 'X-Forwarded-For' header
rpaf is short for reverse proxy add forward.
.
reverted:
--- libapache2-mod-rpaf-0.5/debian/packages
+++ libapache2-mod-rpaf-0.5.orig/debian/packages
@@ -1,151 +0,0 @@
-# $Id: /svn/trunk/debian/dists/libapache2-mod-rpaf/debian/packages 2442 2007-10-30T14:19:40.297193Z dexter $
-
-# If the debian/rules or debian/control file is missing, rebuild the file:
-#
-# $ yada rebuild control
-# $ yada rebuild rules
-
-
-%define apache2_version %`dpkg -s apache2-threaded-dev | grep ^Version | sed 's/^Version: //'`
-
-
-Source: libapache2-mod-rpaf
-Section: web
-Priority: extra
-Maintainer: Sergey B Kirpichev <skirpichev@gmail.com>
-Standards-Version: 3.7.2
-Upstream-Source: http://stderr.net/apache/rpaf/download/
-%if %`dpkg --compare-versions %{YADA_VERSION} ge 0.54 && echo 1`
-Homepage: http://stderr.net/apache/rpaf/
-Vcs-Browser: http://svn.debian.org/wsvn/cvsdebuild/trunk/debian/dists/libapache2-mod-rpaf/
-Vcs-Svn: svn://svn.debian.org/cvsdebuild/trunk/debian/dists/libapache2-mod-rpaf
-%endif
-Description: module for Apache which takes the last IP from the 'X-Forwarded-For' header
-Copyright: .
- ====================================================================
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- .
- 3. All advertising materials mentioning features or use of this
- software must display the following acknowledgment:
- "This product includes software developed by the Apache Group
- for use in the Apache HTTP server project (http://www.apache.org/)."
- .
- 4. The names "Apache Server" and "Apache Group" must not be used to
- endorse or promote products derived from this software without
- prior written permission.
- .
- 5. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by the Apache Group
- for use in the Apache HTTP server project (http://www.apache.org/)."
- .
- THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
- EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
- IT'S CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
- ====================================================================
- .
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Group and was originally based
- on public domain software written at the National Center for
- Supercomputing Applications, University of Illinois, Urbana-Champaign.
- For more information on the Apache Group and the Apache HTTP server
- project, please see <http://www.apache.org/>.
- .
- Author: Thomas Eibner, <thomas@stderr.net>
-Patches: patches/*.patch
-Major-Changes:
-%`cd debian/patches; ls *.patch | sed -e 's/^/ /'`
-Build-Depends: apache2-threaded-dev (>= 2.0.50-10)
-Build: bash
- APXS2=${APXS2:-apxs2}
- CFLAGS=${CFLAGS:--Wall -g}
- if [ "${DEB_BUILD_OPTIONS#*noopt}" != "$DEB_BUILD_OPTIONS" ]; then
- CFLAGS="$CFLAGS -O0"
- else
- CFLAGS="$CFLAGS -O2"
- fi
- .
- if [ -d apache2-build ]; then
- rm -rf apache2-build
- fi
- mkdir apache2-build
- pushd apache2-build
- cp -a ../mod_rpaf-2.0.c mod_rpaf.c
- $APXS2 -c -S CFLAGS="`$APXS2 -q CFLAGS` `apr-1-config --cppflags` $CFLAGS" mod_rpaf.c
- popd
-Clean: sh
- rm -rf *-build || true
-
-Package: libapache2-mod-rpaf
-Architecture: any
-Depends: apache2.2-common (>= %{apache2_version}), []
-Description: module for Apache2 which takes the last IP from the 'X-Forwarded-For' header
- rpaf is short for reverse proxy add forward.
- .
- rpaf is for backend Apache servers what mod_proxy_add_forward is for
- frontend Apache servers. It does exactly the opposite of
- mod_proxy_add_forward written by Ask Bjorn Hansen.
- .
- It changes the remote address of the client visible to other Apache modules
- when two conditions are satisfied. First condition is that the remote client
- is actually a proxy that is defined in httpd.conf. Secondly if there is an
- incoming X-Forwarded-For header and the proxy is in its list of known
- proxies it takes the last IP from the incoming X-Forwarded-For header and
- changes the remote address of the client in the request structure.
-Install: sh
- APXS2=${APXS2:-apxs2}
- LIBEXECDIR=$($APXS2 -q LIBEXECDIR)
- yada install -dir $LIBEXECDIR
- $APXS2 -i -S LIBEXECDIR="$ROOT$LIBEXECDIR" apache2-build/mod_rpaf.la
- yada install -conf -into /etc/apache2/mods-available debian/conf/*.conf
- yada install -conf -into /etc/apache2/mods-available debian/conf/*.load
- yada install -doc debian/doc/README.Debian
-Postinst: sh
- reload_apache()
- {
- if apache2ctl configtest 2>/dev/null; then
- invoke-rc.d apache2 force-reload || true
- else
- echo "Your apache2 configuration is broken, so we're not restarting it for you."
- fi
- }
- .
- if [ -n "$2" ]; then
- # we're upgrading. test if we're enabled, and if so, restart to reload the module.
- if [ -e /etc/apache2/mods-enabled/rpaf.load ]; then
- reload_apache
- fi
- exit 0
- elif [ -e /etc/apache2/apache2.conf ]; then
- a2enmod rpaf >/dev/null || true
- reload_apache
- fi
-Prerm: sh
- if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
- if [ -e /etc/apache2/apache2.conf ]; then
- a2dismod rpaf || true
- fi
- fi
-
-# Debug:
-# with_debian_etch=%{with_debian_etch}
-# apache2_version=%{apache2_version}
diff -u libapache2-mod-rpaf-0.5/debian/conf/rpaf.conf libapache2-mod-rpaf-0.5/debian/conf/rpaf.conf
--- libapache2-mod-rpaf-0.5/debian/conf/rpaf.conf
+++ libapache2-mod-rpaf-0.5/debian/conf/rpaf.conf
@@ -1,4 +1,4 @@
-<IfModule mod_rpaf.c>
+<IfModule rpaf_module>
RPAFenable On
RPAFsethostname On
RPAFproxy_ips 127.0.0.1
only in patch2:
unchanged:
--- libapache2-mod-rpaf-0.5.orig/debian/copyright
+++ libapache2-mod-rpaf-0.5/debian/copyright
@@ -0,0 +1,57 @@
+The original package was created by Piotr Roszatycki on 30 Aug 2001.
+The conversion to debhelper was done by Sven Hoexter on 18 Aug 2011.
+
+The upstream sources were retreived from: http://stderr.net/apache/rpaf/
+
+Upstream Author: Thomas Eibner <thomas@stderr.net>
+
+
+Copyright and licence notice:
+
+ ====================================================================
+ Copyright (c) 1995 The Apache Group. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ 3. All advertising materials mentioning features or use of this
+ software must display the following acknowledgment:
+ "This product includes software developed by the Apache Group
+ for use in the Apache HTTP server project (http://www.apache.org/)."
+ 4. The names "Apache Server" and "Apache Group" must not be used to
+ endorse or promote products derived from this software without
+ prior written permission.
+
+ 5. Redistributions of any form whatsoever must retain the following
+ acknowledgment:
+ "This product includes software developed by the Apache Group
+ for use in the Apache HTTP server project (http://www.apache.org/)."
+
+ THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
+ IT'S CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Group and was originally based
+ on public domain software written at the National Center for
+ Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ For more information on the Apache Group and the Apache HTTP server
+ project, please see <http://www.apache.org/>.
only in patch2:
unchanged:
--- libapache2-mod-rpaf-0.5.orig/debian/install
+++ libapache2-mod-rpaf-0.5/debian/install
@@ -0,0 +1,3 @@
+.libs/mod_rpaf.so usr/lib/apache2/modules
+debian/conf/rpaf.load etc/apache2/mods-available
+debian/conf/rpaf.conf etc/apache2/mods-available
only in patch2:
unchanged:
--- libapache2-mod-rpaf-0.5.orig/debian/compat
+++ libapache2-mod-rpaf-0.5/debian/compat
@@ -0,0 +1 @@
+8
Reply to: