From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 28 07:40:10 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B577116A4CF for ; Tue, 28 Oct 2003 07:40:10 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8AD143FBF for ; Tue, 28 Oct 2003 07:40:08 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9SFe8FY005306 for ; Tue, 28 Oct 2003 07:40:08 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9SFe8Eg005305; Tue, 28 Oct 2003 07:40:08 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 28 Oct 2003 07:40:08 -0800 (PST) Resent-Message-Id: <200310281540.h9SFe8Eg005305@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4046F16A4CE for ; Tue, 28 Oct 2003 07:36:25 -0800 (PST) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37A1643FDD for ; Tue, 28 Oct 2003 07:36:20 -0800 (PST) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 51835 invoked by uid 85); 28 Oct 2003 16:36:15 +0100 Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 ( Clear:RC:1:. Processed in 0.057456 secs); 28 Oct 2003 15:36:15 -0000 Received: from lucifer.cultdeadsheep.org (192.168.0.2) by goofy.cultdeadsheep.org with SMTP; 28 Oct 2003 16:36:15 +0100 Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Tue, 28 Oct 2003 16:35:46 +0100 Message-Id: <20031028153620.37A1643FDD@mx1.FreeBSD.org> Date: Tue, 28 Oct 2003 16:35:46 +0100 From: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/58635: [non maintainer update] www/mod_auth_pam: update to 1.1.1 and fix build on -CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2003 15:40:10 -0000 >Number: 58635 >Category: ports >Synopsis: [non maintainer update] www/mod_auth_pam: update to 1.1.1 and fix build on -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 28 07:40:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: update to 1.1.1 and fix build on -CURRENT bump PORTEPOCH. pkg_version -t 1.0a 1.1.1 < >How-To-Repeat: N/A. >Fix: --- mod_auth_pam.diff begins here --- Index: mod_auth_pam/Makefile =================================================================== RCS file: /WORK/REPO/ports/www/mod_auth_pam/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- mod_auth_pam/Makefile 15 Oct 2003 22:17:32 -0000 1.6 +++ mod_auth_pam/Makefile 28 Oct 2003 15:34:07 -0000 @@ -6,7 +6,8 @@ # PORTNAME= mod_auth_pam -PORTVERSION= 1.0a +PORTVERSION= 1.1.1 +PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://pam.sourceforge.net/mod_auth_pam/dist/ \ http://atreides.freenix.no/~anders/ @@ -19,12 +20,6 @@ APXS?= ${LOCALBASE}/sbin/apxs -.include - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - do-build: @cd ${WRKSRC} && \ ${APXS} -c -lpam mod_auth_pam.c @@ -34,11 +29,11 @@ .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mod_auth_pam ${MKDIR} ${PREFIX}/share/doc/mod_auth_pam/samples - ${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${PREFIX}/share/doc/mod_auth_pam/ - ${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${PREFIX}/share/doc/mod_auth_pam/ + ${INSTALL_DATA} ${WRKSRC}/doc/configure.txt ${PREFIX}/share/doc/mod_auth_pam/ + ${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${PREFIX}/share/doc/mod_auth_pam/ ${INSTALL_DATA} ${WRKSRC}/samples/dot-htaccess ${PREFIX}/share/doc/mod_auth_pam/samples/ - ${INSTALL_DATA} ${WRKSRC}/samples/httpd ${PREFIX}/share/doc/mod_auth_pam/samples/ + ${INSTALL_DATA} ${WRKSRC}/samples/httpd- ${PREFIX}/share/doc/mod_auth_pam/samples/httpd .endif ${CAT} ${PKGMESSAGE} -.include +.include Index: mod_auth_pam/distinfo =================================================================== RCS file: /WORK/REPO/ports/www/mod_auth_pam/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- mod_auth_pam/distinfo 7 Apr 2001 04:25:18 -0000 1.1 +++ mod_auth_pam/distinfo 28 Oct 2003 15:34:07 -0000 @@ -1 +1 @@ -MD5 (mod_auth_pam-1.0a.tar.gz) = 9e971e974de3bef0587f114694d04e47 +MD5 (mod_auth_pam-1.1.1.tar.gz) = b1e36b5df18a177e671785f7f4c8001c Index: mod_auth_pam/pkg-plist =================================================================== RCS file: /WORK/REPO/ports/www/mod_auth_pam/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- mod_auth_pam/pkg-plist 7 Apr 2001 04:25:18 -0000 1.1 +++ mod_auth_pam/pkg-plist 28 Oct 2003 15:34:07 -0000 @@ -1,9 +1,9 @@ libexec/apache/mod_auth_pam.so @exec %D/sbin/apxs -e -A -n auth_pam %D/%F @unexec %D/sbin/apxs -e -A -n auth_pam %D/%F -%%PORTDOCS%%share/doc/mod_auth_pam/configure.html -%%PORTDOCS%%share/doc/mod_auth_pam/faq.html -%%PORTDOCS%%share/doc/mod_auth_pam/samples/dot-htaccess -%%PORTDOCS%%share/doc/mod_auth_pam/samples/httpd -%%PORTDOCS%%@dirrm share/doc/mod_auth_pam/samples -%%PORTDOCS%%@dirrm share/doc/mod_auth_pam +%%PORTDOCS%%%%DOCSDIR%%/configure.txt +%%PORTDOCS%%%%DOCSDIR%%/faq.txt +%%PORTDOCS%%%%DOCSDIR%%/samples/dot-htaccess +%%PORTDOCS%%%%DOCSDIR%%/samples/httpd +%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples +%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: mod_auth_pam/files/patch-mod_auth_pam.c =================================================================== RCS file: /WORK/REPO/ports/www/mod_auth_pam/files/patch-mod_auth_pam.c,v retrieving revision 1.1 diff -u -r1.1 patch-mod_auth_pam.c --- mod_auth_pam/files/patch-mod_auth_pam.c 7 Apr 2001 04:25:18 -0000 1.1 +++ mod_auth_pam/files/patch-mod_auth_pam.c 28 Oct 2003 15:34:07 -0000 @@ -1,15 +1,40 @@ ---- mod_auth_pam.c.orig Sun Feb 13 23:16:57 2000 -+++ mod_auth_pam.c Mon Apr 2 22:20:44 2001 -@@ -113,7 +113,7 @@ +--- mod_auth_pam.c.orig Thu Aug 8 15:47:33 2002 ++++ mod_auth_pam.c Tue Oct 28 16:29:03 2003 +@@ -98,7 +98,7 @@ + * old-style (from Apache 1.2.x) + * + * 1. Configuration: +- * Module pam_auth_module mod_auth_pam.o ++ * Module auth_pam_module mod_auth_pam.o + * EXTRA_LIBS+= -lpam -ldl + * + * 2. Add an auth and an account entry for service type "httpd" +@@ -147,7 +147,7 @@ #define PAM_STRE_NEEDS_PAMH 1 - #define VERSION "1.0a" + #define VERSION "1.1.1" -module pam_auth_module; +module auth_pam_module; static const char *pam_servicename = "httpd", -@@ -362,7 +362,7 @@ +@@ -231,13 +231,11 @@ + + static command_rec auth_pam_cmds[] = { + { "AuthFailDelay", (const char*(*)())auth_fail_delay, 0, OR_AUTHCFG, TAKE1, +- "number of micro seconds to wait after failed authentication attempt. defau +-lt is 0" }, ++ "number of micro seconds to wait after failed authentication attempt. default is 0" }, + { "AuthPAM_Authorative", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG, + "no longer in use -- see AuthPAM_FallThrough instead" }, + { "AuthPAM_FallThrough", (const char*(*)())auth_fall_through, NULL, OR_AUTHCFG, FLAG, +- "on|off - determines if other authentication methods are attempted if this +-one fails; default is off" }, ++ "on|off - determines if other authentication methods are attempted if this one fails; default is off" }, + { "AuthPAM_Enabled", (const char*(*)())auth_enable, NULL, OR_AUTHCFG, FLAG, + "on|off - determines if PAM authentication is enabled; default is on" }, + { 0 } +@@ -323,7 +321,7 @@ /* mod_auth_pam specific */ auth_pam_userinfo userinfo = { NULL, NULL }; auth_pam_dir_config *conf = (auth_pam_dir_config*) @@ -18,16 +43,16 @@ /* PAM specific */ struct pam_conv conv_info = { &auth_pam_talker, (void*)&userinfo}; pam_handle_t *pamh = NULL; -@@ -442,7 +442,7 @@ +@@ -402,7 +400,7 @@ + register int i = 0; char method_restricted = 0, *line = 0, *word = 0; - table *groups = 0; auth_pam_dir_config *conf = (auth_pam_dir_config*) - ap_get_module_config(r->per_dir_config, &pam_auth_module); + ap_get_module_config(r->per_dir_config, &auth_pam_module); + struct passwd *pwent; /* check for allowed users/group */ - const array_header *reqs_arr = ap_requires (r); -@@ -505,7 +505,7 @@ +@@ -487,7 +485,7 @@ return AUTH_REQUIRED; } --- mod_auth_pam.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: