Attachment 36632 Details for Bug 58635 – mod_auth_pam.diff

[patch] mod_auth_pam.diff

mod_auth_pam.diff (text/plain), 5.77 KB, created by Clement Laforet on 2003-10-28 15:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clement Laforet

Created: 2003-10-28 15:40:08 UTC

Size: 5.77 KB

patch

obsolete

>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 <bsd.port.pre.mk>
>-
>-.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 <bsd.port.post.mk>
>+.include <bsd.port.mk>
>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;
>  }

Actions: View | Diff

Attachments on bug 58635: 36632