1:09 p.m.
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-31 07:09:58 -0500 (Fri, 31 Jan 2014)
New Revision: 3247
Added:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
trunk/httpd/httpd-2.4/installer/installconf.awk
trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
Log:
Add missing modules and adjust install.
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-31 08:57:28 UTC (rev 3246)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-31 12:09:58 UTC (rev 3247)
@@ -117,7 +117,7 @@
case $build_version in
1.0.*)
;;
- 1.1.*|1.2.*)
+ 1.1.*|1.2.*|1.3.*)
cat >> "${win_output_loc}/conf/default/httpd.conf.in" <<EOF
LoadModule proxy_module modules/mod_proxy.so
Modified: trunk/httpd/httpd-2.4/installer/installconf.awk
===================================================================
--- trunk/httpd/httpd-2.4/installer/installconf.awk 2014-01-31 08:57:28 UTC (rev 3246)
+++ trunk/httpd/httpd-2.4/installer/installconf.awk 2014-01-31 12:09:58 UTC (rev 3247)
@@ -90,6 +90,7 @@
print "#LoadModule authn_dbm_module modules/mod_authn_dbm.so" >
dstfl;
print "LoadModule authn_default_module modules/mod_authn_default.so"
> dstfl;
print "LoadModule authn_file_module modules/mod_authn_file.so" >
dstfl;
+ print "LoadModule authz_core_module modules/mod_authz_core.so" >
dstfl;
print "#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so"
> dstfl;
print "#LoadModule authz_dbm_module modules/mod_authz_dbm.so" >
dstfl;
print "LoadModule authz_default_module modules/mod_authz_default.so"
> dstfl;
@@ -97,6 +98,7 @@
print "LoadModule authz_host_module modules/mod_authz_host.so" >
dstfl;
print "#LoadModule authz_owner_module modules/mod_authz_owner.so"
> dstfl;
print "LoadModule authz_user_module modules/mod_authz_user.so" >
dstfl;
+ print "LoadModule access_compat_module modules/mod_access_compat.so"
> dstfl;
print "LoadModule autoindex_module modules/mod_autoindex.so" >
dstfl;
print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
print "#LoadModule cern_meta_module modules/mod_cern_meta.so" >
dstfl;
Added: trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat (rev 0)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat 2014-01-31 12:09:58 UTC (rev
3247)
@@ -0,0 +1,63 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile authz_host module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_access_compat
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d
LONG_NAME="access_compat_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_access_compat.obj
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Added: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore (rev 0)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore 2014-01-31 12:09:58 UTC (rev 3247)
@@ -0,0 +1,63 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile authn_core module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = "mod_authn_core
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d
LONG_NAME="authn_core_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\"mod_authn_core.obj
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Added: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore (rev 0)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore 2014-01-31 12:09:58 UTC (rev 3247)
@@ -0,0 +1,63 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile authz_host module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = "mod_authz_core
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d
LONG_NAME="authz_core_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\"mod_authz_core.obj
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-31 08:57:28 UTC (rev 3246)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-31 12:09:58 UTC (rev 3247)
@@ -42,6 +42,9 @@
$(SRCDIR)\NMAKEauthzgroupfile\~ \
$(SRCDIR)\NMAKEauthzhost\~ \
$(SRCDIR)\NMAKEauthzuser\~
+ $(SRCDIR)\NMAKEaccesscompat\~
+ $(SRCDIR)\NMAKEauthzcore\~
+ $(SRCDIR)\NMAKEauthncore\~
all: $(WORKDIR) $(MODULES)
@echo Building aaa modules ...