Attachment #33985 for bug #55401

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





PORTNAME=	apache
PORTVERSION=    1.3.28
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=   ${MASTER_SITE_APACHE_HTTPD}
DISTNAME=	apache_${PORTVERSION}

		--enable-module=most \
		--enable-module=auth_db \
		--enable-module=mmap_static \
		--enable-module=auth_digest \
		--disable-module=auth_dbm \
		--enable-shared=max \
		${SUEXEC_CONF} \

MAN8=           ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
		${SUEXEC_MAN}

.if !defined(WITH_IE_AUTH_DIGEST_HACK)
pre-fetch:
	@${ECHO}
	@${ECHO} If you plan to use HTTP digest authentication with content
	@${ECHO} that uses query strings \(e.g. \"GET\" forms\), and you need
	@${ECHO} to support Internet Explorer, then define the variable
	@${ECHO} WITH_IE_AUTH_DIGEST_HACK
	@${ECHO}
	@/bin/sleep 2
.endif

post-extract:
	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \
		> ${WRKSRC}/apache.sh

.if defined(WITH_IE_AUTH_DIGEST_HACK)
post-patch:
	@${ECHO_MSG} "===>  Applying IE mod_auth_digest hack to ignore query string"
	@if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/auth-digest-ie-patch; then \
	  ${ECHO_MSG} "===>  Patch auth-digest-ie-patch applied successfully"; \
	else \
	  ${ECHO_MSG} ">>Patch auth-digest-ie-patch failed to apply cleanly"; \
	  ${FALSE}; \
	fi
.endif

pre-install:
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

Lines 75-80 Link Here

(-)pkg-plist (+1 lines)
75	libexec/apache/mod_auth.so	75	libexec/apache/mod_auth.so
76	libexec/apache/mod_auth_anon.so	76	libexec/apache/mod_auth_anon.so
77	libexec/apache/mod_auth_db.so	77	libexec/apache/mod_auth_db.so
		78	libexec/apache/mod_auth_digest.so
78	libexec/apache/mod_autoindex.so	79	libexec/apache/mod_autoindex.so
79	libexec/apache/mod_cern_meta.so	80	libexec/apache/mod_cern_meta.so
80	libexec/apache/mod_cgi.so	81	libexec/apache/mod_cgi.so




--- src/modules/experimental/mod_auth_digest.c.orig	Fri Aug  8 16:35:39 2003
+++ src/modules/experimental/mod_auth_digest.c	Fri Aug  8 16:44:50 2003
@@ -1632,10 +1632,12 @@
 		/* or '*' matches empty path in scheme://host */
 	        && !(d_uri.path && !r_uri.path && resp->psd_request_uri->hostname
 		    && d_uri.path[0] == '*' && d_uri.path[1] == '\0'))
+#if 0
 	    /* check that query matches */
 	    || (d_uri.query != r_uri.query
 		&& (!d_uri.query || !r_uri.query
 		    || strcmp(d_uri.query, r_uri.query)))
+#endif
 	    ) {
 	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
 			  "Digest: uri mismatch - <%s> does not match "




--- src/modules/experimental/mod_auth_digest.c.orig	Sat Feb 15 23:42:24 2003
+++ src/modules/experimental/mod_auth_digest.c	Fri Aug  8 16:35:39 2003
@@ -97,7 +97,7 @@
 
 /* The section for the Configure script:
  * MODULE-DEFINITION-START
- * Name: digest_auth_module
+ * Name: auth_digest_module
  * ConfigStart
 
     RULE_DEV_RANDOM=`./helpers/CutRule DEV_RANDOM $file`
@@ -262,7 +262,7 @@
 static void          *client_mm = NULL;
 #endif	/* HAVE_SHMEM_MM */
 
-module MODULE_VAR_EXPORT digest_auth_module;
+module MODULE_VAR_EXPORT auth_digest_module;
 
 /*
  * initialization code
@@ -980,7 +980,7 @@
     resp->raw_request_uri = r->unparsed_uri;
     resp->psd_request_uri = &r->parsed_uri;
     resp->needed_auth = 0;
-    ap_set_module_config(r->request_config, &digest_auth_module, resp);
+    ap_set_module_config(r->request_config, &auth_digest_module, resp);
 
     res = get_digest_rec(r, resp);
     resp->client = get_client(resp->opaque_num, r);
@@ -1554,14 +1554,14 @@
     while (mainreq->main != NULL)  mainreq = mainreq->main;
     while (mainreq->prev != NULL)  mainreq = mainreq->prev;
     resp = (digest_header_rec *) ap_get_module_config(mainreq->request_config,
-						      &digest_auth_module);
+						      &auth_digest_module);
     resp->needed_auth = 1;
 
 
     /* get our conf */
 
     conf = (digest_config_rec *) ap_get_module_config(r->per_dir_config,
-						      &digest_auth_module);
+						      &auth_digest_module);
 
 
     /* check for existence and syntax of Auth header */
@@ -1787,7 +1787,7 @@
 {
     const digest_config_rec *conf =
 		(digest_config_rec *) ap_get_module_config(r->per_dir_config,
-							   &digest_auth_module);
+							   &auth_digest_module);
     const char *user = r->connection->user;
     int m = r->method_number;
     int method_restricted = 0;
@@ -1857,7 +1857,7 @@
 
     note_digest_auth_failure(r, conf,
 	(digest_header_rec *) ap_get_module_config(r->request_config,
-						   &digest_auth_module),
+						   &auth_digest_module),
 	0);
     return AUTH_REQUIRED;
 }
@@ -1882,10 +1882,10 @@
 {
     const digest_config_rec *conf =
 		(digest_config_rec *) ap_get_module_config(r->per_dir_config,
-							   &digest_auth_module);
+							   &auth_digest_module);
     digest_header_rec *resp =
 		(digest_header_rec *) ap_get_module_config(r->request_config,
-							   &digest_auth_module);
+							   &auth_digest_module);
     const char *ai = NULL, *digest = NULL, *nextnonce = "";
 
     if (resp == NULL || !resp->needed_auth || conf == NULL)
@@ -2024,7 +2024,7 @@
 }
 
 
-module MODULE_VAR_EXPORT digest_auth_module =
+module MODULE_VAR_EXPORT auth_digest_module =
 {
     STANDARD_MODULE_STUFF,
     initialize_module,		/* initializer */

Return to bug 55401

Lines 7-12 Link Here

(-)Makefile (+24 lines)
7		7
8	PORTNAME= apache	8	PORTNAME= apache
9	PORTVERSION= 1.3.28	9	PORTVERSION= 1.3.28
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}	12	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
12	DISTNAME= apache_${PORTVERSION}	13	DISTNAME= apache_${PORTVERSION}
Lines 76-81 Link Here
76	--enable-module=most \	77	--enable-module=most \
77	--enable-module=auth_db \	78	--enable-module=auth_db \
78	--enable-module=mmap_static \	79	--enable-module=mmap_static \
		80	--enable-module=auth_digest \
79	--disable-module=auth_dbm \	81	--disable-module=auth_dbm \
80	--enable-shared=max \	82	--enable-shared=max \
81	${SUEXEC_CONF} \	83	${SUEXEC_CONF} \
Lines 114-122 Link Here
114	MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \	116	MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
115	${SUEXEC_MAN}	117	${SUEXEC_MAN}
116		118
		119	.if !defined(WITH_IE_AUTH_DIGEST_HACK)
		120	pre-fetch:
		121	@${ECHO}
		122	@${ECHO} If you plan to use HTTP digest authentication with content
		123	@${ECHO} that uses query strings \(e.g. \"GET\" forms\), and you need
		124	@${ECHO} to support Internet Explorer, then define the variable
		125	@${ECHO} WITH_IE_AUTH_DIGEST_HACK
		126	@${ECHO}
		127	@/bin/sleep 2
		128	.endif
		129
117	post-extract:	130	post-extract:
118	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \	131	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \
119	> ${WRKSRC}/apache.sh	132	> ${WRKSRC}/apache.sh
		133
		134	.if defined(WITH_IE_AUTH_DIGEST_HACK)
		135	post-patch:
		136	@${ECHO_MSG} "===> Applying IE mod_auth_digest hack to ignore query string"
		137	@if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/auth-digest-ie-patch; then \
		138	${ECHO_MSG} "===> Patch auth-digest-ie-patch applied successfully"; \
		139	else \
		140	${ECHO_MSG} ">>Patch auth-digest-ie-patch failed to apply cleanly"; \
		141	${FALSE}; \
		142	fi
		143	.endif
120		144
121	pre-install:	145	pre-install:
122	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	146	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

Line 0 Link Here

(-)files/auth-digest-ie-patch (+15 lines)
	1	--- src/modules/experimental/mod_auth_digest.c.orig Fri Aug 8 16:35:39 2003
	2	+++ src/modules/experimental/mod_auth_digest.c Fri Aug 8 16:44:50 2003
	3	@@ -1632,10 +1632,12 @@
	4	/* or '' matches empty path in scheme://host /
	5	&& !(d_uri.path && !r_uri.path && resp->psd_request_uri->hostname
	6	&& d_uri.path[0] == '*' && d_uri.path[1] == '\0'))
	7	+#if 0
	8	/* check that query matches */
	9	\|\| (d_uri.query != r_uri.query
	10	&& (!d_uri.query \|\| !r_uri.query
	11	\|\| strcmp(d_uri.query, r_uri.query)))
	12	+#endif
	13	) {
	14	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO\|APLOG_ERR, r,
	15	"Digest: uri mismatch - <%s> does not match "

Line 0 Link Here

(-)files/patch-src:modules:experimental:mod_auth_digest.c (+86 lines)
		1	--- src/modules/experimental/mod_auth_digest.c.orig Sat Feb 15 23:42:24 2003
		2	+++ src/modules/experimental/mod_auth_digest.c Fri Aug 8 16:35:39 2003
		3	@@ -97,7 +97,7 @@
		4
		5	/* The section for the Configure script:
		6	* MODULE-DEFINITION-START
		7	- * Name: digest_auth_module
		8	+ * Name: auth_digest_module
		9	* ConfigStart
		10
		11	RULE_DEV_RANDOM=`./helpers/CutRule DEV_RANDOM $file`
		12	@@ -262,7 +262,7 @@
		13	static void *client_mm = NULL;
		14	#endif /* HAVE_SHMEM_MM */
		15
		16	-module MODULE_VAR_EXPORT digest_auth_module;
		17	+module MODULE_VAR_EXPORT auth_digest_module;
		18
		19	/*
		20	* initialization code
		21	@@ -980,7 +980,7 @@
		22	resp->raw_request_uri = r->unparsed_uri;
		23	resp->psd_request_uri = &r->parsed_uri;
		24	resp->needed_auth = 0;
		25	- ap_set_module_config(r->request_config, &digest_auth_module, resp);
		26	+ ap_set_module_config(r->request_config, &auth_digest_module, resp);
		27
		28	res = get_digest_rec(r, resp);
		29	resp->client = get_client(resp->opaque_num, r);
		30	@@ -1554,14 +1554,14 @@
		31	while (mainreq->main != NULL) mainreq = mainreq->main;
		32	while (mainreq->prev != NULL) mainreq = mainreq->prev;
		33	resp = (digest_header_rec *) ap_get_module_config(mainreq->request_config,
		34	- &digest_auth_module);
		35	+ &auth_digest_module);
		36	resp->needed_auth = 1;
		37
		38
		39	/* get our conf */
		40
		41	conf = (digest_config_rec *) ap_get_module_config(r->per_dir_config,
		42	- &digest_auth_module);
		43	+ &auth_digest_module);
		44
		45
		46	/* check for existence and syntax of Auth header */
		47	@@ -1787,7 +1787,7 @@
		48	{
		49	const digest_config_rec *conf =
		50	(digest_config_rec *) ap_get_module_config(r->per_dir_config,
		51	- &digest_auth_module);
		52	+ &auth_digest_module);
		53	const char *user = r->connection->user;
		54	int m = r->method_number;
		55	int method_restricted = 0;
		56	@@ -1857,7 +1857,7 @@
		57
		58	note_digest_auth_failure(r, conf,
		59	(digest_header_rec *) ap_get_module_config(r->request_config,
		60	- &digest_auth_module),
		61	+ &auth_digest_module),
		62	0);
		63	return AUTH_REQUIRED;
		64	}
65	@@ -1882,10 +1882,10 @@
66	{
67	const digest_config_rec *conf =
68	(digest_config_rec *) ap_get_module_config(r->per_dir_config,
69	- &digest_auth_module);
70	+ &auth_digest_module);
71	digest_header_rec *resp =
72	(digest_header_rec *) ap_get_module_config(r->request_config,
73	- &digest_auth_module);
74	+ &auth_digest_module);
75	const char ai = NULL, digest = NULL, *nextnonce = "";
76
77	if (resp == NULL \|\| !resp->needed_auth \|\| conf == NULL)
78	@@ -2024,7 +2024,7 @@
79	}
80
81
82	-module MODULE_VAR_EXPORT digest_auth_module =
83	+module MODULE_VAR_EXPORT auth_digest_module =
84	{
85	STANDARD_MODULE_STUFF,
86	initialize_module, /* initializer */