Attachment #36632 for bug #58635

View | Details | Raw Unified | Return to bug 58635
Collapse All | Expand All




#

PORTNAME=	mod_auth_pam
PORTVERSION=	1.1.1
PORTEPOCH=	1
CATEGORIES=	www
MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/ \
		http://atreides.freenix.no/~anders/


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

.if !defined(NOPORTDOCS)
	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam
	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam/samples
	${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/httpd
.endif
	${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Line 1 Link Here

(-)mod_auth_pam/distinfo (-1 / +1 lines)
1	MD5 (mod_auth_pam-1.0a.tar.gz) = 9e971e974de3bef0587f114694d04e47	1	MD5 (mod_auth_pam-1.1.1.tar.gz) = b1e36b5df18a177e671785f7f4c8001c

Lines 1-9 Link Here

(-)mod_auth_pam/pkg-plist (-6 / +6 lines)
1	libexec/apache/mod_auth_pam.so	1	libexec/apache/mod_auth_pam.so
2	@exec %D/sbin/apxs -e -A -n auth_pam %D/%F	2	@exec %D/sbin/apxs -e -A -n auth_pam %D/%F
3	@unexec %D/sbin/apxs -e -A -n auth_pam %D/%F	3	@unexec %D/sbin/apxs -e -A -n auth_pam %D/%F
4	%%PORTDOCS%%share/doc/mod_auth_pam/configure.html	4	%%PORTDOCS%%%%DOCSDIR%%/configure.txt
5	%%PORTDOCS%%share/doc/mod_auth_pam/faq.html	5	%%PORTDOCS%%%%DOCSDIR%%/faq.txt
6	%%PORTDOCS%%share/doc/mod_auth_pam/samples/dot-htaccess	6	%%PORTDOCS%%%%DOCSDIR%%/samples/dot-htaccess
7	%%PORTDOCS%%share/doc/mod_auth_pam/samples/httpd	7	%%PORTDOCS%%%%DOCSDIR%%/samples/httpd
8	%%PORTDOCS%%@dirrm share/doc/mod_auth_pam/samples	8	%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
9	%%PORTDOCS%%@dirrm share/doc/mod_auth_pam	9	%%PORTDOCS%%@dirrm %%DOCSDIR%%




--- 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.1.1"
 
-module pam_auth_module;
+module auth_pam_module;
 
 static const char
 *pam_servicename = "httpd",
@@ -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*)

   /* PAM specific  */
   struct pam_conv conv_info = { &auth_pam_talker, (void*)&userinfo};
   pam_handle_t *pamh  = NULL;
@@ -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 */
@@ -487,7 +485,7 @@
@@ -505,7 +505,7 @@
   return AUTH_REQUIRED;
 }

Return to bug 58635

Lines 6-12 Link Here

(-)mod_auth_pam/Makefile (-11 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= mod_auth_pam	8	PORTNAME= mod_auth_pam
9	PORTVERSION= 1.0a	9	PORTVERSION= 1.1.1
		10	PORTEPOCH= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= http://pam.sourceforge.net/mod_auth_pam/dist/ \	12	MASTER_SITES= http://pam.sourceforge.net/mod_auth_pam/dist/ \
12	http://atreides.freenix.no/~anders/	13	http://atreides.freenix.no/~anders/
Lines 19-30 Link Here
19		20
20	APXS?= ${LOCALBASE}/sbin/apxs	21	APXS?= ${LOCALBASE}/sbin/apxs
21		22
22	.include <bsd.port.pre.mk>
23
24	.if ${OSVERSION} >= 501000
25	BROKEN= "Does not compile"
26	.endif
27
28	do-build:	23	do-build:
29	@cd ${WRKSRC} && \	24	@cd ${WRKSRC} && \
30	${APXS} -c -lpam mod_auth_pam.c	25	${APXS} -c -lpam mod_auth_pam.c
Lines 34-44 Link Here
34	.if !defined(NOPORTDOCS)	29	.if !defined(NOPORTDOCS)
35	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam	30	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam
36	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam/samples	31	${MKDIR} ${PREFIX}/share/doc/mod_auth_pam/samples
37	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${PREFIX}/share/doc/mod_auth_pam/	32	${INSTALL_DATA} ${WRKSRC}/doc/configure.txt ${PREFIX}/share/doc/mod_auth_pam/
38	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${PREFIX}/share/doc/mod_auth_pam/	33	${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${PREFIX}/share/doc/mod_auth_pam/
39	${INSTALL_DATA} ${WRKSRC}/samples/dot-htaccess ${PREFIX}/share/doc/mod_auth_pam/samples/	34	${INSTALL_DATA} ${WRKSRC}/samples/dot-htaccess ${PREFIX}/share/doc/mod_auth_pam/samples/
40	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${PREFIX}/share/doc/mod_auth_pam/samples/	35	${INSTALL_DATA} ${WRKSRC}/samples/httpd- ${PREFIX}/share/doc/mod_auth_pam/samples/httpd
41	.endif	36	.endif
42	${CAT} ${PKGMESSAGE}	37	${CAT} ${PKGMESSAGE}
43		38
44	.include <bsd.port.post.mk>	39	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)mod_auth_pam/files/patch-mod_auth_pam.c (-9 / +34 lines)
1	--- mod_auth_pam.c.orig Sun Feb 13 23:16:57 2000	1	--- mod_auth_pam.c.orig Thu Aug 8 15:47:33 2002
2	+++ mod_auth_pam.c Mon Apr 2 22:20:44 2001	2	+++ mod_auth_pam.c Tue Oct 28 16:29:03 2003
3	@@ -113,7 +113,7 @@	3	@@ -98,7 +98,7 @@
		4	* old-style (from Apache 1.2.x)
		5	*
		6	* 1. Configuration:
		7	- * Module pam_auth_module mod_auth_pam.o
		8	+ * Module auth_pam_module mod_auth_pam.o
		9	* EXTRA_LIBS+= -lpam -ldl
		10	*
		11	* 2. Add an auth and an account entry for service type "httpd"
		12	@@ -147,7 +147,7 @@
4	#define PAM_STRE_NEEDS_PAMH 1	13	#define PAM_STRE_NEEDS_PAMH 1
5	#define VERSION "1.0a"	14	#define VERSION "1.1.1"
6		15
7	-module pam_auth_module;	16	-module pam_auth_module;
8	+module auth_pam_module;	17	+module auth_pam_module;
9		18
10	static const char	19	static const char
11	*pam_servicename = "httpd",	20	*pam_servicename = "httpd",
12	@@ -362,7 +362,7 @@	21	@@ -231,13 +231,11 @@
		22
		23	static command_rec auth_pam_cmds[] = {
		24	{ "AuthFailDelay", (const char()())auth_fail_delay, 0, OR_AUTHCFG, TAKE1,
		25	- "number of micro seconds to wait after failed authentication attempt. defau
		26	-lt is 0" },
		27	+ "number of micro seconds to wait after failed authentication attempt. default is 0" },
		28	{ "AuthPAM_Authorative", (const char()())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
		29	"no longer in use -- see AuthPAM_FallThrough instead" },
		30	{ "AuthPAM_FallThrough", (const char()())auth_fall_through, NULL, OR_AUTHCFG, FLAG,
		31	- "on\|off - determines if other authentication methods are attempted if this
		32	-one fails; default is off" },
		33	+ "on\|off - determines if other authentication methods are attempted if this one fails; default is off" },
		34	{ "AuthPAM_Enabled", (const char()())auth_enable, NULL, OR_AUTHCFG, FLAG,
		35	"on\|off - determines if PAM authentication is enabled; default is on" },
		36	{ 0 }
		37	@@ -323,7 +321,7 @@
13	/* mod_auth_pam specific */	38	/* mod_auth_pam specific */
14	auth_pam_userinfo userinfo = { NULL, NULL };	39	auth_pam_userinfo userinfo = { NULL, NULL };
15	auth_pam_dir_config conf = (auth_pam_dir_config)	40	auth_pam_dir_config conf = (auth_pam_dir_config)
Lines 18-33 Link Here
18	/* PAM specific */	43	/* PAM specific */
19	struct pam_conv conv_info = { &auth_pam_talker, (void*)&userinfo};	44	struct pam_conv conv_info = { &auth_pam_talker, (void*)&userinfo};
20	pam_handle_t *pamh = NULL;	45	pam_handle_t *pamh = NULL;
21	@@ -442,7 +442,7 @@	46	@@ -402,7 +400,7 @@
		47	register int i = 0;
22	char method_restricted = 0, line = 0, word = 0;	48	char method_restricted = 0, line = 0, word = 0;
23	table *groups = 0;
24	auth_pam_dir_config conf = (auth_pam_dir_config)	49	auth_pam_dir_config conf = (auth_pam_dir_config)
25	- ap_get_module_config(r->per_dir_config, &pam_auth_module);	50	- ap_get_module_config(r->per_dir_config, &pam_auth_module);
26	+ ap_get_module_config(r->per_dir_config, &auth_pam_module);	51	+ ap_get_module_config(r->per_dir_config, &auth_pam_module);
		52	struct passwd *pwent;
27		53
28	/* check for allowed users/group */	54	/* check for allowed users/group */
29	const array_header *reqs_arr = ap_requires (r);	55	@@ -487,7 +485,7 @@
30	@@ -505,7 +505,7 @@
31	return AUTH_REQUIRED;	56	return AUTH_REQUIRED;
32	}	57	}