[Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.36, 1.37
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24924
Modified Files:
internal_comp_deps.mk
Log Message:
fixing the 64-bit Solaris build
1) removing the 32-bit NSS related files
2) removing an extra _64 tag from the libdb path
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- internal_comp_deps.mk 28 Feb 2006 20:46:12 -0000 1.36
+++ internal_comp_deps.mk 1 Mar 2006 17:35:39 -0000 1.37
@@ -104,42 +104,6 @@
else
SECURITY_DEP = $(SECURITY_LIBPATH)/libssl3.$(DLL_SUFFIX)
endif
-# if building 64 bit version, also need the 32 bit version of nssckbi.so
-# rename it as nssckbi32.so
-ifeq ($(USE_64), 1)
-# assumes there is a 32 bit version
- SHARED32_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/shared32
- NSS32_IMPORT = $(subst $(NS64TAG),,$(SECURITY_IMPORT))
- NSS32_BINNAMES = modutil
- NSS32_LIBNAMES = $(SECURITY_LIBNAMES.pkg)
- NSS32_NEED_CHK = $(SECURITY_NEED_CHK)
- ifeq ($(ARCH), SOLARIS)
- NSS32_LIBNAMES += freebl_hybrid_3 freebl_pure32_3
-# these libs have a corresponding .chk file
- NSS32_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
- endif
- ifeq ($(ARCH), HPUX)
- NSS32_LIBNAMES += freebl_hybrid_3 freebl_pure32_3
-# these libs have a corresponding .chk file
- NSS32_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
- endif
- NSSCKBI_FILE = $(LIB_PREFIX)nssckbi.$(DLL_SUFFIX)
- NSSCKBI32_FILE = $(LIB_PREFIX)nssckbi32.$(DLL_SUFFIX)
- NSS32_PULLFILES = bin/modutil lib/$(NSSCKBI_FILE) $(addprefix lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSS32_LIBNAMES))) $(addprefix lib/$(LIB_PREFIX),$(addsuffix .chk,$(NSS32_NEED_CHK)))
-
- NSPR32_IMPORT = $(subst $(NS64TAG),,$(NSPR_IMPORT))
- NSPR32_LIBNAMES = $(NSPR_LIBNAMES)
- NSPR32_PULLFILES = lib/$(LIB_PREFIX)$(subst $(SPACE),$(COMMA)lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSPR_LIBNAMES)))
-
-# we need to package the root cert file in the alias directory
- PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE) alias
-# all other files go under shared32/bin or /lib
- PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/bin/modutil shared32/bin
-
-# do not need redundant copy of nssckbi
- NSS32_NSPR32_SRC_LIBS = $(filter-out $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE),$(wildcard $(SHARED32_BUILD_DIR)/lib/*))
- PACKAGE_SRC_DEST += $(addsuffix $(SPACE)shared32/lib,$(NSS32_NSPR32_SRC_LIBS))
-endif # USE_64
ifdef VSFTPD_HACK
SECURITY_FILES=lib,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS))
@@ -163,20 +127,6 @@
-objdir $(SECURITY_BUILD_DIR) -componentdir $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE) \
-files include
endif
-# if building 64 bit version, also need the 32 bit version of nssckbi.so
-# rename it as nssckbi32.so
-# also need the 32 bit modutil, other NSS shared libraries and NSPR shared libraries
-ifeq ($(USE_64), 1)
- mkdir -p $(SHARED32_BUILD_DIR)/bin
- mkdir -p $(SHARED32_BUILD_DIR)/lib
- $(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
- -objdir $(SHARED32_BUILD_DIR) -componentdir $(NSPR32_IMPORT) \
- -files $(NSPR32_PULLFILES)
- $(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
- -objdir $(SHARED32_BUILD_DIR) -componentdir $(NSS32_IMPORT) \
- -files $(subst $(SPACE),$(COMMA),$(NSS32_PULLFILES))
- mv $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE) $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE)
-endif # USE_64
endif # COMPONENT_DEPS
-@if [ ! -f $@ ] ; \
then echo "Error: could not get component NSS file $@" ; \
@@ -298,7 +248,7 @@
# define the paths to the component parts
db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
MY_NSOBJDIR_TAG=$(NSOBJDIR_TAG).OBJ
-db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(NS64TAG)$(MY_NSOBJDIR_TAG)
+db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(MY_NSOBJDIR_TAG)
# add ",bin" to DB_FILES if you want the programs like db_verify, db_recover, etc.
DB_FILES=include,lib,bin
18 years, 1 month
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.26, 1.27
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305
Modified Files:
ldapserver.spec.tmpl
Log Message:
Added admserv-conf-admpw.patch to fix the use of admpw for basic auth in the actual config file
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ldapserver.spec.tmpl 1 Mar 2006 14:58:27 -0000 1.26
+++ ldapserver.spec.tmpl 1 Mar 2006 15:21:47 -0000 1.27
@@ -139,10 +139,14 @@
if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then
patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1
fi
-# patch file to fix use of admpw for basic auth
+# patch file to fix use of admpw for basic auth in the template file
if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch ] ; then
patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch > /dev/null 2>&1
fi
+# patch file to fix use of admpw for basic auth in the real config file
+ if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch ] ; then
+ patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch > /dev/null 2>&1
+ fi
# fix up file permissions
testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
if [ ! -f $testfile ] ; then
@@ -177,7 +181,7 @@
%changelog
* Wed Mar 1 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.2-1
-- Added admserv-conf-tmpl.patch to fix the use of admpw for basic auth
+- Added admserv-conf-tmpl.patch and admserv-conf-admpw.patch to fix the use of admpw for basic auth
* Wed Feb 22 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.2-1
- Add patch to fix admin server httpd module load order; you
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.41, 1.42
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18252
Modified Files:
pkgadmin.mk
Log Message:
added admserv-conf-admpw.patch to patch the real config file - the previous patch only patches the template config file
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pkgadmin.mk 1 Mar 2006 14:57:04 -0000 1.41
+++ pkgadmin.mk 1 Mar 2006 15:19:00 -0000 1.42
@@ -296,8 +296,10 @@
cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-httpd-moduleorder.patch $(ADMIN_DIR)/setup
# The patch file that fixes console ld libpath
cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup
-# The patch file that fixes the use of admpw for basic auth
+# The patch file that fixes the use of admpw for basic auth in the template file
cp -p $(BUILD_ROOT)/admserv/cfgstuff/admserv-conf-tmpl.patch $(ADMIN_DIR)/setup
+# The patch file that fixes the use of admpw for basic auth in the real config file
+ cp -p $(BUILD_ROOT)/admserv/cfgstuff/admserv-conf-admpw.patch $(ADMIN_DIR)/setup
cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv-conf-admpw.patch, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18182
Added Files:
admserv-conf-admpw.patch
Log Message:
this patch fixes the use of admpw in the actual config file - the previous patch only fixes the template
admserv-conf-admpw.patch:
--- NEW FILE admserv-conf-admpw.patch ---
--- admin-serv/config/admserv.conf.orig 2006-03-01 08:11:57.000000000 -0700
+++ admin-serv/config/admserv.conf 2006-03-01 08:12:56.000000000 -0700
@@ -146,17 +146,17 @@
Order allow,deny
Allow from all
</LocationMatch>
# Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd
# need to add instance creation because you may want to create an instance
# of DS on a low port, and instance creation starts the instance as well
<LocationMatch /*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$>
- AuthUserFile /home/rich/72srv/admin-serv/config/admpw
+ AuthUserFile /opt/fedora-ds/admin-serv/config/admpw
AuthType basic
AuthName "Admin Server"
Require valid-user
## turn off the password pipe when using mod_restartd
AdminSDK off
Options +ExecCGI
RetainPerms on
Order allow,deny
18 years, 1 month
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.25, 1.26
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16272
Modified Files:
ldapserver.spec.tmpl
Log Message:
added patch file for upgrading from 1.0.1 - fixes the use of admpw for basic auth
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ldapserver.spec.tmpl 23 Feb 2006 19:30:23 -0000 1.25
+++ ldapserver.spec.tmpl 1 Mar 2006 14:58:27 -0000 1.26
@@ -139,6 +139,10 @@
if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then
patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1
fi
+# patch file to fix use of admpw for basic auth
+ if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch ] ; then
+ patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch > /dev/null 2>&1
+ fi
# fix up file permissions
testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
if [ ! -f $testfile ] ; then
@@ -172,6 +176,9 @@
fi
%changelog
+* Wed Mar 1 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.2-1
+- Added admserv-conf-tmpl.patch to fix the use of admpw for basic auth
+
* Wed Feb 22 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.2-1
- Add patch to fix admin server httpd module load order; you
- must now run setup after an upgrade; copy in the new 00core.ldif
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.40, 1.41
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16229
Modified Files:
pkgadmin.mk
Log Message:
added patch file for upgrading from 1.0.1 - fixes the use of admpw for basic auth
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pkgadmin.mk 23 Feb 2006 04:05:13 -0000 1.40
+++ pkgadmin.mk 1 Mar 2006 14:57:04 -0000 1.41
@@ -296,6 +296,8 @@
cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-httpd-moduleorder.patch $(ADMIN_DIR)/setup
# The patch file that fixes console ld libpath
cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup
+# The patch file that fixes the use of admpw for basic auth
+ cp -p $(BUILD_ROOT)/admserv/cfgstuff/admserv-conf-tmpl.patch $(ADMIN_DIR)/setup
cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv-conf-tmpl.patch, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16178
Added Files:
admserv-conf-tmpl.patch
Log Message:
patch file for upgrading from 1.0.1 - fixes the use of admpw for basic auth
admserv-conf-tmpl.patch:
--- NEW FILE admserv-conf-tmpl.patch ---
--- shared/config/template/admserv.conf.tmpl 23 Feb 2006 01:12:11 -0000 1.13
+++ shared/config/template/admserv.conf.tmpl 28 Feb 2006 22:29:39 -0000 1.14
@@ -146,17 +146,17 @@
Order allow,deny
Allow from all
</LocationMatch>
# Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd
# need to add instance creation because you may want to create an instance
# of DS on a low port, and instance creation starts the instance as well
<LocationMatch /*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$>
- AuthUserFile /home/rich/72srv/admin-serv/config/admpw
+ AuthUserFile %%%sroot%%%/admin-serv/config/admpw
AuthType basic
AuthName "Admin Server"
Require valid-user
## turn off the password pipe when using mod_restartd
AdminSDK off
Options +ExecCGI
RetainPerms on
Order allow,deny
18 years, 1 month