[Fedora-directory-commits] mod_nss/docs mod_nss.html,1.8,1.9
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038/docs
Modified Files:
mod_nss.html
Log Message:
Add proxy support to mod_nss. Most of the changes are related to
adding new configuration directives. For the others we need to
initialize an NSS socket differently whether we will be acting as a
client or a server.
Index: mod_nss.html
===================================================================
RCS file: /cvs/dirsec/mod_nss/docs/mod_nss.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_nss.html 16 Sep 2005 13:07:37 -0000 1.8
+++ mod_nss.html 29 Sep 2005 19:35:44 -0000 1.9
@@ -1,4 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
<!--
Copyright 2001-2005 The Apache Software Foundation
@@ -13,8 +15,6 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-->
-<html>
-<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="content-type">
<title>mod_nss</title>
@@ -32,25 +32,18 @@
<a href="#Environment">Environment Variables</a><br>
<a href="#Database_Management">Database Management</a><br>
<a href="#SSLv2">Why is SSLv2 disabled?</a><br>
-<br>
+<a href="#FAQ">Frequently Asked Questions</a><br>
<h1><a name="Introduction"></a>Introduction</h1>
The <a href="http://www.modssl.org/">mod_ssl</a> package was
created in April 1998 by <a href="mailto:rse@engelschall.com">Ralf S.
Engelschall</a> and was originally derived from the <a
href="http://www.apache-ssl.org/">Apache-SSL</a> package developed by <a
- href="mailto:ben@algroup.co.uk">Ben Laurie</a>. It stays under a
-BSD-style
-license which is equivalent to the license used by <a
- href="http://www.apache.org/">The Apache Group</a> for the Apache
-webserver
-itself. This means, in short, that you are free to use it both for
-commercial
-and non-commercial purposes as long as you retain the authors'
-copyright
-notices and give the proper credit.
-<br>
+ href="mailto:ben@algroup.co.uk">Ben Laurie</a>. It is licensed under
+the <a href="http://www.apache.org/licenses/" class="external"
+ title="http://www.apache.org/licenses/" rel="nofollow">Apache 2.0
+license</a><span class="urlexpansion">.<br>
<br>
-mod_nss is based directly on the mod_ssl package from Apache
+</span>mod_nss is based directly on the mod_ssl package from Apache
2.0.54. It is a conversion from using OpenSSL calls to using <a
href="http://www.mozilla.org/projects/security/pki/nss/">NSS</a>
calls instead.<br>
@@ -94,6 +87,20 @@
</td>
</tr>
<tr>
+ <td style="vertical-align: top;">--with-nss-inc=PATH<br>
+ </td>
+ <td style="vertical-align: top;">The file system path to the NSS
+include directory (e.g. /usr/local/include/nss3)<br>
+ </td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;">--with-nss-lib=PATH<br>
+ </td>
+ <td style="vertical-align: top;">The file system path to the NSS
+lib directory (e.g. /usr/local/lib)<br>
+ </td>
+ </tr>
+ <tr>
<td style="vertical-align: top;">--with-nspr=[PATH]<br>
</td>
<td style="vertical-align: top;">The file system path of the NSPR
@@ -101,6 +108,20 @@
PATH/include, etc.</td>
</tr>
<tr>
+ <td style="vertical-align: top;">--with-nspr-inc=PATH<br>
+ </td>
+ <td style="vertical-align: top;">The file system path to the NSPR
+include directory (e.g. /usr/local/include/nspr4)<br>
+ </td>
+ </tr>
+ <tr>
+ <td style="vertical-align: top;">--with-nspr-lib=PATH<br>
+ </td>
+ <td style="vertical-align: top;">The file system path to the NSPR
+lib directory (e.g. /usr/local/lib)<br>
+ </td>
+ </tr>
+ <tr>
<td style="vertical-align: top;">--with-apxs=[PATH]<br>
</td>
<td style="vertical-align: top;">The location of the apxs binary
@@ -117,7 +138,7 @@
</table>
<br>
If --with-nss or --with-nspr are not passed configure will look
-for the mozilla-[nss|nspr]-devel packages and use the libraries with
+for the [nss|nspr]-devel packages and use the libraries with
that if found.<br>
<br>
It is strongly recommended that the mozilla.org version be used.<br>
@@ -371,12 +392,12 @@
included in the NSSCipherSuite entry are automatically disabled.
The allowable ciphers are:<br>
<ul>
-<li>rsa_3des_sha</li>
-<li>rsa_des_sha</li>
-<li>fips_3des_sha</li>
-<li>fips_des_sha</li>
-<li>rsa_des_56_sha</li>
-<li>fortezza</li>
+ <li>rsa_3des_sha</li>
+ <li>rsa_des_sha</li>
+ <li>fips_3des_sha</li>
+ <li>fips_des_sha</li>
+ <li>rsa_des_56_sha</li>
+ <li>fortezza</li>
</ul>
<span style="font-weight: bold;"><br>
</span>FIPS is disabled by default.<br>
@@ -404,7 +425,8 @@
A space-separated list of the SSL ciphers used, with the prefix <code>+</code>
to enable or <code>-</code> to disable.<br>
<br>
-All ciphers are disabled by default. The SSLv2 ciphers cannot be enabled because
+All ciphers are disabled by default. The SSLv2 ciphers cannot be
+enabled because
<a href="#SSLv2">SSLv2</a> is not allowed in mod_nss.<br>
<br>
Available ciphers are:<br>
@@ -622,7 +644,7 @@
<code>NSSNickname Server-Cert</code><br>
<code>NSSNickname "This contains a space"</code><br>
<br>
-NSSEnforceValidCerts<br>
+<big><big>NSSEnforceValidCerts</big></big><br>
<br>
By default mod_nss will not start up if the server
certificate is not valid. This means that if the certificate has
@@ -636,7 +658,7 @@
<br>
<code>NSSEnforceValidCerts on</code><br>
<br>
-NSSVerifyClient<br>
+<big><big>NSSVerifyClient</big></big><br>
<br>
Determines whether Client Certificate
Authentication will be requested or required. This may be set in a
@@ -646,18 +668,17 @@
requested from the client.<br>
<br>
Available options are:<br>
-
<ul>
<li><code>none</code>: no client certificate
is required or requested<br>
- </li>
- <li>code>optional</code>: a client
+ </li>
+ <li>code>optional: a client
certificate is requested but if one is not available, the connection
may continue.<br>
- </li>
+ </li>
<li><code>require</code>: a valid client
certificate is required for the connection to continue.<br>
- </li>
+ </li>
</ul>
The mod_ssl option <code>option_no_ca</code>
is not supported.<br>
@@ -732,7 +753,45 @@
may be restricted (or allowed) based on any number of variables such as
components of the client certificate, the remote IP address, etc.<br>
<br>
-<code>NSSRequire</code><br>
+<span style="font-weight: bold;">Example</span><br>
+<br>
+<code>NSSRequire<br>
+</code><br>
+<big><big>NSSProxyEngine</big></big><br>
+<br>
+Enables or disables mod_nss HTTPS support for mod_proxy.<br>
+<br>
+<span style="font-weight: bold;">Example</span><br>
+<br>
+<code>NSSProxyEngine on</code><br>
+<br>
+<big><big>NSSProxyProtocol</big></big><br>
+<br>
+Specifies the SSL protocols that may be used in proxy connections. The
+syntax is identical to NSSProtocol.<br>
+<br>
+<span style="font-weight: bold;">Example</span><br>
+<br>
+<code>NSSProxyProtocol SSLv3<br>
+</code><br>
+<big><big>NSSProxyCipherSuite</big></big><br>
+<br>
+Specifies the SSL ciphers available for proxy connections. They syntax
+is identical to NSSCipherSuite.<br>
+<br>
+<span style="font-weight: bold;">Example</span><br>
+<br>
+<code>NSSProxyCipherSuite
++rsa_3des_sha,-rsa_null_md5,-rsa_null_sha,+rsa_rc4_128_md5</code><br>
+<br>
+<big><big>NSSProxyNickname</big></big><br>
+<br>
+The nickname of the client certificate to send if the remote server
+requests client authentication.<br>
+<br>
+<span style="font-weight: bold;">Example</span><br>
+<br>
+<code>NSSProxyNickname beta</code><br>
<h1><a name="Environment"></a>Environment Variables</h1>
Quite a few environment variables (for CGI and SSI) may be set
depending on the NSSOptions configuration. It can be expensive to set
@@ -1121,10 +1180,53 @@
<code>% certutil -V -n Server-Cert -u V -d .<br>
certutil: certificate is valid</code><br>
<h1><a name="SSLv2"></a>Why is SSLv2 disabled?</h1>
-All major browsers (Firefox, Internet Explorer, Mozilla, Netscape, Opera, and
-Safari) support SSL 3 and TLS so there is no need for a web server to support
+All major browsers (Firefox, Internet Explorer, Mozilla, Netscape,
+Opera, and
+Safari) support SSL 3 and TLS so there is no need for a web server to
+support
SSL 2. There are some known attacks against SSL 2 that are handled by
-SSL 3/TLS. SSL2 also doesn't support useful features like client authentication.
+SSL 3/TLS. SSL2 also doesn't support useful features like client
+authentication.
+<br>
+<h1><a name="FAQ"></a>Frequently Asked Questions</h1>
+Q. Does mod_nss support mod_proxy?<br>
<br>
+A. In order to use the mod_nss proxy support you will need to build
+your own mod_proxy by applying a patch found in bug <a
+ href="http://issues.apache.org/bugzilla/show_bug.cgi?id=36468">36468</a>.
+The patch is needed so we can compare the hostname contained in the
+remote certificate with the hostname you meant to visit. This prevents
+man-in-the-middle attacks.<br>
+<br>
+You also have to change the SSL functions that mod_proxy looks to use.
+You'll need to apply this patch:<br>
+<br>
+<code>1038,1039c1038,1039<br>
+< APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));<br>
+< APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));<br>
+---<br>
+> APR_DECLARE_OPTIONAL_FN(int, nss_proxy_enable, (conn_rec *));<br>
+> APR_DECLARE_OPTIONAL_FN(int, nss_engine_disable, (conn_rec *));<br>
+1041,1042c1041,1042<br>
+< static APR_OPTIONAL_FN_TYPE(ssl_proxy_enable) *proxy_ssl_enable =
+NULL;<br>
+< static APR_OPTIONAL_FN_TYPE(ssl_engine_disable) *proxy_ssl_disable
+= NULL;<br>
+---<br>
+> static APR_OPTIONAL_FN_TYPE(nss_proxy_enable) *proxy_ssl_enable =
+NULL;<br>
+> static APR_OPTIONAL_FN_TYPE(nss_engine_disable) *proxy_ssl_disable
+= NULL;<br>
+1069,1070c1069,1070<br>
+< proxy_ssl_enable =
+APR_RETRIEVE_OPTIONAL_FN(ssl_proxy_enable);<br>
+< proxy_ssl_disable =
+APR_RETRIEVE_OPTIONAL_FN(ssl_engine_disable);<br>
+---<br>
+> proxy_ssl_enable =
+APR_RETRIEVE_OPTIONAL_FN(nss_proxy_enable);<br>
+> proxy_ssl_disable =
+APR_RETRIEVE_OPTIONAL_FN(nss_engine_disable);<br>
+</code><br>
</body>
</html>
18 years, 7 months
[Fedora-directory-commits] console build.xml, 1.5, 1.6 buildnum.pl, 1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16699
Modified Files:
build.xml buildnum.pl
Log Message:
169552 - Minor build changes to support build and debug from Eclipse
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 15 Sep 2005 22:06:33 -0000 1.5
+++ build.xml 29 Sep 2005 17:18:23 -0000 1.6
@@ -70,9 +70,10 @@
</path>
<!-- Generate version property file -->
- <exec dir="${console.root}/console" executable="./buildnum.pl">
+ <exec executable="${console.root}/console/buildnum.pl" vmlauncher="true">
<arg line="-p ${built.dir}"/>
</exec>
+
<exec executable="${console.root}/console/src/com/netscape/management/client/console/genverinfo.sh">
<arg value="${console.root}/console/src/com/netscape/management/client/console/versioninfo.properties"/>
<arg value="${console.dotversion}"/>
@@ -131,7 +132,9 @@
<!-- compile regular java code -->
<javac srcdir="${java.src.dir}"
destdir="${built.classdir}"
- debug="${compile.debug}" deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ debuglevel="lines,vars,source"
+ deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
verbose="no"
excludes="**/CVS/**">
Index: buildnum.pl
===================================================================
RCS file: /cvs/dirsec/console/buildnum.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildnum.pl 15 Sep 2005 22:06:33 -0000 1.1
+++ buildnum.pl 29 Sep 2005 17:18:23 -0000 1.2
@@ -58,7 +58,7 @@
# Load arguments
$platdir = $opt_p || exitHelp();
-$buildnum_file = "./$platdir/buildnum.dat";
+$buildnum_file = "$platdir/buildnum.dat";
# Get current time
@now = gmtime;
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.7, 1.30.2.8 fedora-patch.inf, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.3, 1.1.2.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf redhat-patch.inf
Log Message:
[167982] Service Pack framework
To make patch installation easier and less confusing, 1) adding a setup wrapper
(ldap/cm/newinst/setup.patch) for Solaris and HP as well as 2) adding some code
to RPM setup script (ldap/cm/newinst/setup) for RHELs, which checks the
existing server config files and retrieves the values needed for the upgrade.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.7
retrieving revision 1.30.2.8
diff -u -r1.30.2.7 -r1.30.2.8
--- Makefile 16 Sep 2005 20:01:17 -0000 1.30.2.7
+++ Makefile 28 Sep 2005 22:47:13 -0000 1.30.2.8
@@ -813,13 +813,14 @@
cp $(INSTDIR)/dssetup $(PATCHINSTDIR)
cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR)
cp $(INSTDIR)/README.txt $(PATCHINSTDIR)
+ cp $(BUILD_ROOT)/ldap/cm/newinst/setup.patch $(PATCHINSTDIR)/setup
# prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf
sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf
echo "" >> $(PATCHINSTDIR)/setup.inf
echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf
echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
# create a zip file based upon the $(PATCHINF) file
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
-@for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -829,7 +830,7 @@
done
# create patch inf file: $(SLAPD).inf
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- fedora-patch.inf 12 Sep 2005 20:05:15 -0000 1.1.2.3
+++ fedora-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4
@@ -38,7 +38,7 @@
#
# Info file to generate DS7.1 SP1 patch
# base: <builddir> containing the base package -- DS7.1
-# file: <patchfile>
+# file: bug#: <patchfile>
#
base: /share/dev4/fedora-ds/fds71/ships/20050526.1
@@ -56,6 +56,7 @@
file: 156120,159037: winsync/PassSync.msi
file: 156120,159037: winsync/ntds.msi
file: 167761: java/jars/ds71.jar
+file: 169388: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- redhat-patch.inf 12 Sep 2005 20:05:15 -0000 1.1.2.3
+++ redhat-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4
@@ -38,7 +38,7 @@
#
# Info file to generate DS7.1 SP1 patch
# base: <builddir> containing the base package -- DS7.1
-# file: <patchfile>
+# file: bug#: <patchfile>
#
base: /share/dev4/ds/ds71/ships/20050524.1
@@ -56,5 +56,6 @@
file: 156120,159037: winsync/PassSync.msi
file: 156120,159037: winsync/ntds.msi
file: 167761: java/jars/ds71.jar
+file: 169388: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, NONE, 1.1.2.1 setup, 1.9.2.2, 1.9.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/ldap/cm/newinst
Modified Files:
Tag: Directory71RtmBranch
setup
Added Files:
Tag: Directory71RtmBranch
setup.patch
Log Message:
[167982] Service Pack framework
To make patch installation easier and less confusing, 1) adding a setup wrapper
(ldap/cm/newinst/setup.patch) for Solaris and HP as well as 2) adding some code
to RPM setup script (ldap/cm/newinst/setup) for RHELs, which checks the
existing server config files and retrieves the values needed for the upgrade.
setup.patch:
--- NEW FILE setup.patch ---
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
#
# This script is a wrapper for dssetup used for inplace upgrade / patch
# installation.
#
clear
echo " Fedora Project"
echo " Fedora Server Products Installation/Uninstallation"
echo "-------------------------------------------------------------------------------"
echo ""
echo ""
echo "BY INSTALLING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY"
echo "AND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE"
echo "LICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS"
echo "OF THIS AGREEMENT, PLEASE DO NOT INSTALL OR USE THIS SOFTWARE."
echo ""
printf "Do you agree to the license terms? [No]: "
read ans
if [ "$ans" != "Y" -a "$ans" != "YES" -a "$ans" != "Yes" -a "$ans" != "y" -a "$ans" != "yes" ]; then
exit 1;
fi
clear
echo " Fedora Project"
echo " Fedora Server Products Installation/Uninstallation"
echo "-------------------------------------------------------------------------------"
echo ""
echo ""
echo "This program will extract the patch files and install them"
echo "into a directory where the Directory Server is already installed."
echo ""
echo "To accept the default shown in brackets, press the Enter key."
echo ""
printf "Install location [/opt/fedora/servers]: "
read serverroot
if [ ! -d $serverroot ]; then
echo ""
echo "Directory $serverroot does not exist."
exit 1
fi
if [ ! -f $serverroot/admin-serv/config/adm.conf ]; then
echo ""
echo "Administration Server's configuration file $serverroot/admin-serv/config/adm.conf does not exist."
exit 1
fi
getValFromAdminConf() {
cattr=$1
cfile=$2
rval=`grep -i $cattr $serverroot/admin-serv/config/$cfile | awk '{print $2}'`
echo $rval
}
dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
dsconffile=$serverroot/$dsinst/config/dse.ldif
if [ ! -f $dsconffile ]; then
echo ""
echo "Directory Server's configuration file $dsconffile does not exist."
exit 1
fi
clear
ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
siepid=`getValFromAdminConf "siepid:" "adm.conf"`
suitespotuser=`ls -l $dsconffile | awk '{print $3}'`
suitespotgroup=`ls -l $dsconffile | awk '{print $4}'`
admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
if [ "$admindomain" = "" ]; then
admindomain=`domainname`
fi
echo " Fedora Project"
echo " Directory Installation/Uninstallation"
echo "-------------------------------------------------------------------------------"
echo ""
echo "In order to reconfigure your installation, the Configuration Directory"
echo "Administrator password is required. Here is your current information:"
echo ""
echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
echo "Configuration Administrator ID: $siepid"
echo ""
echo "At the prompt, please enter the password for the Configuration Administrator."
echo ""
echo "administrator ID: $siepid"
siepasswd=""
while [ "$siepasswd" = "" ]; do
printf "Password: "
read siepasswd
done
inffile=./myinstall.inf
echo "[General]" > $inffile
echo "FullMachineName= $ldaphost" >> $inffile
echo "SuiteSpotUserID= $suitespotuser" >> $inffile
echo "SuitespotGroup= $suitespotgroup" >> $inffile
echo "ServerRoot= $serverroot" >> $inffile
echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/" >> $inffile
echo "ConfigDirectoryAdminID= $siepid" >> $inffile
echo "AdminDomain= $admindomain" >> $inffile
echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
echo "Components= slapd-71sp1" >> $inffile
echo "" >> $inffile
echo "[slapd-71sp1]" >> $inffile
echo "Components= slapd-71sp1" >> $inffile
clear
./dssetup -s -f $inffile
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- setup 9 Sep 2005 22:50:37 -0000 1.9.2.2
+++ setup 28 Sep 2005 22:47:14 -0000 1.9.2.3
@@ -130,6 +130,13 @@
echo $maxhost
}
+getValFromAdminConf() {
+ cattr=$1
+ cfile=$2
+ rval=`grep -i $cattr $sroot/admin-serv/config/$cfile | awk '{print $2}'`
+ echo $rval
+}
+
logfile=`doMktmp log`
myargs=
silent=
@@ -192,6 +199,61 @@
askYN "Continue?"
fi
+# check whether it is an in-place installation
+if [ -f $sroot/admin-serv/config/adm.conf ]; then
+ dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
+ if [ -f $sroot/$dsinst/config/dse.ldif ]; then
+ # it is an in=place installation
+ ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
+ ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
+ adminport=`getValFromAdminConf "\<port:" "adm.conf"`
+ siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+ sysuser=`getValFromAdminConf "nsSuiteSpotUser:" "local.conf"`
+ suitespotuser=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $3}'`
+ suitespotgroup=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
+ admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
+ if [ "$admindomain" = "" ]; then
+ admindomain=`domainname`
+ fi
+
+ echo "In order to reconfigure your installation, the Configuration Directory"
+ echo "Administrator password is required. Here is your current information:"
+ echo ""
+ echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
+ echo "Configuration Administrator ID: $siepid"
+ echo ""
+ echo "At the prompt, please enter the password for the Configuration Administrator."
+ echo ""
+ echo "administrator ID: $siepid"
+ siepasswd=""
+ while [ "$siepasswd" = "" ]; do
+ printf "Password: "
+ read siepasswd
+ done
+
+ inffile=$sroot/setup/myinstall.inf
+ echo "[General]" > $inffile
+ echo "FullMachineName= $ldaphost" >> $inffile
+ echo "SuiteSpotUserID= $suitespotuser" >> $inffile
+ echo "SuitespotGroup= $suitespotgroup" >> $inffile
+ echo "ServerRoot= $sroot" >> $inffile
+ echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile
+ echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+ echo "AdminDomain= $admindomain" >> $inffile
+ echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
+ echo "" >> $inffile
+ echo "[admin]" >> $inffile
+ echo "ServerAdminID= $siepid" >> $inffile
+ echo "ServerAdminPwd= $siepasswd" >> $inffile
+ echo "SysUser= $sysuser" >> $inffile
+ echo "Port= $adminport" >> $inffile
+ echo "ServerIpAddress=" >> $inffile
+
+ # set silent mode
+ silent=1
+ fi
+fi
+
# dsktune
if ! [ $silent ]; then
bin/slapd/server/dsktune | tee -a $logfile
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.20, 1.20.2.1
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15510
Modified Files:
Tag: Directory71RtmBranch
windows_protocol_util.c
Log Message:
169388 - Fixed attribute comparision helper function that was causing certain changes to not get synched.
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- windows_protocol_util.c 12 May 2005 03:46:20 -0000 1.20
+++ windows_protocol_util.c 28 Sep 2005 20:27:53 -0000 1.20.2.1
@@ -1532,7 +1532,7 @@
slapi_attr_first_value(a, &va);
slapi_attr_first_value(b, &vb);
- if (va->bv.bv_len == va->bv.bv_len)
+ if (va->bv.bv_len == vb->bv.bv_len)
{
if (0 != memcmp(va->bv.bv_val,vb->bv.bv_val,va->bv.bv_len))
{
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.20, 1.21
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15419
Modified Files:
windows_protocol_util.c
Log Message:
169388 - Fixed attribute comparision helper function that was causing certain changes to not get synched.
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- windows_protocol_util.c 12 May 2005 03:46:20 -0000 1.20
+++ windows_protocol_util.c 28 Sep 2005 20:21:20 -0000 1.21
@@ -1532,7 +1532,7 @@
slapi_attr_first_value(a, &va);
slapi_attr_first_value(b, &vb);
- if (va->bv.bv_len == va->bv.bv_len)
+ if (va->bv.bv_len == vb->bv.bv_len)
{
if (0 != memcmp(va->bv.bv_val,vb->bv.bv_val,va->bv.bv_len))
{
18 years, 7 months
[Fedora-directory-commits] mod_admserv configure, 1.9, 1.10 configure.in, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22420
Modified Files:
configure configure.in
Log Message:
use nspr and nss instead of mozilla-nspr and -nss
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure 24 Sep 2005 03:09:23 -0000 1.9
+++ configure 26 Sep 2005 19:40:08 -0000 1.10
@@ -8473,9 +8473,9 @@
fi
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nspr; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr`
- nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr`
+ if $PKG_CONFIG --exists nspr; then
+ nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
+ nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
else
{ { echo "$as_me:$LINENO: error: NSPR not found, specify with --with-nspr." >&5
echo "$as_me: error: NSPR not found, specify with --with-nspr." >&2;}
@@ -8732,9 +8732,9 @@
fi
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss`
- nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss`
+ if $PKG_CONFIG --exists nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L nss`
else
{ { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5
echo "$as_me: error: NSS not found, specify with --with-nss." >&2;}
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in 24 Sep 2005 02:58:19 -0000 1.8
+++ configure.in 26 Sep 2005 19:40:08 -0000 1.9
@@ -151,9 +151,9 @@
AC_MSG_CHECKING(for nspr with pkg-config)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nspr; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr`
- nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr`
+ if $PKG_CONFIG --exists nspr; then
+ nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
+ nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
else
AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
fi
@@ -292,9 +292,9 @@
AC_MSG_CHECKING(for nss with pkg-config)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss`
- nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss`
+ if $PKG_CONFIG --exists nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L nss`
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi
18 years, 8 months
[Fedora-directory-commits] mod_nss configure, 1.5, 1.6 configure.in, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22339
Modified Files:
configure configure.in
Log Message:
separate with options for include and lib directories - use nspr and nss instead of mozilla-nspr and -nss
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_nss/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure 13 Sep 2005 19:34:39 -0000 1.5
+++ configure 26 Sep 2005 19:38:52 -0000 1.6
@@ -1022,7 +1022,11 @@
--with-apr-config Use apr-config to determine the APR directory
--with-apxs=PATH Path to apxs
--with-nspr=PATH Netscape Portable Runtime (NSPR) directory
+ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory
+ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory
--with-nss=PATH Network Security Services (NSS) directory
+ --with-nss-inc=PATH Network Security Services (NSS) include directory
+ --with-nss-lib=PATH Network Security Services (NSS) library directory
Some influential environment variables:
CC C compiler command
@@ -4537,7 +4541,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4540 "configure"' > conftest.$ac_ext
+ echo '#line 4544 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5066,7 +5070,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -6250,7 +6254,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 6253 "configure"' > conftest.$ac_ext
+ echo '#line 6257 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6922,7 +6926,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 6925 "configure"
+#line 6929 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7020,7 +7024,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7023 "configure"
+#line 7027 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8468,7 +8472,6 @@
fi
-
{ echo "$as_me:$LINENO: checking for apr-config..." >&5
echo "$as_me: checking for apr-config..." >&6;}
# check for --with-apr-config
@@ -8569,12 +8572,16 @@
# if no apxs found yet, check /usr/local/apache/sbin
# since it's the default Apache location
if test -z "$APXS"; then
- echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin" >&5
-echo $ECHO_N "checking for apxs in /usr/local/apache/sbin... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin and /usr/sbin" >&5
+echo $ECHO_N "checking for apxs in /usr/local/apache/sbin and /usr/sbin... $ECHO_C" >&6
if test -x /usr/local/apache/sbin/apxs; then
APXS=/usr/local/apache/sbin/apxs
echo "$as_me:$LINENO: result: found $APXS. Use --with-apxs to specify another." >&5
echo "${ECHO_T}found $APXS. Use --with-apxs to specify another." >&6
+ elif test -x /usr/sbin/apxs; then
+ APXS=/usr/sbin/apxs
+ echo "$as_me:$LINENO: result: found $APXS. Use --with-apxs to specify another." >&5
+echo "${ECHO_T}found $APXS. Use --with-apxs to specify another." >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
@@ -8662,7 +8669,7 @@
if test "${with_nspr+set}" = set; then
withval="$with_nspr"
- if test -e "$withval"/include/nspr.h
+ if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
@@ -8681,10 +8688,60 @@
echo "${ECHO_T}no" >&6
fi;
+# check for --with-nspr-inc
+echo "$as_me:$LINENO: checking for --with-nspr-inc" >&5
+echo $ECHO_N "checking for --with-nspr-inc... $ECHO_C" >&6
+
+# Check whether --with-nspr-inc or --without-nspr-inc was given.
+if test "${with_nspr_inc+set}" = set; then
+ withval="$with_nspr_inc"
+
+ if test -e "$withval"/nspr.h
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ nspr_inc="-I$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval not found" >&5
+echo "$as_me: error: $withval not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+# check for --with-nspr-lib
+echo "$as_me:$LINENO: checking for --with-nspr-lib" >&5
+echo $ECHO_N "checking for --with-nspr-lib... $ECHO_C" >&6
+
+# Check whether --with-nspr-lib or --without-nspr-lib was given.
+if test "${with_nspr_lib+set}" = set; then
+ withval="$with_nspr_lib"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ nspr_lib="-L$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval not found" >&5
+echo "$as_me: error: $withval not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
# if NSPR is not found yet, try pkg-config
# last resort
-if test -z "$NSPRDIR"; then
+if test -z "$nspr_inc" -o -z "$nspr_lib"; then
echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5
echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6
# Extract the first word of "pkg-config", so it can be a program name with args.
@@ -8727,9 +8784,9 @@
fi
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nspr; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr`
- nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr`
+ if $PKG_CONFIG --exists nspr; then
+ nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
+ nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
else
{ { echo "$as_me:$LINENO: error: NSPR not found, specify with --with-nspr." >&5
echo "$as_me: error: NSPR not found, specify with --with-nspr." >&2;}
@@ -8749,7 +8806,7 @@
if test "${with_nss+set}" = set; then
withval="$with_nss"
- if test -e "$withval"/include/nss.h
+ if test -e "$withval"/include/nss.h -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
@@ -8768,10 +8825,60 @@
echo "${ECHO_T}no" >&6
fi;
+# check for --with-nss-inc
+echo "$as_me:$LINENO: checking for --with-nss-inc" >&5
+echo $ECHO_N "checking for --with-nss-inc... $ECHO_C" >&6
+
+# Check whether --with-nss-inc or --without-nss-inc was given.
+if test "${with_nss_inc+set}" = set; then
+ withval="$with_nss_inc"
+
+ if test -e "$withval"/nss.h
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ nss_inc="-I$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval not found" >&5
+echo "$as_me: error: $withval not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+# check for --with-nss-lib
+echo "$as_me:$LINENO: checking for --with-nss-lib" >&5
+echo $ECHO_N "checking for --with-nss-lib... $ECHO_C" >&6
+
+# Check whether --with-nss-lib or --without-nss-lib was given.
+if test "${with_nss_lib+set}" = set; then
+ withval="$with_nss_lib"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ nss_lib="-L$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval not found" >&5
+echo "$as_me: error: $withval not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
# if NSS is not found yet, try pkg-config
# last resort
-if test -z "$NSSDIR"; then
+if test -z "$nss_inc" -o -z "$nss_lib"; then
echo "$as_me:$LINENO: checking for nss with pkg-config" >&5
echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6
# Extract the first word of "pkg-config", so it can be a program name with args.
@@ -8814,9 +8921,9 @@
fi
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss`
- nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss`
+ if $PKG_CONFIG --exists nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L nss`
else
{ { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5
echo "$as_me: error: NSS not found, specify with --with-nss." >&2;}
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_nss/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.in 13 Sep 2005 19:34:39 -0000 1.5
+++ configure.in 26 Sep 2005 19:38:52 -0000 1.6
@@ -73,10 +73,13 @@
# if no apxs found yet, check /usr/local/apache/sbin
# since it's the default Apache location
if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin)
+ AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin and /usr/sbin)
if test -x /usr/local/apache/sbin/apxs; then
APXS=/usr/local/apache/sbin/apxs
AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.])
+ elif test -x /usr/sbin/apxs; then
+ APXS=/usr/sbin/apxs
+ AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.])
else
AC_MSG_RESULT(no)
fi
@@ -114,7 +117,7 @@
AC_MSG_CHECKING(for --with-nspr)
AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory],
[
- if test -e "$withval"/include/nspr.h
+ if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
NSPRDIR=$withval
@@ -127,16 +130,46 @@
],
AC_MSG_RESULT(no))
+# check for --with-nspr-inc
+AC_MSG_CHECKING(for --with-nspr-inc)
+AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory],
+[
+ if test -e "$withval"/nspr.h
+ then
+ AC_MSG_RESULT([using $withval])
+ nspr_inc="-I$withval"
+ else
+ echo
+ AC_MSG_ERROR([$withval not found])
+ fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-nspr-lib
+AC_MSG_CHECKING(for --with-nspr-lib)
+AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory],
+[
+ if test -d "$withval"
+ then
+ AC_MSG_RESULT([using $withval])
+ nspr_lib="-L$withval"
+ else
+ echo
+ AC_MSG_ERROR([$withval not found])
+ fi
+],
+AC_MSG_RESULT(no))
+
# if NSPR is not found yet, try pkg-config
# last resort
-if test -z "$NSPRDIR"; then
+if test -z "$nspr_inc" -o -z "$nspr_lib"; then
AC_MSG_CHECKING(for nspr with pkg-config)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nspr; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr`
- nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr`
+ if $PKG_CONFIG --exists nspr; then
+ nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
+ nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
else
AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
fi
@@ -149,7 +182,7 @@
AC_MSG_CHECKING(for --with-nss)
AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory],
[
- if test -e "$withval"/include/nss.h
+ if test -e "$withval"/include/nss.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
NSSDIR=$withval
@@ -162,16 +195,46 @@
],
AC_MSG_RESULT(no))
+# check for --with-nss-inc
+AC_MSG_CHECKING(for --with-nss-inc)
+AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory],
+[
+ if test -e "$withval"/nss.h
+ then
+ AC_MSG_RESULT([using $withval])
+ nss_inc="-I$withval"
+ else
+ echo
+ AC_MSG_ERROR([$withval not found])
+ fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-nss-lib
+AC_MSG_CHECKING(for --with-nss-lib)
+AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory],
+[
+ if test -d "$withval"
+ then
+ AC_MSG_RESULT([using $withval])
+ nss_lib="-L$withval"
+ else
+ echo
+ AC_MSG_ERROR([$withval not found])
+ fi
+],
+AC_MSG_RESULT(no))
+
# if NSS is not found yet, try pkg-config
# last resort
-if test -z "$NSSDIR"; then
+if test -z "$nss_inc" -o -z "$nss_lib"; then
AC_MSG_CHECKING(for nss with pkg-config)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozilla-nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss`
- nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss`
+ if $PKG_CONFIG --exists nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L nss`
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi
18 years, 8 months