[Fedora-directory-commits] adminserver Makefile, 1.15, 1.16 buildpaths.mk, 1.3, 1.4 components.mk, 1.38, 1.39 internal_buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.17, 1.18
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Thu Nov 3 23:20:46 UTC 2005
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952/adminserver
Modified Files:
Makefile buildpaths.mk components.mk internal_buildpaths.mk
nsconfig.mk
Log Message:
Bug(s) fixed: 172402
Bug Description: Add support for mod_restartd - remove Apache module
packaging
Reviewed by: Noriko (Thanks!)
Fix Description: Add support for mod_restartd to the Admin Server
httpd.conf and admserv.conf. This just allows root to run the stop,
start, and restart CGIs. In addition to the regex in admserv.conf that
restricts CGI access, the code in mod_restartd itself restricts CGIs to
only those matching this pattern - all others get passed on to the
regular CGI handling module. Since our 3 Apache modules are all Apache
licensed, they cannot be included in our rpm/tarball packaging for
distribution. They will have to be separate rpms/tarballs that the
customer will have to download and install.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 28 Oct 2005 22:43:18 -0000 1.15
+++ Makefile 3 Nov 2005 23:20:38 -0000 1.16
@@ -67,7 +67,7 @@
if test ! -d $(NSPLATFORM_DIR); then mkdir $(NSPLATFORM_DIR); fi;
$(PERL5) buildnum.pl -p $(NSPLATFORM_DIR)
-nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU) $(SETUPUTIL) $(ADMDOC) $(MOD_ADMSERV) $(MOD_NSS) end_time
+nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU) $(SETUPUTIL) $(ADMDOC) end_time
#
# Notice that BUILD_MODULE is not supplied directly on this target.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildpaths.mk 7 Oct 2005 21:49:29 -0000 1.3
+++ buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.4
@@ -84,12 +84,6 @@
SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-MOD_NSS_SOURCE_DIR = $(BUILD_ROOT)/../mod_nss
-#MOD_NSS_BUILD_DIR = $(NSCP_COMPDIR)/mod_nss/$(NSOBJDIR_NAME)
-
-MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
-#MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
-
CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- components.mk 28 Oct 2005 22:43:18 -0000 1.38
+++ components.mk 3 Nov 2005 23:20:38 -0000 1.39
@@ -418,41 +418,3 @@
endif
###########################################################
-
-# mod_admserv #############################################
-MOD_ADMSERV_RELDATE = 20051028
-
-#BASE_MOD_ADMSERV = $(COMPONENTS_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
-BASE_MOD_ADMSERV = $(FED_COMPONENTS_DIR)/mod_admserv/1.0/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
-
-MOD_ADMSERV = $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX)
-
-$(MOD_ADMSERV):
-ifdef INTERNAL_BUILD
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) \
- -objdir $(MOD_ADMSERV_BUILD_DIR) \
- -componentdir $(BASE_MOD_ADMSERV) -files lib
-else # INTERNAL_BUILD
- @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
-endif
-
-###########################################################
-
-# mod_nss #############################################
-MOD_NSS_RELDATE = 20050819
-
-#BASE_MOD_NSS = $(COMPONENTS_DIR)/mod_nss/$(MOD_NSS_RELDATE)/$(NSOBJDIR_NAME)
-BASE_MOD_NSS = $(INT_DIR)/mod_nss/$(MOD_NSS_RELDATE)/$(NSOBJDIR_NAME)
-
-MOD_NSS = $(MOD_NSS_LIBPATH)/libmodnss.$(DLL_SUFFIX)
-
-$(MOD_NSS):
-ifdef INTERNAL_BUILD
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) \
- -objdir $(MOD_NSS_BUILD_DIR) \
- -componentdir $(BASE_MOD_NSS) -files lib,bin
-else # INTERNAL_BUILD
- @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
-endif
-
-###########################################################
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- internal_buildpaths.mk 6 Oct 2005 03:12:57 -0000 1.2
+++ internal_buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.3
@@ -91,16 +91,6 @@
SETUPUTIL_BUILD_DIR = $(NSCP_COMPDIR)/setuputil/$(NSOBJDIR_NAME)
endif # SETUPUTIL_SOURCE_ROOT
-#MOD_NSS_SOURCE_DIR = $(BUILD_ROOT)/../mod_nss
-ifndef MOD_NSS_SOURCE_DIR
-MOD_NSS_BUILD_DIR = $(NSCP_COMPDIR)/mod_nss/$(NSOBJDIR_NAME)
-endif
-
-#MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
-ifndef MOD_ADMSERV_SOURCE_DIR
-MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
-endif
-
ifndef JSS_SOURCE_DIR
JSS_BUILD_DIR = $(NSCP_COMPDIR)/jss/$(NSOBJDIR_NAME)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nsconfig.mk 28 Oct 2005 22:43:18 -0000 1.17
+++ nsconfig.mk 3 Nov 2005 23:20:38 -0000 1.18
@@ -845,28 +845,6 @@
NMCJDK_JARS = base.jar mcc$(NMCJDK_JAR_VERSION).jar mcc$(NMCJDK_JAR_VERSION)_en.jar nmclf$(NMCJDK_JAR_VERSION).jar nmclf$(NMCJDK_JAR_VERSION)_en.jar
#########################################
-# MOD_NSS
-#########################################
-
-ifdef MOD_NSS_SOURCE_DIR
- MOD_NSS_LIBPATH = $(MOD_NSS_SOURCE_DIR)/.libs
- MOD_NSS_BINPATH = $(MOD_NSS_SOURCE_DIR)
-else
- MOD_NSS_LIBPATH = $(MOD_NSS_BUILD_DIR)/lib
- MOD_NSS_BINPATH = $(MOD_NSS_BUILD_DIR)/bin
-endif
-
-#########################################
-# MOD_ADMSERV
-#########################################
-
-ifdef MOD_ADMSERV_SOURCE_DIR
- MOD_ADMSERV_LIBPATH = $(MOD_ADMSERV_SOURCE_DIR)/.libs
-else
- MOD_ADMSERV_LIBPATH = $(MOD_ADMSERV_BUILD_DIR)/lib
-endif
-
-#########################################
# LDAPJDK
#########################################
More information about the Fedora-directory-commits
mailing list