[Fedora-directory-commits] esc/rpm build.sh, NONE, 1.1 esc, 1.3, 1.4 esc.spec, 1.3, 1.4
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/rpm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29257
Modified Files:
esc esc.spec
Added Files:
build.sh
Log Message:
Add build script. r. mharmsen.
--- NEW FILE build.sh ---
#!/bin/bash
# Command line arg values
# 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.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
echo "Building ESC...."
RPMBASE=RPMS
RPMPATH=
RPM_OS_TAG=fc8
RPMEXT=i386
RPMDIR=$RPMBASE/$RPMEXT
arch64="x86_64"
thearch=$(uname -m)
#Temporarily installed RPMS
RPM_PCSC_LITE_LIBS=
RPM_PCSC_LITE_DEVEL=
RPM_COOLKEY_DEVEL=
RPM_COOLKEY=
RPM_CCID=
RPM_NSS_DEVEL=
RPM_NSPR_DEVEL=
#URLs for SRPMs if drawn from the net
FEDORA_SRPMS=http://download.fedora.redhat.com/pub/fedora/linux/developme...
ESC_SRPM=esc-1.0.1-5.fc8.src.rpm
ESC_URL=$FEDORA_SRPMS/$ESC_SRPM
#####################################################################
################ Cleanup the temporary installed devel packages #####
#####################################################################
function cleanup {
echo "Cleaning up ..."
}
function getSRPM {
if [ -z $1 ];
then
echo "No input SRPM..."
return 0;
else
echo "Obtaining " $1
wget -nc --directory-prefix=SRPMS $1
if [ $? != 0 ];
then
"Echo problem obtaining SRPM $1."
exit 1
fi
fi
}
function getRPM {
if [ -z $1 ];
then
echo "No input RPM..."
return 0;
else
echo "Obtaining " $1
wget -nc --directory-prefix=RPMS/$RPMEXT $1
if [ $? != 0 ];
then
"Echo problem obtaining RPM $1."
exit 1
fi
fi
}
function getSRPMS {
getSRPM $ESC_URL
}
function initializeBUILD {
mkdir -p BUILD
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
mkdir -p RPMS
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
mkdir -p SRPMS
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
mkdir -p SPECS
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
mkdir -p SOURCES
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
}
#####################################################################
################ Main build logic ############################# #####
#####################################################################
initializeBUILD
getSRPMS
#####################################################################
################ Build ESC ##########################################
#####################################################################
echo "Building ESC...."
echo "Obtain latest ESC SRPM..."
echo "Installing ESC SRPM....."
rpm -Uvh --define="_topdir ${PWD}" SRPMS/$ESC_SRPM
if [ $? != 0 ];
then
echo "Problem installing ESC SRPM...."
cleanup
exit 1
fi
rpmbuild -ba --define="_topdir ${PWD}" SPECS/esc.spec
if [ $? != 0 ];
then
echo "Problem building final ESC RPM..."
fi
cleanup
exit 0
Index: esc
===================================================================
RCS file: /cvs/dirsec/esc/rpm/esc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc 5 Mar 2007 23:42:48 -0000 1.3
+++ esc 2 Aug 2007 18:16:38 -0000 1.4
@@ -17,6 +17,16 @@
# All rights reserved.
# END COPYRIGHT BLOCK
+
+
+
+DO_SECMODE="false"
+SECURITY_URL=
+DO_FORCEMODE="false"
+DO_SHOW_VERSION="false"
+ESC_ARGS=
+
+
ESC_PROFILE_BASE=~/.redhat/esc
ESC_LOG_FILE=esc.log
@@ -31,10 +41,12 @@
LAST_PROG_PID=0
SIGUSR1=10
-FORCE_START_ESC=$1
+FORCE_START_ESC=
XPTI_DAT=xpti.dat
COMPREG_DAT=compreg.dat
+LOCK_FILE=lock
+PARENT_LOCK_FILE=.parentlock
function isProgRunning {
@@ -51,51 +63,127 @@
function removeFile {
- if [ -w $1 ]
- then
- rm -f $1
- fi
+ rm -f $1
+}
+
+function cleanupProfile {
+
+ removeFile $ESC_PROFILE_BASE/*default/$XPTI_DAT
+ removeFile $ESC_PROFILE_BASE/*default/$COMPREG_DAT
+ removeFile $ESC_PROFILE_BASE/*default/$LOCK_FILE
+ removeFile $ESC_PROFILE_BASE/*default/$PARENT_LOCK_FILE
+
}
+function processArgs {
+
+ for arg in $1
+ do
+
+ #echo "theArg: $arg"
+ if [ $arg == "forceStartESC" ]
+ then
+ #echo "Do force mode!"
+ FORCE_START_ESC="true"
+ fi
+
+ if [ $arg == "keyInserted" ]
+ then
+ FORCE_START_ESC="true"
+ fi
+
+ if [ $arg == "-version" ]
+ then
+ #echo "Do show version!"
+ DO_SHOW_VERSION="true"
+ fi
+ if [ $DO_SECMODE == "true" ]
+ then
+ #echo "Sec Mode Url $arg"
+ SECURITY_URL=$arg
+ fi
+ if [ $arg == "-secmode" ]
+ then
+ DO_SECMODE="true"
+ #echo "Do security mode!"
+ fi
+ done
-export NSPR_LOG_MODULES=tray:2,coolKeyLib:2,coolKey:2,coolKeyNSS:2,coolKeySmart:2,coolKeyHandler:2,escDLog:5
+ if [ $DO_SECMODE == "true" ]
+ then
+ #echo "Launch ESC in security mode!"
+ ARGS="--secmode $SECURITY_URL"
+ fi
+}
+processArgs $*
if [ ! -d $ESC_PROFILE_BASE ]
then
-mkdir -p $ESC_PROFILE_BASE
+ mkdir -p $ESC_PROFILE_BASE
fi
-export NSPR_LOG_FILE=$ESC_PROFILE_BASE/$ESC_LOG_FILE
cd $ESC_PATH
-isProgRunning $ESC_BIN
+#First check if we just want the version
-if [ $LAST_PROG_PID -gt 0 ]
-then
-./$ESC_EXEC
-exit 0
+if [ $DO_SHOW_VERSION == "true" ]
+ then
+ #echo "try to run the version command!"
+ ESC_ARGS="-version"
+ ./$ESC_EXEC $ESC_ARGS
+ exit 0
fi
-if [ $FORCE_START_ESC ]
+# Start up the daemon if it is not running
+
+isProgRunning $ESCD_BIN
+
+if [ $LAST_PROG_PID -gt 0 ]
then
-./$ESC_EXEC
-exit 0
+ false
+ #echo "escd already running."
+else
+ #echo "escd not running start."
+ cleanupProfile
+ ./$ESCD_EXEC --key_Inserted=\"/usr/bin/esc\" --on_Signal=\"/usr/bin/esc\"
+ exit 0
fi
+# Now check to see if we wer signaled from the daemon
+if [ $FORCE_START_ESC ]
+then
+ #echo "force start esc."
-isProgRunning $ESCD_BIN
+ #Check to see if esc is already running
+ isProgRunning $ESC_BIN
+ if [ $LAST_PROG_PID -gt 0 ]
+ then
+ #echo "attempting a force start but already running ... exit."
+ exit 0
+ fi
+ #echo "force start esc not running start esc..."
+ ./$ESC_EXEC
+ exit 0
+fi
-if [ $LAST_PROG_PID -gt 0 ]
+isProgRunning $ESC_BIN
+
+if [ $LAST_PROG_PID -gt 0 ]
then
-kill -$SIGUSR1 $LAST_PROG_PID
+ #echo "esc already running."
+ ./$ESC_EXEC
+ exit 0
else
-removeFile $ESC_PROFILE_BASE/*default/$XPTI_DAT
-removeFile $ESC_PROFILE_BASE/*default/$COMPREG_DAT
-./$ESCD_EXEC --key_Inserted=\"/usr/bin/esc\" --on_Signal=\"/usr/bin/esc\"
-
+ #echo "esc not already running start up and bring up window."
+ ./$ESC_EXEC &
+ sleep 4
+
+ #echo "done sleeping bring up esc window."
+ ./$ESC_EXEC
+ exit 0
fi
exit 0
Index: esc.spec
===================================================================
RCS file: /cvs/dirsec/esc/rpm/esc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esc.spec 5 Mar 2007 23:43:03 -0000 1.3
+++ esc.spec 2 Aug 2007 18:16:38 -0000 1.4
@@ -1,25 +1,25 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# END COPYRIGHT BLOCK
+ # BEGIN COPYRIGHT BLOCK
+ # Copyright (C) 2005 Red Hat, Inc.
+ # All rights reserved.
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation version
+ # 2.1 of the License.
+ #
+ # This library 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
+ # Lesser General Public License for more details.
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ # END COPYRIGHT BLOCK
Name: esc
Version: 1.0.1
-Release: 1%{?dist}
+Release: 5%{?dist}
Summary: Enterprise Security Client Smart Card Client
License: GPL
URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -29,6 +29,10 @@
Patch1: firefox-1.5-with-system-nss.patch
Patch2: firefox-1.1-nss-system-nspr.patch
+Patch3: esc-1.0.1-admin-row-update.patch
+Patch4: esc-1.0.1-ui-fixes-1.patch
+Patch5: esc-1.0.1-log-fixes.patch
+Patch6: esc-1.0.1-log-fixes-1.patch
BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -61,12 +65,14 @@
%define pixmapdir %{_datadir}/pixmaps
%define docdir %{_defaultdocdir}/%{escname}
%define escappdir src/app/xpcom
+%define escxuldir src/app/xul/esc
Source0: %{escname}.tar.bz2
Source1: esc
Source2: esc.desktop
Source3: xulrunner-1.8.0.4-source.tar.bz2
+Source4: esc.png
%description
@@ -77,6 +83,12 @@
%setup -q -c -n %{escname}
+#Perform esc patching
+
+%patch3 -p1 -b .fix3
+%patch4 -p1 -b .fix4
+%patch5 -p1 -b .fix5
+%patch6 -p1 -b .fix6
#Unpack xulrunner where esc expects it to be.
@@ -101,6 +113,8 @@
cd ../..
+cp %{SOURCE4} %{escxuldir}/%{esc_chromepath}
+
make BUILD_OPT=1 HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release}
%install
@@ -172,6 +186,11 @@
%{_datadir}/%{appdir}/esc.desktop
%doc %{docdir}/LICENSE
+%preun
+
+killall --exact -q escd
+exit 0
+
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -185,7 +204,14 @@
fi
%changelog
-* Mon Mar 05 2007 Jack Magne <jmagne(a)redhat.com>- 1.0.0-1
+* Tue Jul 17 2007 Jack Magne <jmagne(a)redhat.com>- 1.0.1-5
+- Further fixes to the diagnostics logging.
+* Wed Jun 20 2007 Jack Magne <jmagne(a)redhat.com>- 1.0.1-4
+- Fixes to the diagnostics log files and esc error messages.
+* Thu Apr 26 2007 Jack Magne <jmagne(a)redhat.com>- 1.0.1-3
+- Many UI usability fixes.
+* Tue Apr 03 2007 Jack Magne <jmagne(a)redhat.com>- 1.0.1-2
+* Mon Mar 05 2007 Jack Magne <jmagne(a)redhat.com>- 1.0.1-1
- Stability fixes
* Fri Oct 27 2006 Jack Magne <jmagne(a)redhat.com>- 1.0.0-19
- More mac and win fixes.
16 years, 8 months
[Fedora-directory-commits] directoryconsole build.xml, 1.9, 1.10 fedora-ds-console.spec, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6287
Modified Files:
build.xml fedora-ds-console.spec
Log Message:
Resolves: 250636
Summary: Updated console framework dependency and jarfile install path.
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 30 Jul 2007 18:10:08 -0000 1.9
+++ build.xml 2 Aug 2007 16:59:52 -0000 1.10
@@ -82,9 +82,9 @@
<!-- Construct classpath -->
<path id="ldapconsole.classpath">
<fileset dir="${console.location}">
- <include name="**/fedora-idm-console-base-*.jar"/>
- <include name="**/fedora-mcc-*.jar"/>
- <include name="**/fedora-nmclf-*.jar"/>
+ <include name="**/idm-console-base-*.jar"/>
+ <include name="**/idm-console-mcc-*.jar"/>
+ <include name="**/idm-console-nmclf-*.jar"/>
<include name="**/ldapjdk.jar"/>
</fileset>
<pathelement path="${built.classdir}"/>
Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-console.spec 30 Jul 2007 18:10:08 -0000 1.2
+++ fedora-ds-console.spec 2 Aug 2007 16:59:52 -0000 1.3
@@ -1,63 +1,68 @@
%define major_version 1.1
%define minor_version 0
+%define shortname fedora-ds
+
Name: fedora-ds-console
Version: %{major_version}.%{minor_version}
-Release: 2
+Release: 3
+Summary: Fedora Directory Server Management Console
+
Group: Applications
-Vendor: Fedora Project
-URL: http://directory.fedora.redhat.com
License: LGPL
-Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
-Summary: Fedora Directory Server Management Console
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+URL: http://directory.fedoraproject.org
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Source: %{name}-%{version}.tar.gz
-Autoreq: 0
-AutoReqProv: no
-BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-idm-console-framework >= 1.1
+Source: %{name}-%{version}.tar.bz2
+Requires: %{shortname}-admin >= 1.1
+BuildRequires: ant >= 1.6.2
+BuildRequires: ldapjdk
+BuildRequires: idm-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
Directory Server.
-# prep and setup expect there to be a Source file
-# in the /usr/src/redhat/SOURCES directory - it will be unpacked
-# in the _builddir (not BuildRoot)
%prep
%setup -q
%build
-cd directoryconsole
-ant -Dconsole.location=/usr/share/java
-
+%{ant} \
+ -Dconsole.location=%{_javadir} \
+ -Dbuilt.dir=`pwd`/built
+
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/share/java
-install -m777 built/package/fedora-ds* $RPM_BUILD_ROOT/usr/share/java
+install -d $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+
+# create symlinks
+pushd $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar
+ln -s %{shortname}-%{version}.jar %{shortname}.jar
+ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar
+ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar
+popd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-/usr/share/java/fedora-ds-%{version}.jar
-/usr/share/java/fedora-ds-%{version}_en.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{version}.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{major_version}.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{version}_en.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{major_version}_en.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}_en.jar
-%post
-cd /usr/share/java
-ln -s fedora-ds-%{version}.jar fedora-ds-%{major_version}.jar
-ln -s fedora-ds-%{version}.jar fedora-ds.jar
-ln -s fedora-ds-%{version}_en.jar fedora-ds-%{major_version}_en.jar
-ln -s fedora-ds-%{version}_en.jar fedora-ds_en.jar
-
-%preun
-rm -rf /usr/share/java/fedora-ds-%{major_version}.jar
-rm -rf /usr/share/java/fedora-ds.jar
-rm -rf /usr/share/java/fedora-ds-%{major_version}_en.jar
-rm -rf /usr/share/java/fedora-ds_en.jar
-
%changelog
+* Wed Aug 1 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-3
+- Updated build requirement for new console framework package.
+Updated install location and Admin Server dependency. Also did
+some specfile cleanup.
+
* Mon Jul 30 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-2
- Updated requirements.
16 years, 8 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSContentPage.java, 1.3, 1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2750
Modified Files:
DSContentPage.java
Log Message:
Resolves: 204510
Summary: Fixed paste action to follow LDAP referrals.
Index: DSContentPage.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSContentPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSContentPage.java 13 Jul 2007 16:34:39 -0000 1.3
+++ DSContentPage.java 2 Aug 2007 16:35:32 -0000 1.4
@@ -1624,7 +1624,8 @@
if (ldc != null) {
String dn = Helper.getNodeInfoDN(node);
/* Do the paste */
- Paster paster = new Paster(ldc, dn, _framework, _clipboard);
+ LDAPConnection ldcNr = prepareReferralConnection(ldc);
+ Paster paster = new Paster(ldcNr, dn, _framework, _clipboard);
paster.execute();
/* Update the tree */
@@ -1651,6 +1652,9 @@
}
}
}
+ try {
+ ldcNr.disconnect(); // prepareReferralConnection clones connection
+ } catch (Exception ignore) {}
_connectionPool.releaseConnection(ldc);
}
}
16 years, 8 months
[Fedora-directory-commits] adminserver configure.ac, 1.16, 1.17 Makefile.am, 1.27, 1.28 aclocal.m4, 1.24, 1.25 configure, 1.27, 1.28 missing, 1.16, 1.17 install-sh, 1.16, 1.17 depcomp, 1.16, 1.17 compile, 1.15, 1.16 Makefile.in, 1.30, 1.31 config.sub, 1.16, 1.17 config.guess, 1.16, 1.17
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10460
Modified Files:
configure.ac Makefile.am aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
Log Message:
fix build breakage on rhel4
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.ac 2 Aug 2007 14:44:09 -0000 1.16
+++ configure.ac 2 Aug 2007 14:58:34 -0000 1.17
@@ -230,6 +230,7 @@
# Check for library dependencies
m4_include(m4/nspr.m4)
m4_include(m4/nss.m4)
+m4_include(m4/sasl.m4)
m4_include(m4/mozldap.m4)
m4_include(m4/icu.m4)
m4_include(m4/adminutil.m4)
@@ -302,6 +303,9 @@
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
AC_SUBST(nss_libdir)
+AC_SUBST(sasl_inc)
+AC_SUBST(sasl_lib)
+AC_SUBST(sasl_libdir)
AC_SUBST(ldapsdk_inc)
AC_SUBST(ldapsdk_lib)
AC_SUBST(ldapsdk_libdir)
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.am 2 Aug 2007 14:44:09 -0000 1.27
+++ Makefile.am 2 Aug 2007 14:58:34 -0000 1.28
@@ -127,8 +127,12 @@
LIBCRUN=@LIBCRUN@
DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ \
- @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
- @nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
+ @icu_lib@ -licui18n -licuuc -licudata \
+ @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
+ @sasl_lib@ -lsasl2 \
+ @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
+ @nspr_lib@ -lplds4 -lplc4 -lnspr4 \
+ $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
if CXXLINK_REQUIRED
MYLINK = $(CXXLINK)
@@ -367,7 +371,7 @@
else
# need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
# sort also strips out duplicates
-LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
+LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(sasl_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST))
# now put it in the canonical form
LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS))
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure 2 Aug 2007 14:44:09 -0000 1.27
+++ configure 2 Aug 2007 14:58:34 -0000 1.28
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1067,6 +1067,9 @@
--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
+ --with-sasl=PATH Use sasl from supplied path
+ --with-sasl-inc=PATH SASL include file directory
+ --with-sasl-lib=PATH SASL library directory
--with-ldapsdk=PATH Mozilla LDAP SDK directory
--with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory
--with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory
@@ -4310,7 +4313,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4313 "configure"' > conftest.$ac_ext
+ echo '#line 4316 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5445,7 +5448,7 @@
# Provide some information about the compiler.
-echo "$as_me:5448:" \
+echo "$as_me:5451:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6508,11 +6511,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6511: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6514: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6515: \$? = $ac_status" >&5
+ echo "$as_me:6518: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6776,11 +6779,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6779: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6782: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6783: \$? = $ac_status" >&5
+ echo "$as_me:6786: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6880,11 +6883,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6883: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6886: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6887: \$? = $ac_status" >&5
+ echo "$as_me:6890: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8349,7 +8352,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8352 "configure"' > conftest.$ac_ext
+ echo '#line 8355 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9246,7 +9249,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9249 "configure"
+#line 9252 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9346,7 +9349,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9349 "configure"
+#line 9352 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11689,11 +11692,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11692: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11695: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11696: \$? = $ac_status" >&5
+ echo "$as_me:11699: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11793,11 +11796,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11796: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11799: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11800: \$? = $ac_status" >&5
+ echo "$as_me:11803: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12329,7 +12332,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12332 "configure"' > conftest.$ac_ext
+ echo '#line 12335 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13387,11 +13390,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13390: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13393: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13394: \$? = $ac_status" >&5
+ echo "$as_me:13397: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13491,11 +13494,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13494: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13498: \$? = $ac_status" >&5
+ echo "$as_me:13501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14940,7 +14943,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14943 "configure"' > conftest.$ac_ext
+ echo '#line 14946 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15718,11 +15721,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15721: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15724: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15725: \$? = $ac_status" >&5
+ echo "$as_me:15728: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15986,11 +15989,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15989: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15992: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15993: \$? = $ac_status" >&5
+ echo "$as_me:15996: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16090,11 +16093,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16093: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16097: \$? = $ac_status" >&5
+ echo "$as_me:16100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17559,7 +17562,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17562 "configure"' > conftest.$ac_ext
+ echo '#line 17565 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -24202,6 +24205,148 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
+# -*- tab-width: 4; -*-
+# Configure paths for SASL
+
+{ echo "$as_me:$LINENO: checking for sasl..." >&5
+echo "$as_me: checking for sasl..." >&6;}
+
+echo "$as_me:$LINENO: checking for --with-sasl" >&5
+echo $ECHO_N "checking for --with-sasl... $ECHO_C" >&6
+
+# Check whether --with-sasl or --without-sasl was given.
+if test "${with_sasl+set}" = set; then
+ withval="$with_sasl"
+
+ if test "$withval" = "yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+ if test -f /usr/include/sasl/sasl.h; then
+ sasl_inc="-I/usr/include/sasl"
+ elif test -f /usr/include/sasl.h; then
+ sasl_inc="-I/usr/include"
+ else
+ { { echo "$as_me:$LINENO: error: sasl.h not found" >&5
+echo "$as_me: error: sasl.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+
+ if test -f "$withval/include/sasl/sasl.h"; then
+ sasl_inc="-I$withval/include/sasl"
+ elif test -f "$withval/include/sasl.h"; then
+ sasl_inc="-I$withval/include"
+ else
+ { { echo "$as_me:$LINENO: error: sasl.h not found" >&5
+echo "$as_me: error: sasl.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ sasl_lib="-L$withval/lib"
+ sasl_libdir="$withval/lib"
+ else
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ { { echo "$as_me:$LINENO: error: sasl not found in $withval" >&5
+echo "$as_me: error: sasl not found in $withval" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+echo "$as_me:$LINENO: checking for --with-sasl-inc" >&5
+echo $ECHO_N "checking for --with-sasl-inc... $ECHO_C" >&6
+
+# Check whether --with-sasl-inc or --without-sasl-inc was given.
+if test "${with_sasl_inc+set}" = set; then
+ withval="$with_sasl_inc"
+
+ if test -f "$withval"/sasl.h; then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ sasl_inc="-I$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval/sasl.h not found" >&5
+echo "$as_me: error: $withval/sasl.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+echo "$as_me:$LINENO: checking for --with-sasl-lib" >&5
+echo $ECHO_N "checking for --with-sasl-lib... $ECHO_C" >&6
+
+# Check whether --with-sasl-lib or --without-sasl-lib was given.
+if test "${with_sasl_lib+set}" = set; then
+ withval="$with_sasl_lib"
+
+ if test -d "$withval"; then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ sasl_lib="-L$withval"
+ sasl_libdir="$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 test -z "$sasl_inc"; then
+ echo "$as_me:$LINENO: checking for sasl.h" >&5
+echo $ECHO_N "checking for sasl.h... $ECHO_C" >&6
+ if test -f /usr/include/sasl/sasl.h; then
+ echo "$as_me:$LINENO: result: using /usr/include/sasl/sasl.h" >&5
+echo "${ECHO_T}using /usr/include/sasl/sasl.h" >&6
+ sasl_inc="-I/usr/include/sasl"
+ elif test -f /usr/include/sasl.h; then
+ echo "$as_me:$LINENO: result: using /usr/include/sasl.h" >&5
+echo "${ECHO_T}using /usr/include/sasl.h" >&6
+ sasl_inc="-I/usr/include"
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ { { echo "$as_me:$LINENO: error: sasl not found, specify with --with-sasl." >&5
+echo "$as_me: error: sasl not found, specify with --with-sasl." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2007 Red Hat, Inc.
+# All rights reserved.
+#
+# 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; either version 2
+# of the License, or (at your option) any later version.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
{ echo "$as_me:$LINENO: checking for LDAPSDK..." >&5
echo "$as_me: checking for LDAPSDK..." >&6;}
@@ -24984,6 +25129,9 @@
+
+
+
# write out paths for data/config files
@@ -25911,6 +26059,9 @@
s,@nss_inc@,$nss_inc,;t t
s,@nss_lib@,$nss_lib,;t t
s,@nss_libdir@,$nss_libdir,;t t
+s,@sasl_inc@,$sasl_inc,;t t
+s,@sasl_lib@,$sasl_lib,;t t
+s,@sasl_libdir@,$sasl_libdir,;t t
s,@ldapsdk_inc@,$ldapsdk_inc,;t t
s,@ldapsdk_lib@,$ldapsdk_lib,;t t
s,@ldapsdk_libdir@,$ldapsdk_libdir,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in 2 Aug 2007 14:44:09 -0000 1.30
+++ Makefile.in 2 Aug 2007 14:58:34 -0000 1.31
@@ -64,9 +64,9 @@
am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 \
$(top_srcdir)/m4/fortitude.m4 $(top_srcdir)/m4/httpd.m4 \
$(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \
- $(top_srcdir)/m4/mozldap.m4 $(top_srcdir)/m4/icu.m4 \
- $(top_srcdir)/m4/adminutil.m4 $(top_srcdir)/m4/mod_nss.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/sasl.m4 $(top_srcdir)/m4/mozldap.m4 \
+ $(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/adminutil.m4 \
+ $(top_srcdir)/m4/mod_nss.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -495,6 +495,9 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
propertydir = $(datadir)@propertydir@
+sasl_inc = @sasl_inc@
+sasl_lib = @sasl_lib@
+sasl_libdir = @sasl_libdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
@@ -571,8 +574,12 @@
lib_LTLIBRARIES = libds-admin-serv.la
noinst_LIBRARIES = libdsa.a
DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ \
- @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
- @nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
+ @icu_lib@ -licui18n -licuuc -licudata \
+ @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
+ @sasl_lib@ -lsasl2 \
+ @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
+ @nspr_lib@ -lplds4 -lplc4 -lnspr4 \
+ $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
@@ -785,7 +792,7 @@
@BUNDLE_TRUE@perlpath = $(perldir) $(libdir)/perl/arch $(libdir)/perl
# need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
# sort also strips out duplicates
-@BUNDLE_FALSE@LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
+@BUNDLE_FALSE@LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(sasl_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
@BUNDLE_FALSE@LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST))
# The root resource bundle is based on English (en) locale;
16 years, 8 months
[Fedora-directory-commits] adminserver/m4 sasl.m4,NONE,1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10460/m4
Added Files:
sasl.m4
Log Message:
fix build breakage on rhel4
--- NEW FILE sasl.m4 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
#
# 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; either version 2
# of the License, or (at your option) any later version.
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
# -*- tab-width: 4; -*-
# Configure paths for SASL
dnl ========================================================
dnl = sasl is used to support various authentication mechanisms
dnl = such as DIGEST-MD5 and GSSAPI.
dnl ========================================================
dnl ========================================================
dnl = Use the sasl libraries on the system (assuming it exists)
dnl ========================================================
AC_CHECKING(for sasl)
AC_MSG_CHECKING(for --with-sasl)
AC_ARG_WITH(sasl,
[[ --with-sasl=PATH Use sasl from supplied path]],
dnl = Look in the standard system locations
[
if test "$withval" = "yes"; then
AC_MSG_RESULT(yes)
dnl = Check for sasl.h in the normal locations
if test -f /usr/include/sasl/sasl.h; then
sasl_inc="-I/usr/include/sasl"
elif test -f /usr/include/sasl.h; then
sasl_inc="-I/usr/include"
else
AC_MSG_ERROR(sasl.h not found)
fi
dnl = Check the user provided location
elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
AC_MSG_RESULT([using $withval])
if test -f "$withval/include/sasl/sasl.h"; then
sasl_inc="-I$withval/include/sasl"
elif test -f "$withval/include/sasl.h"; then
sasl_inc="-I$withval/include"
else
AC_MSG_ERROR(sasl.h not found)
fi
sasl_lib="-L$withval/lib"
sasl_libdir="$withval/lib"
else
AC_MSG_RESULT(yes)
AC_MSG_ERROR([sasl not found in $withval])
fi
],
AC_MSG_RESULT(no))
AC_MSG_CHECKING(for --with-sasl-inc)
AC_ARG_WITH(sasl-inc,
[[ --with-sasl-inc=PATH SASL include file directory]],
[
if test -f "$withval"/sasl.h; then
AC_MSG_RESULT([using $withval])
sasl_inc="-I$withval"
else
echo
AC_MSG_ERROR([$withval/sasl.h not found])
fi
],
AC_MSG_RESULT(no))
AC_MSG_CHECKING(for --with-sasl-lib)
AC_ARG_WITH(sasl-lib,
[[ --with-sasl-lib=PATH SASL library directory]],
[
if test -d "$withval"; then
AC_MSG_RESULT([using $withval])
sasl_lib="-L$withval"
sasl_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
if test -z "$sasl_inc"; then
AC_MSG_CHECKING(for sasl.h)
dnl - Check for sasl in standard system locations
if test -f /usr/include/sasl/sasl.h; then
AC_MSG_RESULT([using /usr/include/sasl/sasl.h])
sasl_inc="-I/usr/include/sasl"
elif test -f /usr/include/sasl.h; then
AC_MSG_RESULT([using /usr/include/sasl.h])
sasl_inc="-I/usr/include"
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([sasl not found, specify with --with-sasl.])
fi
fi
16 years, 8 months
[Fedora-directory-commits] adminserver/admserv/newinst/src migrate-ds-admin.pl.in, 1.6, 1.7 register-ds-admin.pl.in, 1.1, 1.2 register_server.pl.in, 1.5, 1.6 setup-ds-admin.pl.in, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517/adminserver/admserv/newinst/src
Modified Files:
migrate-ds-admin.pl.in register-ds-admin.pl.in
register_server.pl.in setup-ds-admin.pl.in
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH. However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms. Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no
Index: migrate-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- migrate-ds-admin.pl.in 24 Jul 2007 20:10:16 -0000 1.6
+++ migrate-ds-admin.pl.in 2 Aug 2007 14:44:10 -0000 1.7
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# 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
@@ -17,7 +17,7 @@
# END COPYRIGHT BLOCK
#
-use lib '@perldir@';
+use lib qw(@perlpath@);
use strict;
Index: register-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- register-ds-admin.pl.in 27 Jul 2007 01:42:46 -0000 1.1
+++ register-ds-admin.pl.in 2 Aug 2007 14:44:10 -0000 1.2
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# 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
@@ -37,7 +37,7 @@
# END COPYRIGHT BLOCK
#
-use lib "@perldir@";
+use lib qw(@perlpath@);
use File::Basename;
use Net::Domain qw(hostfqdn);
Index: register_server.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_server.pl.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- register_server.pl.in 24 Jul 2007 20:10:16 -0000 1.5
+++ register_server.pl.in 2 Aug 2007 14:44:10 -0000 1.6
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# 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
@@ -35,7 +35,7 @@
# <ldiffile> ...: ldif file(s) or template ldif file(s) to be stored in
# the Configuration Directory Server
-use lib "@perldir@";
+use lib qw(@perlpath@);
use Getopt::Std;
use Net::Domain qw(hostname hostfqdn);
Index: setup-ds-admin.pl.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setup-ds-admin.pl.in 24 Jul 2007 20:10:16 -0000 1.10
+++ setup-ds-admin.pl.in 2 Aug 2007 14:44:10 -0000 1.11
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# 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
@@ -17,7 +17,7 @@
# END COPYRIGHT BLOCK
#
-use lib '@perldir@';
+use lib qw(@perlpath@);
use strict;
16 years, 8 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_create.in, 1.4, 1.5 ds_remove.in, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517/adminserver/admserv/cgi-src40
Modified Files:
ds_create.in ds_remove.in
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH. However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms. Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no
Index: ds_create.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds_create.in 24 Jul 2007 20:10:15 -0000 1.4
+++ ds_create.in 2 Aug 2007 14:44:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# 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
@@ -17,7 +17,7 @@
# END COPYRIGHT BLOCK
#
-use lib '@perldir@';
+use lib qw(@perlpath@);
use strict;
Index: ds_remove.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds_remove.in 27 Jul 2007 01:35:29 -0000 1.4
+++ ds_remove.in 2 Aug 2007 14:44:10 -0000 1.5
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# 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
@@ -17,7 +17,7 @@
# END COPYRIGHT BLOCK
#
-use lib '@perldir@';
+use lib qw(@perlpath@)
use strict;
16 years, 8 months