Control: tag -1 patch On Sun, Apr 01, 2012 at 09:15:51PM +0000, a...@debian.org wrote: > your package libapache2-mod-authn-yubikey is provding an Apache2 web server > module. > We're upgrading Apache to the new upstream version 2.4 [1] (tracked > as transition bug #661958). This requires all modules to be rebuilt > due to ABI changes.
Here's a patch. Please review. diff -Nru libapache2-mod-authn-yubikey-1.0/debian/changelog libapache2-mod-authn-yubikey-1.0/debian/changelog --- libapache2-mod-authn-yubikey-1.0/debian/changelog 2011-02-10 20:47:32.000000000 +0000 +++ libapache2-mod-authn-yubikey-1.0/debian/changelog 2013-07-09 17:01:55.000000000 +0100 @@ -1,3 +1,10 @@ +libapache2-mod-authn-yubikey (1.0-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Port to Apache 2.4 (closes: #666806). + + -- Colin Watson <cjwat...@debian.org> Tue, 09 Jul 2013 17:01:41 +0100 + libapache2-mod-authn-yubikey (1.0-1) unstable; urgency=low * Initial release (Closes: #612810) diff -Nru libapache2-mod-authn-yubikey-1.0/debian/control libapache2-mod-authn-yubikey-1.0/debian/control --- libapache2-mod-authn-yubikey-1.0/debian/control 2011-02-12 10:24:28.000000000 +0000 +++ libapache2-mod-authn-yubikey-1.0/debian/control 2013-07-09 17:00:59.000000000 +0100 @@ -2,13 +2,13 @@ Section: web Priority: extra Maintainer: Alexandre De Dommelin <adedomme...@tuxz.net> -Build-Depends: debhelper (>= 7.0.50~), apache2-threaded-dev, libcurl4-openssl-dev +Build-Depends: debhelper (>= 7.0.50~), dh-apache2, apache2-dev, libcurl4-openssl-dev Standards-Version: 3.9.1 Homepage: http://www.coffeecrew.org/software/yubikey-apache-plugin/ Package: libapache2-mod-authn-yubikey Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3, apache2 +Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3 Description: Yubikey authentication provider for Apache The mod_authn_yubikey module is an authentication provider for the Apache platform. It leverages the YubiKey which is diff -Nru libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.apache2 libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.apache2 --- libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.apache2 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.apache2 2013-07-09 17:01:23.000000000 +0100 @@ -0,0 +1,2 @@ +mod .libs/mod_authn_yubikey.so +mod debian/authn_yubikey.load diff -Nru libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.install libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.install --- libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.install 2011-02-10 20:28:48.000000000 +0000 +++ libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -.libs/mod_authn_yubikey.so usr/lib/apache2/modules -debian/authn_yubikey.load etc/apache2/mods-available diff -Nru libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.postinst libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.postinst --- libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.postinst 2011-02-12 11:50:36.000000000 +0000 +++ libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -#! /bin/sh -# postinst script for libapache2-mod-authn-yubikey - -set -e - -case "$1" in - configure) - a2enmod authn_yubikey - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.prerm libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.prerm --- libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.prerm 2011-02-12 11:50:42.000000000 +0000 +++ libapache2-mod-authn-yubikey-1.0/debian/libapache2-mod-authn-yubikey.prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -#! /bin/sh -# prerm script for libapache2-mod-authn-yubikey -# -set -e - -case "$1" in - remove|upgrade|deconfigure) - a2dismod authn_yubikey - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru libapache2-mod-authn-yubikey-1.0/debian/patches/apr-md5-include.patch libapache2-mod-authn-yubikey-1.0/debian/patches/apr-md5-include.patch --- libapache2-mod-authn-yubikey-1.0/debian/patches/apr-md5-include.patch 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authn-yubikey-1.0/debian/patches/apr-md5-include.patch 2013-07-09 17:00:40.000000000 +0100 @@ -0,0 +1,17 @@ +Description: Include "apr_md5.h" for apr_password_validate +Author: Colin Watson <cjwat...@debian.org> +Forwarded: no +Last-Update: 2013-07-09 + +Index: b/mod_authn_yubikey.c +=================================================================== +--- a/mod_authn_yubikey.c ++++ b/mod_authn_yubikey.c +@@ -30,6 +30,7 @@ + #include "apr_strings.h" + #include "apr_dbm.h" + #include "apr_time.h" ++#include "apr_md5.h" + #include "http_core.h" + #include "http_request.h" + diff -Nru libapache2-mod-authn-yubikey-1.0/debian/patches/series libapache2-mod-authn-yubikey-1.0/debian/patches/series --- libapache2-mod-authn-yubikey-1.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libapache2-mod-authn-yubikey-1.0/debian/patches/series 2013-07-09 16:58:02.000000000 +0100 @@ -0,0 +1 @@ +apr-md5-include.patch diff -Nru libapache2-mod-authn-yubikey-1.0/debian/rules libapache2-mod-authn-yubikey-1.0/debian/rules --- libapache2-mod-authn-yubikey-1.0/debian/rules 2011-02-13 14:06:50.000000000 +0000 +++ libapache2-mod-authn-yubikey-1.0/debian/rules 2013-07-09 17:01:09.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with apache2 override_dh_clean: dh_clean Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
