--- libapache-mod-auth-radius-1.5.8.orig/Makefile +++ libapache-mod-auth-radius-1.5.8/Makefile @@ -49,3 +49,4 @@ # clean: @rm -f *~ *.o mod_auth_radius-${VERSION}.tar + rm -rf .libs/ --- libapache-mod-auth-radius-1.5.8.orig/debian/500mod_auth_radius.info +++ libapache-mod-auth-radius-1.5.8/debian/500mod_auth_radius.info @@ -0,0 +1,2 @@ +LoadModule: radius_auth_module /usr/lib/apache/1.3/mod_auth_radius.so +Description: This modules provide radius authentication for apache --- libapache-mod-auth-radius-1.5.8.orig/debian/apache2 +++ libapache-mod-auth-radius-1.5.8/debian/apache2 @@ -0,0 +1,2 @@ +mod debian/auth_radius.load +mod .libs/mod_auth_radius.so --- libapache-mod-auth-radius-1.5.8.orig/debian/auth_radius.load +++ libapache-mod-auth-radius-1.5.8/debian/auth_radius.load @@ -0,0 +1 @@ +LoadModule radius_auth_module /usr/lib/apache2/modules/mod_auth_radius.so --- libapache-mod-auth-radius-1.5.8.orig/debian/changelog +++ libapache-mod-auth-radius-1.5.8/debian/changelog @@ -0,0 +1,101 @@ +libapache-mod-auth-radius (1.5.8-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Added patch to fix FTBFS (Closes: #765062) thanks to + Josip Rodin and Michael Tautschnig . + * debian/control: Standards-Version to 3.9.6. + * debian/watch: Included. + + -- Paulo Roberto Alves de Oliveira (aka kretcheu) Sat, 12 Dec 2015 17:44:00 -0200 + +libapache-mod-auth-radius (1.5.8-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Port to Apache 2.4 (closes: #666852). + + -- Colin Watson Thu, 11 Jul 2013 13:17:38 +0100 + +libapache-mod-auth-radius (1.5.8-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "Dropping the apache2-dev virtual package" by replacing the removed + build-dependency adequately (Closes: #667629) + + -- Arno Töll Sun, 01 Jul 2012 19:34:48 +0200 + +libapache-mod-auth-radius (1.5.8-1) unstable; urgency=medium + + * New upstream version. Incorporates all of our patches verbatim since + I appear to be the only person who cares for this upstream now. :) + * Packaging tidyups: source/format, compat, misc depends. + No upping of standards version because I can't be bothered to read + through the upgrading checklist :) + * Clear out .libs/ on clean. + + -- Josip Rodin Sun, 30 May 2010 15:00:09 +0200 + +libapache-mod-auth-radius (1.5.7-8) unstable; urgency=high + + * Implemented the authn_provider/ap_register_provider stuff required + for the module to work under Apache 2.1 and higher, inspired by + the implementation in mod_auth_xradius and mod_authnz_ldap. + Now one can set 'AuthBasicProvider radius' and AAA should work, + finally closes: #439527. + * Improved the handling of the problem where one declares AuthRadiusActive, + but is missing the server IP - usually the result of doing + AddRadiusAuth in the general server config, but nothing in the + virtual host config. Now the module logs a warning message for that. + + -- Josip Rodin Wed, 5 Mar 2008 23:46:28 +0100 + +libapache-mod-auth-radius (1.5.7-7) unstable; urgency=high + + * New maintainer. + * Applied patch 002.CAN2005-0108.diff against the Apache 2.0 source file. + * Replaced the building of the libapache-mod-auth-radius binary package + with the building of the libapache2-mod-auth-radius binary package, + because Apache 1.x has been removed. + * Stole the a2* postinst/prerm snippets from libapache2-mod-php5 :) + * Some tidyups in the packaging. + + -- Josip Rodin Tue, 24 Jul 2007 11:53:32 +0200 + +libapache-mod-auth-radius (1.5.7-6) unstable; urgency=high + + * [SECURITY] Fix Denial of service: + - Add patch 002.CAN2005-0108.diff. (CAN2005-0108) + (Closes: #289976) + + -- Fabio M. Di Nitto Wed, 19 Jan 2005 11:07:11 +0100 + +libapache-mod-auth-radius (1.5.7-5) unstable; urgency=low + + * Typo fix in postinst/prerm + + -- Fabio M. Di Nitto Sat, 08 Nov 2003 18:08:56 +0100 + +libapache-mod-auth-radius (1.5.7-4) unstable; urgency=low + + * Updated postinst and postrm to be more gently with users + + -- Fabio M. Di Nitto Wed, 29 Oct 2003 06:20:24 +0100 + +libapache-mod-auth-radius (1.5.7-3) unstable; urgency=low + + * Package cleanup and updated to use modules-config + * Standard-Version: 3.6.1 + + -- Fabio M. Di Nitto Mon, 06 Oct 2003 18:05:17 +0200 + +libapache-mod-auth-radius (1.5.7-2) unstable; urgency=low + + * Build-deps are now Policy compliant (Closes: #201462) + * Standard-Version: 3.6.0 + + -- Fabio M. Di Nitto Wed, 16 Jul 2003 12:18:24 +0200 + +libapache-mod-auth-radius (1.5.7-1) unstable; urgency=low + + * First debian package (Closes: #189689) + + -- Fabio M. Di Nitto Sat, 19 Apr 2003 20:08:57 +0200 --- libapache-mod-auth-radius-1.5.8.orig/debian/compat +++ libapache-mod-auth-radius-1.5.8/debian/compat @@ -0,0 +1 @@ +5 --- libapache-mod-auth-radius-1.5.8.orig/debian/control +++ libapache-mod-auth-radius-1.5.8/debian/control @@ -0,0 +1,15 @@ +Source: libapache-mod-auth-radius +Maintainer: Josip Rodin +Uploaders: Fabio M. Di Nitto +Section: web +Priority: optional +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 5), dh-apache2, apache2-dev + +Package: libapache2-mod-auth-radius +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: radius-server, apache2 +Description: Apache 2.x module for RADIUS authentication + mod_auth_radius is an Apache 2.x module for authenticating users + against information stored in a RADIUS server. --- libapache-mod-auth-radius-1.5.8.orig/debian/copyright +++ libapache-mod-auth-radius-1.5.8/debian/copyright @@ -0,0 +1,57 @@ +This package was first debianized by Fabio M. Di Nitto on +Sat, 19 Apr 2003 16:58:16 +0200. +The current maintainer is Josip Rodin . + +The original sources can be found at: + http://www.freeradius.org/mod_auth_radius/ + +Copyright (extracted from mod_auth_radius.c): + + * Copyright (c) 1997-2002 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 + * ITS 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 . --- libapache-mod-auth-radius-1.5.8.orig/debian/rules +++ libapache-mod-auth-radius-1.5.8/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 +tmp := $(CURDIR)/debian/libapache2-mod-auth-radius + +build: patch build-stamp + +build-stamp: + dh_testdir + apxs2 -c mod_auth_radius-2.0.c + ln -f .libs/mod_auth_radius-2.0.so .libs/mod_auth_radius.so + touch build-stamp + +patch: +# if [ ! -f patch-stamp ]; then \ +# patch -p1 < debian/patches/something.diff && \ +# touch patch-stamp; \ +# fi + +unpatch: +# if [ -f patch-stamp ]; then \ +# patch -Rp1 < debian/patches/something.diff && \ +# rm -f patch-stamp; \ +# fi + +clean: unpatch real-clean +real-clean: + dh_testdir + dh_testroot + $(MAKE) clean + dh_clean build-stamp .libs/mod_auth_radius.so + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + dh_apache2 + +binary-indep: + #nothing to do + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs README + dh_installexamples htaccess httpd.conf + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-arch binary-indep binary install patch unpatch --- libapache-mod-auth-radius-1.5.8.orig/debian/source/format +++ libapache-mod-auth-radius-1.5.8/debian/source/format @@ -0,0 +1 @@ +1.0 --- libapache-mod-auth-radius-1.5.8.orig/debian/watch +++ libapache-mod-auth-radius-1.5.8/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://freeradius.org/mod_auth_radius/ .*/mod_auth_radius-(\d.*)\.(?:tgz|tbz2|txz|tar) --- libapache-mod-auth-radius-1.5.8.orig/mod_auth_radius-2.0.c +++ libapache-mod-auth-radius-1.5.8/mod_auth_radius-2.0.c @@ -288,14 +288,17 @@ */ #include -#include #include +#include +#include +#include #include "httpd.h" #include "http_config.h" #include "http_core.h" #include "http_log.h" #include "http_protocol.h" +#include "http_request.h" #include "util_md5.h" #include "apr_general.h" #include "apr_tables.h" @@ -304,6 +307,10 @@ #include "ap_provider.h" #include "mod_auth.h" +#ifdef APLOG_USE_MODULE +APLOG_USE_MODULE(radius_auth); +#endif + module AP_MODULE_DECLARE_DATA radius_auth_module; @@ -366,6 +373,12 @@ #define TRUE !FALSE #endif +#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) +#define CLIENT_IP(conn) ((conn)->client_ip) +#else +#define CLIENT_IP(conn) ((conn)->remote_ip) +#endif + /* per-server configuration structure */ typedef struct radius_server_config_struct { struct in_addr *radius_ip; /* server IP address */ @@ -680,7 +693,7 @@ * benefit here. */ apr_snprintf(one, COOKIE_SIZE, "%s%s%s%s%s%08x", scr->secret, - r->user, passwd, c->remote_ip, hostname, expires); + r->user, passwd, CLIENT_IP(c), hostname, expires); /* if you're REALLY worried about what's going on */ @@ -688,7 +701,7 @@ ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," secret = %s\n", scr->secret); ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," user = %s\n", r->user); ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," passwd = %s\n", passwd); - ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip = %s\n", c->remote_ip); + ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip = %s\n", CLIENT_IP(c)); ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," hostname = %s\n", hostname); ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," expiry = %08x\n", expires); #endif --- libapache-mod-auth-radius-1.5.8.orig/mod_auth_radius-2.0.la +++ libapache-mod-auth-radius-1.5.8/mod_auth_radius-2.0.la @@ -0,0 +1,41 @@ +# mod_auth_radius-2.0.la - a libtool library file +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='mod_auth_radius-2.0.so' + +# Names of this library. +library_names='mod_auth_radius-2.0.so mod_auth_radius-2.0.so mod_auth_radius-2.0.so' + +# The name of the static archive. +old_library='' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs='' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for mod_auth_radius-2.0. +current=0 +age=0 +revision=0 + +# Is this an already installed library? +installed=no + +# Should we warn about portability when linking against -modules? +shouldnotlink=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/usr/lib/apache2/modules' --- libapache-mod-auth-radius-1.5.8.orig/mod_auth_radius-2.0.lo +++ libapache-mod-auth-radius-1.5.8/mod_auth_radius-2.0.lo @@ -0,0 +1,12 @@ +# mod_auth_radius-2.0.lo - a libtool object file +# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Name of the PIC object. +pic_object='.libs/mod_auth_radius-2.0.o' + +# Name of the non-PIC object +non_pic_object=none +