Bug#666846: libapache-mod-evasive: diff for NMU version 1.10.1-1.1

2013-07-10 Thread Alberto Gonzalez Iniesta
Hi Colin,

Thanks for the patch&upload. DELAYED/2 is OK, I'll upload today if time
permits.

Cheers,

Alberto

On Wed, Jul 10, 2013 at 09:41:34AM +0100, Colin Watson wrote:
> Control: tag -1 pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for libapache-mod-evasive (versioned as 1.10.1-1.1)
> and uploaded it to DELAYED/2.  Please feel free to tell me if I should
> delay it longer.
> 
> Regards,
> 

-- 
Alberto Gonzalez Iniesta| Formación, consultoría y soporte técnico
agi@(inittab.org|debian.org)| en GNU/Linux y software libre
Encrypted mail preferred| http://inittab.com

Key fingerprint = 5347 CBD8 3E30 A9EB 4D7D  4BF2 009B 3375 6B9A AA55


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#666846: libapache-mod-evasive: diff for NMU version 1.10.1-1.1

2013-07-10 Thread Colin Watson
Control: tag -1 pending

Dear maintainer,

I've prepared an NMU for libapache-mod-evasive (versioned as 1.10.1-1.1)
and uploaded it to DELAYED/2.  Please feel free to tell me if I should
delay it longer.

Regards,

-- 
Colin Watson   [cjwat...@debian.org]
diff -Nru libapache-mod-evasive-1.10.1/debian/changelog libapache-mod-evasive-1.10.1/debian/changelog
--- libapache-mod-evasive-1.10.1/debian/changelog	2013-07-10 09:40:54.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/changelog	2013-07-10 09:12:08.0 +0100
@@ -1,3 +1,10 @@
+libapache-mod-evasive (1.10.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Port to Apache 2.4 (closes: #666846).
+
+ -- Colin Watson   Wed, 10 Jul 2013 09:12:03 +0100
+
 libapache-mod-evasive (1.10.1-1) unstable; urgency=low
 
   * New upstream version. Changed package name. s/dos//
diff -Nru libapache-mod-evasive-1.10.1/debian/control libapache-mod-evasive-1.10.1/debian/control
--- libapache-mod-evasive-1.10.1/debian/control	2013-07-10 09:40:54.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/control	2013-07-08 15:40:07.0 +0100
@@ -2,12 +2,12 @@
 Section: web
 Priority: optional
 Maintainer: Alberto Gonzalez Iniesta 
-Build-Depends: debhelper (>> 4.0.0), apache2-threaded-dev
+Build-Depends: debhelper (>> 4.0.0), dh-apache2, apache2-dev
 Standards-Version: 3.7.2.2
 
 Package: libapache2-mod-evasive
 Architecture: any
-Depends: apache2.2-common, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: evasive module to minimize HTTP DoS or brute force attacks
  mod_evasive is an evasive maneuvers module for Apache to provide some
  protection in the event of an HTTP DoS or DDoS attack or brute force attack.
diff -Nru libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.apache2 libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.apache2
--- libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.apache2	1970-01-01 01:00:00.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.apache2	2013-07-08 15:41:00.0 +0100
@@ -0,0 +1,2 @@
+mod .libs/mod_evasive20.so
+mod debian/mod-evasive.load
diff -Nru libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.dirs libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.dirs
--- libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.dirs	2013-07-10 09:40:54.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.dirs	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-usr/lib/apache2/modules
diff -Nru libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.install libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.install
--- libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.install	2013-07-10 09:40:54.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.install	1970-01-01 01:00:00.0 +0100
@@ -1,2 +0,0 @@
-.libs/mod_evasive20.so usr/lib/apache2/modules
-debian/mod-evasive.load etc/apache2/mods-available
diff -Nru libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.postinst libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.postinst
--- libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.postinst	2013-07-10 09:40:54.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.postinst	1970-01-01 01:00:00.0 +0100
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-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/mod-evasive.load ]; then
-reload_apache
-fi
-exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
-# Enable the module, but hide a2enmod's misleading message about apachectl
-# and force-reload the thing ourselves.
-a2enmod mod-evasive >/dev/null || true
-reload_apache
-fi
-
diff -Nru libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.prerm libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.prerm
--- libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.prerm	2013-07-10 09:40:54.0 +0100
+++ libapache-mod-evasive-1.10.1/debian/libapache2-mod-evasive.prerm	1970-01-01 01:00:00.0 +0100
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-# copied from libapache2-mod-php4
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
-exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
-a2dismod mod-evasive || true
-fi
-
-exit 0
diff -Nru libapache-mod-evasive-1.10.1/debian/patches/aplog-use-module.patch libapache-mod-evasive-1.10.1/debian/patches/aplog-use-module.patch
--- libapache-mod-evasive-1.10.1/debian/patches/aplog-use-module.patch	1970-01-01 01:00:00