From fedora-directory-commits at redhat.com Fri Feb 1 00:03:38 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 31 Jan 2008 19:03:38 -0500 Subject: [Fedora-directory-commits] dsgw Makefile.am, 1.15, 1.16 aclocal.m4, 1.12, 1.13 configure, 1.15, 1.16 missing, 1.11, 1.12 install-sh, 1.11, 1.12 Makefile.in, 1.16, 1.17 depcomp, 1.11, 1.12 config.sub, 1.11, 1.12 config.guess, 1.11, 1.12 compile, 1.11, 1.12 Message-ID: <200802010003.m1103cgU027993@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27956 Modified Files: Makefile.am aclocal.m4 configure missing install-sh Makefile.in depcomp config.sub config.guess compile Log Message: actually use perlpath in the generated files Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.am 31 Jan 2008 23:53:34 -0000 1.15 +++ Makefile.am 1 Feb 2008 00:03:36 -0000 1.16 @@ -307,7 +307,7 @@ -e 's, at contextdir\@,$(contextdir),g' \ -e 's, at securitydir\@,$(securitydir),g' \ -e 's, at instconfigdir\@,$(instconfigdir),g' \ - -e 's, at perlpath\@,$(perldir),g' \ + -e 's, at perlpath\@,$(perlpath),g' \ -e 's, at perlexec\@, at perlexec@,g' \ -e 's, at manualdir\@,$(manualdir),g' \ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.in 31 Jan 2008 23:53:34 -0000 1.16 +++ Makefile.in 1 Feb 2008 00:03:36 -0000 1.17 @@ -588,7 +588,7 @@ -e 's, at contextdir\@,$(contextdir),g' \ -e 's, at securitydir\@,$(securitydir),g' \ -e 's, at instconfigdir\@,$(instconfigdir),g' \ - -e 's, at perlpath\@,$(perldir),g' \ + -e 's, at perlpath\@,$(perlpath),g' \ -e 's, at perlexec\@, at perlexec@,g' \ -e 's, at manualdir\@,$(manualdir),g' \ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \ From fedora-directory-commits at redhat.com Fri Feb 1 16:50:15 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 1 Feb 2008 11:50:15 -0500 Subject: [Fedora-directory-commits] dsgw Makefile.am, 1.16, 1.17 configure.ac, 1.9, 1.10 setup-ds-dsgw.in, 1.4, 1.5 aclocal.m4, 1.13, 1.14 configure, 1.16, 1.17 missing, 1.12, 1.13 install-sh, 1.12, 1.13 depcomp, 1.12, 1.13 config.sub, 1.12, 1.13 config.guess, 1.12, 1.13 compile, 1.12, 1.13 Makefile.in, 1.17, 1.18 Message-ID: <200802011650.m11GoFYg030439@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30404/dsgw Modified Files: Makefile.am configure.ac setup-ds-dsgw.in aclocal.m4 configure missing install-sh depcomp config.sub config.guess compile Makefile.in Log Message: setup will print messages showing what it is doing - setup will copy in the admin server home page html fragment files to enable using dsgw, phonebook, and orgchart from the admin server home page Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.am 1 Feb 2008 00:03:36 -0000 1.16 +++ Makefile.am 1 Feb 2008 16:50:12 -0000 1.17 @@ -26,6 +26,8 @@ htmldir = $(datadir)@htmldir@ pbhtmldir = $(datadir)@pbhtmldir@ orghtmldir = $(datadir)@orghtmldir@ +admservdata = $(datadir)@admservdata@ +admservhtml = $(datadir)@admservhtml@ # config is a bit of a misnomer - these are really configurable templates configdir = $(datadir)@configdir@ pbconfigdir = $(datadir)@pbconfigdir@ @@ -294,6 +296,8 @@ -e 's, at localstatedir\@,$(localstatedir),g' \ -e 's, at cgibindir\@,$(cgibindir),g' \ -e 's, at cgiuri\@,$(cgiuri),g' \ + -e 's, at admservdata\@,$(admservdata),g' \ + -e 's, at admservhtml\@,$(admservhtml),g' \ -e 's, at orguri\@, at orguri@,g' \ -e 's, at dsgwuri\@, at dsgwuri@,g' \ -e 's, at pburi\@, at pburi@,g' \ Index: configure.ac =================================================================== RCS file: /cvs/dirsec/dsgw/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.ac 31 Jan 2008 03:14:44 -0000 1.9 +++ configure.ac 1 Feb 2008 16:50:12 -0000 1.10 @@ -254,6 +254,8 @@ orghtmldir=/dsgw/orghtml configdir=/dsgw/config pbconfigdir=/dsgw/pbconfig + admservdata=/data + admservhtml=/html # root directory for all manuals manualdir=/manual # the actual manual files are installed here under the lang directory @@ -270,6 +272,8 @@ orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml configdir=/$PACKAGE_BASE_NAME/dsgw/config pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig + admservdata=/$PACKAGE_BASE_NAME/data + admservhtml=/$PACKAGE_BASE_NAME/html # root directory for all manuals manualdir=/$PACKAGE_BASE_NAME/manual # the actual manual files are installed here under the lang directory @@ -341,6 +345,8 @@ AC_SUBST(perldir) AC_SUBST(manualdir) AC_SUBST(manualsubdir) +AC_SUBST(admservdata) +AC_SUBST(admservhtml) # need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not Index: setup-ds-dsgw.in =================================================================== RCS file: /cvs/dirsec/dsgw/setup-ds-dsgw.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- setup-ds-dsgw.in 31 Jan 2008 23:51:47 -0000 1.4 +++ setup-ds-dsgw.in 1 Feb 2008 16:50:12 -0000 1.5 @@ -30,6 +30,12 @@ # ########################## +echo '######################################################################' +echo This shell script will configure the Directory Server +echo Gateway, Phonebook and Org Chart web applications to +echo work with the Administration Server. +echo + getValFromInf() { cattr=$1 cfile=$2 @@ -63,6 +69,7 @@ # see if there is a $dsgwconfigdir/../admin-serv admservdir=$basecfgdir/admin-serv if [ -f "$admservdir/local.conf" ] ; then + echo Reading parameters from Administration Server config . . . host=`getValFromLdif serverHostName "$admservdir/local.conf"` port=`getValFromLdif configuration.nsServerPort "$admservdir/local.conf"` sec=`getValFromLdif configuration.nsServerSecurity "$admservdir/local.conf"` @@ -78,6 +85,7 @@ httpdconf=$admservdir/httpd.conf dsgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'` dsgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'` + echo Using Administration Server URL $httpurl . . . fi # see if there are any directory servers here @@ -86,6 +94,7 @@ *.deleted) continue ;; esac if [ -d "$dir" -a -f "$dir/dse.ldif" ] ; then + echo Reading parameters from Directory Server $dir . . . dirmgr=`getValFromLdif nsslapd-rootdn "$dir/dse.ldif"` host=`getValFromLdif nsslapd-localhost "$dir/dse.ldif"` sec=`getValFromLdif nsslapd-security "$dir/dse.ldif"` @@ -115,28 +124,23 @@ fi done +if [ -n "$ldapurl" ] ; then + echo Using Directory Server URL $ldapurl/$suffix . . . +fi + # get command line arguments -myargs= -silent= inffile= -tmpinffile= nextisinffile= -keepinffile= +reconfig= for arg in "$@" ; do - if [ "$arg" = "-s" ]; then - silent=1 - elif [ "$arg" = "-k" ]; then - keepinffile=1 - elif [ "$arg" = "-r" ]; then + if [ "$arg" = "-r" ]; then reconfig=1 elif [ "$arg" = "-f" ]; then nextisinffile=1 elif [ $nextisinffile ]; then inffile="$arg" nextisinffile= - else - myargs="$myargs $arg" fi done @@ -162,9 +166,14 @@ if [ -n "$infgroup" ] ; then dsgwgroup="$infgroup" fi + echo Using parameters from file $inffile . . . + echo Using Administration Server URL $httpurl . . . + echo Using Directory Server URL $ldapurl/$suffix . . . fi if [ -z "$reconfig" -a -f $dsgwconfigdir/dsgw.conf ] ; then + echo + echo '######################################################################' echo The Directory Server Gateway has already been configured. The echo file $dsgwconfigdir/dsgw.conf echo exists already. If you want to force a reconfiguration, removing @@ -173,6 +182,7 @@ exit 1 fi +echo Generating config file $dsgwconfigdir/dsgw.conf . . . # generate dsgw.conf and pb.conf and default.conf in the $dsgwconfigdir directory rm -f $dsgwconfigdir/dsgw.conf sed -e "s#@host@#$hostname#g" \ @@ -188,6 +198,7 @@ chown $dsgwuser:$dsgwgroup $dsgwconfigdir/dsgw.conf chmod 0400 $dsgwconfigdir/dsgw.conf +echo Generating config file $dsgwconfigdir/pb.conf . . . rm -f $dsgwconfigdir/pb.conf sed -e "s#@host@#$hostname#g" \ -e "s#@port@#$port#g" \ @@ -202,6 +213,7 @@ chown $dsgwuser:$dsgwgroup $dsgwconfigdir/pb.conf chmod 0400 $dsgwconfigdir/pb.conf +echo Generating config file $dsgwconfigdir/orgchart.conf . . . rm -f $dsgwconfigdir/orgchart.conf sed -e "s#@host@#$hostname#g" \ -e "s#@port@#$port#g" \ @@ -217,23 +229,52 @@ chmod 0400 $dsgwconfigdir/orgchart.conf # the default.conf is just a copy of dsgw.conf +echo Generating config file $dsgwconfigdir/default.conf . . . rm -f $dsgwconfigdir/default.conf cp $dsgwconfigdir/dsgw.conf $dsgwconfigdir/default.conf chown $dsgwuser:$dsgwgroup $dsgwconfigdir/default.conf chmod 0400 $dsgwconfigdir/default.conf # tell Apache about the dsgw - must restart Apache +echo Adding configuration to httpd config file $httpdconf . . . grep dsgw-httpd.conf "$httpdconf" > /dev/null 2>&1 || (echo "" ; echo "# DSGW configuration" ; echo "Include $dsgwconfigdir/dsgw-httpd.conf") >> $httpdconf -echo "The DSGW has been successfully configured." -if [ $isAdmServ ] ; then - echo "Please restart the Admin Server - /path/to/start-admin " +# copy in the admin server web app fragments +echo Enabling links to web apps from Administration Server home page . . . +admservdata="@admservdata@" +admservhtml="@admservhtml@" + +if [ -d "$admservdata" -a -d "$admservhtml" ] ; then + if [ ! -f "$admservdata/admserv_dsgw.html" ] ; then + echo Error: $admservdata/admserv_dsgw.html not found + elif [ ! -f "$admservhtml/admserv_dsgw.html" ] ; then + cp -p "$admservdata/admserv_dsgw.html" "$admservhtml" + else + echo $admservhtml/admserv_dsgw.html already exists - not copying . . . + fi + + if [ ! -f "$admservdata/admserv_phonebook.html" ] ; then + echo Error: $admservdata/admserv_phonebook.html not found + elif [ ! -f "$admservhtml/admserv_phonebook.html" ] ; then + cp -p "$admservdata/admserv_phonebook.html" "$admservhtml" + else + echo $admservhtml/admserv_phonebook.html already exists - not copying . . . + fi + + if [ ! -f "$admservdata/admserv_orgchart.html" ] ; then + echo Error: $admservdata/admserv_orgchart.html not found + elif [ ! -f "$admservhtml/admserv_orgchart.html" ] ; then + cp -p "$admservdata/admserv_orgchart.html" "$admservhtml" + else + echo $admservhtml/admserv_orgchart.html already exists - not copying . . . + fi else - echo "Please restart Apache e.g." - echo " service httpd restart" - echo " OR" - echo " apachectl restart" - echo "or however you restart apache on this system." + echo Error: Administration server directories "$admservdata" and "$admservhtml" not found fi +echo +echo The Directory Server Gateway web applications have been successfully configured. +echo You will need to restart your Administration Server. +echo '######################################################################' + exit 0 Index: configure =================================================================== RCS file: /cvs/dirsec/dsgw/configure,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- configure 1 Feb 2008 00:03:36 -0000 1.16 +++ configure 1 Feb 2008 16:50:12 -0000 1.17 @@ -466,7 +466,7 @@ #endif" ac_default_prefix=/opt/dirsrv -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 POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE DEBUG_TRUE DEBUG_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG 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 cgibindir cgiuri dsgwuri orguri pburi propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir securitydir cookiedir perldir manualdir manualsubdir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_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 POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE DEBUG_TRUE DEBUG_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG 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 cgibindir cgiuri dsgwuri orguri pburi propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir securitydir cookiedir perldir manualdir manualsubdir admservdata admservhtml NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -21403,6 +21403,8 @@ orghtmldir=/dsgw/orghtml configdir=/dsgw/config pbconfigdir=/dsgw/pbconfig + admservdata=/data + admservhtml=/html # root directory for all manuals manualdir=/manual # the actual manual files are installed here under the lang directory @@ -21419,6 +21421,8 @@ orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml configdir=/$PACKAGE_BASE_NAME/dsgw/config pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig + admservdata=/$PACKAGE_BASE_NAME/data + admservhtml=/$PACKAGE_BASE_NAME/html # root directory for all manuals manualdir=/$PACKAGE_BASE_NAME/manual # the actual manual files are installed here under the lang directory @@ -22518,6 +22522,8 @@ + + # need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not @@ -23406,6 +23412,8 @@ s, at perldir@,$perldir,;t t s, at manualdir@,$manualdir,;t t s, at manualsubdir@,$manualsubdir,;t t +s, at admservdata@,$admservdata,;t t +s, at admservhtml@,$admservhtml,;t t s, at NEED_LDIF_TRUE@,$NEED_LDIF_TRUE,;t t s, at NEED_LDIF_FALSE@,$NEED_LDIF_FALSE,;t t s, at WINNT_TRUE@,$WINNT_TRUE,;t t Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.in 1 Feb 2008 00:03:36 -0000 1.17 +++ Makefile.in 1 Feb 2008 16:50:12 -0000 1.18 @@ -312,6 +312,8 @@ adminutil_lib = @adminutil_lib@ adminutil_libdir = @adminutil_libdir@ adminutil_ver = @adminutil_ver@ +admservdata = $(datadir)@admservdata@ +admservhtml = $(datadir)@admservhtml@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -575,6 +577,8 @@ -e 's, at localstatedir\@,$(localstatedir),g' \ -e 's, at cgibindir\@,$(cgibindir),g' \ -e 's, at cgiuri\@,$(cgiuri),g' \ + -e 's, at admservdata\@,$(admservdata),g' \ + -e 's, at admservhtml\@,$(admservhtml),g' \ -e 's, at orguri\@, at orguri@,g' \ -e 's, at dsgwuri\@, at dsgwuri@,g' \ -e 's, at pburi\@, at pburi@,g' \ From fedora-directory-commits at redhat.com Fri Feb 1 17:04:25 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 1 Feb 2008 12:04:25 -0500 Subject: [Fedora-directory-commits] dsgw/orghtml orgchart.tmpl.in,1.2,1.3 Message-ID: <200802011704.m11H4Pa7005414@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/orghtml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5375/dsgw/orghtml Modified Files: orgchart.tmpl.in Log Message: remove the hp host:port cgi parameter Index: orgchart.tmpl.in =================================================================== RCS file: /cvs/dirsec/dsgw/orghtml/orgchart.tmpl.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- orgchart.tmpl.in 30 Jan 2008 02:22:47 -0000 1.2 +++ orgchart.tmpl.in 1 Feb 2008 17:04:22 -0000 1.3 @@ -68,10 +68,13 @@ # # For example, you could specify below something close to: # -# url-phonebook-base http://hostname.domain.com/dsgw/bin/dosearch?context=default&hp=localhost&dn= +# url-phonebook-base http://hostname.domain.com/dsgw/bin/dosearch?context=default&dn= # +# Note that you used to be able to pass in the host and port of the LDAP server to use +# the way this works now is that it will just use the LDAP server configured for the +# phonebook to use in the pb.conf file -url-phonebook-base @httpurl@@cgiuri@/dosearch?context=pb&hp=@host@:@port@&dn= +url-phonebook-base @httpurl@@cgiuri@/dosearch?context=pb&dn= # # A name that has no value after it equates to "" for the value, From fedora-directory-commits at redhat.com Fri Feb 1 17:04:24 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 1 Feb 2008 12:04:24 -0500 Subject: [Fedora-directory-commits] dsgw dosearch.c, 1.3, 1.4 dsgwutil.c, 1.7, 1.8 entrydisplay.c, 1.4, 1.5 Message-ID: <200802011704.m11H4OXS005408@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5375/dsgw Modified Files: dosearch.c dsgwutil.c entrydisplay.c Log Message: remove the hp host:port cgi parameter Index: dosearch.c =================================================================== RCS file: /cvs/dirsec/dsgw/dosearch.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dosearch.c 14 Jan 2008 23:34:27 -0000 1.3 +++ dosearch.c 1 Feb 2008 17:04:22 -0000 1.4 @@ -41,7 +41,7 @@ #include "dsgw.h" -static void get_request(char* hostport, char *dn, char *ldapquery); +static void get_request(char *dn, char *ldapquery); static void post_request(); @@ -54,7 +54,6 @@ { int reqmethod; char *dn = NULL; - char *hostport = NULL; char *ldapquery = NULL; int index = 0; char *varname = NULL; @@ -70,7 +69,6 @@ reqmethod = dsgw_init( argc, argv, DSGW_METHOD_POST | DSGW_METHOD_GET ); - hostport = dsgw_get_cgi_var("hp", DSGW_CGIVAR_OPTIONAL); ldapquery = dsgw_get_cgi_var("ldq", DSGW_CGIVAR_OPTIONAL); dn = dsgw_get_cgi_var("dn", DSGW_CGIVAR_OPTIONAL); /* @@ -78,8 +76,8 @@ * tack it onto the end of ldapquery. */ while ( (varname = dsgw_next_cgi_var( &index, &val )) != NULL) { - if (!strcmp(varname, "hp") || !strcmp(varname, "ldq") || - !strcmp(varname, "dn") || !strcmp(varname, "context")) { + if (!strcmp(varname, "context") || !strcmp(varname, "ldq") || + !strcmp(varname, "dn")) { continue; } if (ldapquery != NULL) { @@ -106,7 +104,7 @@ #endif if ( reqmethod == DSGW_METHOD_GET ) { - get_request(hostport, dn, ldapquery); + get_request(dn, ldapquery); } else { post_request(); } @@ -116,7 +114,7 @@ static void -get_request(char* hostport, char *dn, char *ldapquery) +get_request(char *dn, char *ldapquery) { int urllen = 0; int argslen = 0; @@ -147,55 +145,23 @@ * .../dosearch?context=BLAH[&hp=host[:port]][&dn=baseDN][&ldq=LDAPquery]] * -RJP */ - argslen = 0; - - /* get the length of all the args (dn, hostport, ldapquery)*/ - if (hostport != NULL) { - argslen += strlen(hostport); - } - - if (dn != NULL) { - argslen += strlen(dn); - } - - if (ldapquery != NULL) { - argslen += strlen(ldapquery); - } - - /* If nothing was supplied, exit*/ - if ( argslen == 0 ) { - dsgw_error( DSGW_ERR_MISSINGINPUT, NULL, DSGW_ERROPT_EXIT, 0, NULL ); - } - - /* Malloc the ldapurl*/ - urllen = LDAP_URL_PREFIX_LEN + argslen + 3; - p = ldapurl = (char *)dsgw_ch_malloc( urllen ); - - /*Slap on ldap:// */ - strcpy( p, LDAP_URL_PREFIX ); - p += LDAP_URL_PREFIX_LEN; - - /*Slap on host:port if there is one*/ - if ( hostport != NULL ) { - strcpy( p, hostport ); - } - - strcat( ldapurl, "/" ); - - /*Slap on /dn, if there is a dn */ - if ( dn != NULL ) { - strcat( ldapurl, dn ); - } - - /*Slap on ?ldapquery */ - if ( ldapquery != NULL ) { - sprintf( ldapurl + strlen( ldapurl ), "?%s", ldapquery ); - } + /* richm 20080201 + * removed the hp argument - we will now just construct the ldap url + * based on the dsgw config parameters + */ + ldapurl = PR_smprintf("ldap%s://%s:%d/%s%s%s", + (gc->gc_ldapssl ? "s" : ""), + gc->gc_ldapserver, gc->gc_ldapport, + (dn ? dn : ""), + (ldapquery ? "?" : ""), + (ldapquery ? ldapquery : "")); #ifdef DSGW_DEBUG dsgw_log( "get_request: processing LDAP URL \"%s\"\n", ldapurl ); #endif dsgw_ldapurl_search( NULL, ldapurl); + + PR_smprintf_free(ldapurl); } Index: dsgwutil.c =================================================================== RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsgwutil.c 30 Jan 2008 02:22:46 -0000 1.7 +++ dsgwutil.c 1 Feb 2008 17:04:22 -0000 1.8 @@ -677,16 +677,9 @@ dsgw_build_urlprefix() { char *prefix = dsgw_getvp( DSGW_CGINUM_DOSEARCH ); - char *p, *urlprefix; + char *urlprefix; - p = ( gc->gc_ldapserver == NULL ? "" : gc->gc_ldapserver ); - urlprefix = dsgw_ch_malloc( 16 /* room for "?:port#&dn=" + zero-term. */ - + strlen( prefix ) + strlen( p ) +strlen(context) + 9); - sprintf( urlprefix, "%s?context=%s&hp=%s", prefix, context, p ); - if ( gc->gc_ldapport != 0 && gc->gc_ldapport != LDAP_PORT ) { - sprintf( urlprefix + strlen( urlprefix ), ":%d", gc->gc_ldapport ); - } - strcat( urlprefix,"&dn=" ); + urlprefix = PR_smprintf("%s?context=%s&dn=", prefix, context); return( urlprefix ); } Index: entrydisplay.c =================================================================== RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- entrydisplay.c 30 Jan 2008 17:16:45 -0000 1.4 +++ entrydisplay.c 1 Feb 2008 17:04:22 -0000 1.5 @@ -1023,6 +1023,9 @@ * Now, thanks to me, they look like: * .../dosearch?context=&hp=:&dn=&ldq= * - RJP + * + * richm 20080201 - removed hp - search will always use the configured LDAP server + * instead of passing the host:port to use */ char *urlprefix, *escapeddn, *mimetype, *prefix, *suffix; From fedora-directory-commits at redhat.com Thu Feb 7 22:44:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:44:03 -0500 Subject: [Fedora-directory-commits] dsgw/tests/auth - New directory Message-ID: <200802072244.m17Mi3m4014866@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/auth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818/auth Log Message: Directory /cvs/dirsec/dsgw/tests/auth added to the repository From fedora-directory-commits at redhat.com Thu Feb 7 22:44:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:44:03 -0500 Subject: [Fedora-directory-commits] dsgw/tests/doauth - New directory Message-ID: <200802072244.m17Mi3vt014871@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/doauth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818/doauth Log Message: Directory /cvs/dirsec/dsgw/tests/doauth added to the repository From fedora-directory-commits at redhat.com Thu Feb 7 22:44:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:44:03 -0500 Subject: [Fedora-directory-commits] dsgw/tests/domodify - New directory Message-ID: <200802072244.m17Mi3d5014876@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/domodify In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818/domodify Log Message: Directory /cvs/dirsec/dsgw/tests/domodify added to the repository From fedora-directory-commits at redhat.com Thu Feb 7 22:44:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:44:03 -0500 Subject: [Fedora-directory-commits] dsgw/tests/edit - New directory Message-ID: <200802072244.m17Mi3Bk014881@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/edit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818/edit Log Message: Directory /cvs/dirsec/dsgw/tests/edit added to the repository From fedora-directory-commits at redhat.com Thu Feb 7 22:46:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:46:59 -0500 Subject: [Fedora-directory-commits] dsgw/tests/auth testget.1, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 testget.4, NONE, 1.1 testget.5, NONE, 1.1 testget.6, NONE, 1.1 testget.7, NONE, 1.1 testpost.1, NONE, 1.1 testpost.2, NONE, 1.1 testpost.3, NONE, 1.1 testpost.4, NONE, 1.1 testpost.5, NONE, 1.1 Message-ID: <200802072246.m17MkxI9015189@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/auth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15072/auth Added Files: testget.1 testget.2 testget.3 testget.4 testget.5 testget.6 testget.7 testpost.1 testpost.2 testpost.3 testpost.4 testpost.5 Log Message: added a lot of tests --- NEW FILE testget.1 --- --- NEW FILE testget.2 --- dn=bogusvalue --- NEW FILE testget.3 --- dn=MANAGER --- NEW FILE testget.4 --- dn=cn=directory manager --- NEW FILE testget.5 --- authdesturl=_authdesturl_param_ --- NEW FILE testget.6 --- dn=cn=directory manager&authdesturl=_authdesturl_param_ --- NEW FILE testget.7 --- authhint=_authhint_param_ --- NEW FILE testpost.1 --- --- NEW FILE testpost.2 --- escapedbinddn=bogusvalue --- NEW FILE testpost.3 --- binddn=bogusvalue --- NEW FILE testpost.4 --- authasrootdn=somebogusvalue --- NEW FILE testpost.5 --- authasrootdn=TRUE From fedora-directory-commits at redhat.com Thu Feb 7 22:46:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:46:59 -0500 Subject: [Fedora-directory-commits] dsgw/tests/doauth testpost.1, NONE, 1.1 testpost.2, NONE, 1.1 testpost.3, NONE, 1.1 testpost.4, NONE, 1.1 testpost.5, NONE, 1.1 testpost.6, NONE, 1.1 Message-ID: <200802072246.m17MkxFM015201@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/doauth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15072/doauth Added Files: testpost.1 testpost.2 testpost.3 testpost.4 testpost.5 testpost.6 Log Message: added a lot of tests --- NEW FILE testpost.1 --- --- NEW FILE testpost.2 --- escapedbinddn=bogusvalue --- NEW FILE testpost.3 --- binddn=bogusvalue --- NEW FILE testpost.4 --- authdesturl=_authdesturl_param_ --- NEW FILE testpost.5 --- escapedbinddn=cn=directory manager&password=boguspassword --- NEW FILE testpost.6 --- escapedbinddn=cn=directory manager&password=secret12 From fedora-directory-commits at redhat.com Thu Feb 7 22:46:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:46:59 -0500 Subject: [Fedora-directory-commits] dsgw/tests/domodify testpost.1, NONE, 1.1 testpost.2, NONE, 1.1 Message-ID: <200802072246.m17MkxjC015206@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/domodify In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15072/domodify Added Files: testpost.1 testpost.2 Log Message: added a lot of tests --- NEW FILE testpost.1 --- --- NEW FILE testpost.2 --- changetype=&dn=&quiet=&verbose=& From fedora-directory-commits at redhat.com Thu Feb 7 22:46:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:46:59 -0500 Subject: [Fedora-directory-commits] dsgw/tests/edit testget.1, NONE, 1.1 testget.10, NONE, 1.1 testget.11, NONE, 1.1 testget.12, NONE, 1.1 testget.13, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 testget.4, NONE, 1.1 testget.5, NONE, 1.1 testget.6, NONE, 1.1 testget.7, NONE, 1.1 testget.8, NONE, 1.1 testget.9, NONE, 1.1 Message-ID: <200802072246.m17MkxxM015211@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/edit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15072/edit Added Files: testget.1 testget.10 testget.11 testget.12 testget.13 testget.2 testget.3 testget.4 testget.5 testget.6 testget.7 testget.8 testget.9 Log Message: added a lot of tests --- NEW FILE testget.1 --- --- NEW FILE testget.10 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname=passwd --- NEW FILE testget.11 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname=Anything --- NEW FILE testget.12 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname=person --- NEW FILE testget.13 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=uid&dndesc=u i d&add=1&tmplname=person --- NEW FILE testget.2 --- info=&dn=%00&dnattr=&dndesc=&add=&tmplname= --- NEW FILE testget.3 --- info=&dn=uid=scarter,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=&tmplname= --- NEW FILE testget.4 --- info=&dn=uid=scarter,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname= --- NEW FILE testget.5 --- info=&dn=dc=parentdoesnotexist&dnattr=&dndesc=&add=1&tmplname= --- NEW FILE testget.6 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname= --- NEW FILE testget.7 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname=doesnotexist --- NEW FILE testget.8 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname=contents --- NEW FILE testget.9 --- info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=&dndesc=&add=1&tmplname=contents From fedora-directory-commits at redhat.com Thu Feb 7 22:47:01 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:47:01 -0500 Subject: [Fedora-directory-commits] dsgw/tests/lang testget.11, NONE, 1.1 testget.12, NONE, 1.1 testpost.1, NONE, 1.1 testpost.10, NONE, 1.1 testpost.11, NONE, 1.1 testpost.12, NONE, 1.1 testpost.2, NONE, 1.1 testpost.3, NONE, 1.1 testpost.4, NONE, 1.1 testpost.5, NONE, 1.1 testpost.6, NONE, 1.1 testpost.7, NONE, 1.1 testpost.8, NONE, 1.1 testpost.9, NONE, 1.1 Message-ID: <200802072247.m17Ml1mx015216@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/lang In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15072/lang Added Files: testget.11 testget.12 testpost.1 testpost.10 testpost.11 testpost.12 testpost.2 testpost.3 testpost.4 testpost.5 testpost.6 testpost.7 testpost.8 testpost.9 Log Message: added a lot of tests --- NEW FILE testget.11 --- file=maintitle.html --- NEW FILE testget.12 --- file=.MANUAL/contents.html --- NEW FILE testpost.1 --- --- NEW FILE testpost.10 --- info=../../../../ --- NEW FILE testpost.11 --- file=maintitle.html --- NEW FILE testpost.12 --- file=.MANUAL/contents.html --- NEW FILE testpost.2 --- info= --- NEW FILE testpost.3 --- file= --- NEW FILE testpost.4 --- info=&file= --- NEW FILE testpost.5 --- file=/ --- NEW FILE testpost.6 --- file=. --- NEW FILE testpost.7 --- file=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --- NEW FILE testpost.8 --- file=../aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --- NEW FILE testpost.9 --- file=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/.. From fedora-directory-commits at redhat.com Thu Feb 7 22:46:58 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 7 Feb 2008 17:46:58 -0500 Subject: [Fedora-directory-commits] dsgw/tests setup.sh,1.1,1.2 Message-ID: <200802072247.m17MlSXO015226@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15072 Modified Files: setup.sh Log Message: added a lot of tests Index: setup.sh =================================================================== RCS file: /cvs/dirsec/dsgw/tests/setup.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setup.sh 16 Jan 2008 22:56:03 -0000 1.1 +++ setup.sh 7 Feb 2008 22:46:56 -0000 1.2 @@ -9,7 +9,7 @@ adminpw=admin #needinstance=1 #needdata=1 -usessl=1 +#usessl=1 PATH=/usr/lib64/mozldap:/usr/lib/mozldap:$PATH export PATH suffix="dc=example,dc=com" @@ -97,15 +97,19 @@ SIEPWD: $adminpw EOF -VGPREFIX="valgrind --tool=memcheck --leak-check=yes --suppressions=$HOME/valgrind.supp --num-callers=40 " +#VGPREFIX="valgrind --tool=memcheck --leak-check=yes --suppressions=$HOME/valgrind.supp --num-callers=40 --suppressions=$testdir/valgrind.supp " +# These are CGI programs - they assume they will run for a very short period of time - they use exit() instead of free() :P +VGPREFIX="valgrind --tool=memcheck --leak-check=no --suppressions=$HOME/valgrind.supp --num-callers=40 --suppressions=$testdir/valgrind.supp " GDB="gdb -x .gdbinit " DEBUGCMD=VALGRIND #DEBUGCMD="$GDB" -PROGS="lang" +PROGS="edit" # use scripts for orgchart perl scripts SCRIPTS="" +#ClientLanguage=en_US ; export ClientLanguage +HTTP_ACCEPT_LANGUAGE=en_US ; export HTTP_ACCEPT_LANGUAGE runATest() { prog="$1" @@ -118,7 +122,6 @@ shift variant="$1" - set -x if [ ! -d results/$prog ] ; then mkdir -p results/$prog ; fi basetest=`basename $mytest`$varnum echo "Running test $mytest$varnum . . ." @@ -135,19 +138,30 @@ QUERY_STRING="`cat $mytest`" ; export QUERY_STRING else CONTENT_LENGTH=`wc -c $mytest | cut -f1 -d' '` ; export CONTENT_LENGTH + CONTENT_TYPE=application/x-www-form-urlencoded ; export CONTENT_TYPE fi SCRIPT_NAME=/clients/dsgw/bin/$prog ; export SCRIPT_NAME exec 4<$pwpfile PASSWORD_PIPE=4 ; export PASSWORD_PIPE if [ -n "$DEBUGCMD" -a "$DEBUGCMD" = "$GDB" ] ; then - echo "break main" > .gdbinit + if [ -f /tmp/$prog.debug.$basetest ] ; then + echo "break main" > .gdbinit + else + rm -f .gdbinit + fi if [ $type = "POST" ] ; then echo "run < $mytest > results/$prog/$basetest.html" >> .gdbinit else echo "run > results/$prog/$basetest.html" >> .gdbinit fi + if [ ! -f /tmp/$prog.debug.$basetest ] ; then + echo "quit" >> .gdbinit + fi ./libtool --mode execute $GDB ./$prog + if [ -f /tmp/$prog.debug.$basetest ] ; then + exit 1 + fi elif [ "$DEBUGCMD" = "VALGRIND" ] ; then VALGRIND="$VGPREFIX --log-file-exactly=results/$prog/$basetest.vg" if [ $type = "POST" ] ; then @@ -168,7 +182,6 @@ if [ -n "$testtmpfile" -a -f "$testtmpfile" ] ; then rm -f "$testtmpfile" fi - set +x } runGetTestsForProg() { From fedora-directory-commits at redhat.com Fri Feb 8 21:39:05 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:39:05 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/nspr - New directory Message-ID: <200802082139.m18Ld5O9008853@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/nspr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8792/nspr Log Message: Directory /cvs/dirsec/dsbuild/ds/nspr added to the repository From fedora-directory-commits at redhat.com Fri Feb 8 21:39:05 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:39:05 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/nss - New directory Message-ID: <200802082139.m18Ld5bB008858@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8792/nss Log Message: Directory /cvs/dirsec/dsbuild/ds/nss added to the repository From fedora-directory-commits at redhat.com Fri Feb 8 21:39:05 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:39:05 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/svrcore - New directory Message-ID: <200802082139.m18Ld52K008863@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/svrcore In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8792/svrcore Log Message: Directory /cvs/dirsec/dsbuild/ds/svrcore added to the repository From fedora-directory-commits at redhat.com Fri Feb 8 21:39:05 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:39:05 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozldap - New directory Message-ID: <200802082139.m18Ld5mW008868@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8792/mozldap Log Message: Directory /cvs/dirsec/dsbuild/ds/mozldap added to the repository From fedora-directory-commits at redhat.com Fri Feb 8 21:39:06 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:39:06 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/perldap - New directory Message-ID: <200802082139.m18Ld6XL008874@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/perldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8792/perldap Log Message: Directory /cvs/dirsec/dsbuild/ds/perldap added to the repository From fedora-directory-commits at redhat.com Fri Feb 8 21:51:54 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:54 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/admservconsole .cvsignore, NONE, 1.1 Message-ID: <200802082151.m18LpsNu010686@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/admservconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/admservconsole Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:54 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:54 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/crimson .cvsignore,NONE,1.1 Message-ID: <200802082151.m18LpsMJ010692@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/crimson In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/crimson Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:54 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:54 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/console .cvsignore,NONE,1.1 Message-ID: <200802082151.m18Lps1W010687@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/console Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:55 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:55 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/db/files 4.2.52.5.diff, NONE, 1.1 Message-ID: <200802082151.m18LptQY010745@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/db/files In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/db/files Added Files: 4.2.52.5.diff Log Message: updated for Fedora DS 1.1 4.2.52.5.diff: --- NEW FILE 4.2.52.5.diff --- *** work/db-4.2.52.NC/mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700 --- work/db-4.2.52.NC/mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700 *************** *** 553,560 **** */ if (state != SECOND_MISS && bhp->ref == 1) { bhp->priority = UINT32_T_MAX; ! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); ! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); hp->hash_priority = SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; } --- 553,563 ---- */ if (state != SECOND_MISS && bhp->ref == 1) { bhp->priority = UINT32_T_MAX; ! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) != ! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) { ! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh); ! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq); ! } hp->hash_priority = SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority; } From fedora-directory-commits at redhat.com Fri Feb 8 21:51:57 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:57 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/dsmlgwjars .cvsignore, NONE, 1.1 Message-ID: <200802082151.m18LpvYl010793@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/dsmlgwjars In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/dsmlgwjars Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:57 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:57 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/directoryconsole .cvsignore, NONE, 1.1 Message-ID: <200802082151.m18Lpv9H010774@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/directoryconsole Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:59 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapjdk .cvsignore,NONE,1.1 Message-ID: <200802082151.m18Lpxid010863@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapjdk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/ldapjdk Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:59 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_admserv .cvsignore, NONE, 1.1 Message-ID: <200802082151.m18LpxuQ010865@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/mod_admserv Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:52:01 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:01 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_restartd .cvsignore, NONE, 1.1 Message-ID: <200802082152.m18Lq12O010932@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/mod_restartd Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:52:02 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:02 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozilla .cvsignore,NONE,1.1 Message-ID: <200802082152.m18Lq250010976@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/mozilla Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:52:02 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:02 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozldap .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 checksums, NONE, 1.1 Message-ID: <200802082152.m18Lq2pq010977@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/mozldap Added Files: .cvsignore Makefile checksums Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies --- NEW FILE Makefile --- GARNAME = mozldap GARVERSION = 6.0.5 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DESCRIPTION = Mozilla LDAP C SDK CONFIGURE_SCRIPTS = $(WORKSRC)/mozilla/directory/c-sdk/configure BUILD_SCRIPTS = $(WORKSRC)/mozilla/directory/c-sdk/Makefile INSTALL_SCRIPTS = custom CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) --enable-clu --with-rpath=$(PREFIX)/lib install-custom: # copy files to $(DESTDIR)$(PREFIX) # Copy the binary libraries we want for file in libssldap60.so libprldap60.so libldap60.so libldif60.so ; \ do \ $(INSTALL) -m 755 $(WORKSRC)/mozilla/dist/lib/$$file $(DESTDIR)$(PREFIX)/lib ; \ done # Copy the binaries we want for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd ; \ do \ $(INSTALL) -m 755 $(WORKSRC)/mozilla/dist/bin/$$file $(DESTDIR)$(PREFIX)/bin ; \ done # Copy the include files for file in $(WORKSRC)/mozilla/dist/public/ldap/*.h ; \ do \ $(INSTALL) -p -m 644 $$file $(DESTDIR)$(PREFIX)/include ; \ done # Copy the developer files mkdir -p $(DESTDIR)$(PREFIX)/share/mozldap cp -r $(WORKSRC)/mozilla/directory/c-sdk/ldap/examples $(DESTDIR)$(PREFIX)/share/mozldap mkdir -p $(DESTDIR)$(PREFIX)/share/mozldap/etc $(INSTALL) -m 644 $(WORKSRC)/mozilla/directory/c-sdk/ldap/examples/xmplflt.conf $(DESTDIR)$(PREFIX)/share/mozldap/etc $(INSTALL) -m 644 $(WORKSRC)/mozilla/directory/c-sdk/ldap/libraries/libldap/ldaptemplates.conf $(DESTDIR)$(PREFIX)/share/mozldap/etc $(INSTALL) -m 644 $(WORKSRC)/mozilla/directory/c-sdk/ldap/libraries/libldap/ldapfilter.conf $(DESTDIR)$(PREFIX)/share/mozldap/etc $(INSTALL) -m 644 $(WORKSRC)/mozilla/directory/c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $(DESTDIR)$(PREFIX)/share/mozldap/etc $(MAKECOOKIE) include ../../gar.conf.mk include ../category.mk --- NEW FILE checksums --- 9719bd5b9efc13f810c85a47fb8c6412 download/mozldap-6.0.5.tar.gz From fedora-directory-commits at redhat.com Fri Feb 8 21:52:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:03 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/nspr .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 checksums, NONE, 1.1 Message-ID: <200802082152.m18Lq3PQ011002@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/nspr In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/nspr Added Files: .cvsignore Makefile checksums Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies --- NEW FILE Makefile --- GARNAME = nspr GARVERSION = 4.6.7 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule MYPATCH = PATCHFILES = LIBDEPS = DESCRIPTION = Mozilla NSPR CONFIGURE_SCRIPTS = $(WORKSRC)/mozilla/nsprpub/configure BUILD_SCRIPTS = $(WORKSRC)/mozilla/nsprpub/Makefile INSTALL_SCRIPTS = custom CONFIGURE_ARGS = --prefix=$(PREFIX) --libdir=$(PREFIX)/lib --includedir=$(PREFIX)/include/nspr4 ifeq ($(DEBUG), full) CONFIGURE_ARGS+=--disable-optimize OBJDIR=DBG.OBJ else OPTFLAG="BUILD_OPT=1" CONFIGURE_ARGS+=--disable-debug --enable-optimize OBJDIR=OPT.OBJ endif ifeq ($(USE_64), 1) CONFIGURE_ARGS += --enable-64bit endif # this is our "custom" patch target ifdef MYPATCH post-patch: cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 ) $(MAKECOOKIE) endif install-custom: # copy files to $(DESTDIR)$(PREFIX) make -C $(WORKSRC)/mozilla/nsprpub real_install $(MAKECOOKIE) include ../../gar.conf.mk include ../category.mk --- NEW FILE checksums --- 75d5de21ebc1a21886a25673920490ff download/nspr-4.6.7.tar.gz From fedora-directory-commits at redhat.com Fri Feb 8 21:52:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:03 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/nss .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 checksums, NONE, 1.1 Message-ID: <200802082152.m18Lq30h011020@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/nss Added Files: .cvsignore Makefile checksums Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies --- NEW FILE Makefile --- GARNAME = nss GARVERSION = 3.11.7 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule MYPATCH = PATCHFILES = LIBDEPS = DESCRIPTION = Mozilla NSS CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom ifeq ($(DEBUG), full) OBJDIR=DBG.OBJ else OPTFLAG="BUILD_OPT=1" OBJDIR=OPT.OBJ endif LIBS = libnss3.so libssl3.so libsmime3.so libnssckbi.so libsoftokn3.so libfreebl3.so libsoftokn3.chk libfreebl3.chk BINS = certutil cmsutil crlutil modutil pk12util signtool signver ssltap atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain OBJDEST=$(OBJDIR) # this is our "custom" patch target post-patch: ifdef MYPATCH cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 ) endif $(MAKECOOKIE) configure-custom: $(MAKECOOKIE) build-custom: mkdir -p $(WORKSRC)/mozilla/dist/$(OBJDEST) $(MAKE) -C $(WORKSRC)/mozilla/security/coreconf OBJDIR_NAME=$(OBJDEST) $(MAKE) -C $(WORKSRC)/mozilla/security/dbm OBJDIR_NAME=$(OBJDEST) export libs $(MAKE) -C $(WORKSRC)/mozilla/security/nss OBJDIR_NAME=$(OBJDEST) all $(MAKECOOKIE) install-custom: # copy files to $(DESTDIR)$(PREFIX) mkdir -p $(DESTDIR)$(PREFIX)/lib mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/include/nss3 for file in $(addprefix $(WORKSRC)/mozilla/dist/$(OBJDEST)/lib/,$(LIBS)) ; do \ $(INSTALL) -m 755 $$file $(NSS_LIB_DIR) ; \ done for file in $(addprefix $(WORKSRC)/mozilla/dist/$(OBJDEST)/bin/,$(BINS)) ; do \ $(INSTALL) -m 755 $$file $(DESTDIR)$(PREFIX)/bin ; \ done for file in $(WORKSRC)/mozilla/dist/public/nss/*.h ; do \ $(INSTALL) -m 644 $$file $(NSS_INCLUDE_DIR) ; \ done $(MAKECOOKIE) include ../../gar.conf.mk include ../category.mk --- NEW FILE checksums --- 82594a0773cedd7bb7aa25009a25f5a3 download/nss-3.11.7.tar.gz From fedora-directory-commits at redhat.com Fri Feb 8 21:52:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:03 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/onlinehelp .cvsignore, NONE, 1.1 Message-ID: <200802082152.m18Lq3b2011032@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/onlinehelp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/onlinehelp Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:51:57 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:57 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/dsonlinehelp .cvsignore, NONE, 1.1 Message-ID: <200802082151.m18LpwPK010815@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/dsonlinehelp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/dsonlinehelp Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:52:03 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:03 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/perldap .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 checksums, NONE, 1.1 Message-ID: <200802082152.m18Lq4Nr011039@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/perldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/perldap Added Files: .cvsignore Makefile checksums Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies --- NEW FILE Makefile --- GARNAME = perl-mozldap GARVERSION = 1.5.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DESCRIPTION = Mozilla LDAP Perl SDK CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom MY_CONFIGURE_ENV = NSPRINCDIR=$(NSPR_INCLUDE_DIR) NSPRLIBDIR=$(NSPR_LIB_DIR) \ NSSLIBDIR=$(NSS_LIB_DIR) LDAPSDKDIR=$(DESTDIR)$(PREFIX) LDAPSDKSSL=yes MY_CONFGURE_ENV += $(CONFIGURE_ENV) configure-custom: @echo ' $(call TMSG_LIB,Running configure in,$*)' cd $(WORKSRC) && $(MY_CONFIGURE_ENV) perl Makefile.PL $(MAKECOOKIE) build-custom: @echo ' $(call TMSG_LIB,Running make in,$*)' $(MAKE) -C $(WORKSRC) LD_RUN_PATH=$(PREFIX)/lib $(MAKECOOKIE) install-custom: @echo ' $(call TMSG_LIB,Running install in,$*)' # copy files to $(DESTDIR)$(PREFIX)/lib/perl mkdir -p $(DESTDIR)$(PREFIX)/lib/perl cp -r $(WORKSRC)/blib/lib/auto \ $(WORKSRC)/blib/lib/Mozilla \ $(WORKSRC)/blib/arch \ $(DESTDIR)$(PREFIX)/lib/perl $(MAKECOOKIE) include ../../gar.conf.mk include ../category.mk --- NEW FILE checksums --- 1f7af40a8ca42f4a8b805942129915e0 download/perl-mozldap-1.5.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 8 21:52:04 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:04 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/setuputil .cvsignore, NONE, 1.1 Message-ID: <200802082152.m18Lq42l011044@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/setuputil Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies From fedora-directory-commits at redhat.com Fri Feb 8 21:52:05 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:05 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/svrcore .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 checksums, NONE, 1.1 Message-ID: <200802082152.m18Lq52U011050@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/svrcore In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/svrcore Added Files: .cvsignore Makefile checksums Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies --- NEW FILE Makefile --- GARNAME = svrcore GARVERSION = 4.0.4 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DESCRIPTION = Mozilla svrcore CONFIGURE_SCRIPTS = $(WORKSRC)/configure BUILD_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = $(WORKSRC)/Makefile CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) include ../../gar.conf.mk include ../category.mk --- NEW FILE checksums --- 46bcdc82624d11c1bb168cf9f15e066c download/svrcore-4.0.4.tar.bz2 From fedora-directory-commits at redhat.com Fri Feb 8 21:52:05 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:05 -0500 Subject: [Fedora-directory-commits] dsbuild/meta/ds .cvsignore, NONE, 1.1 Makefile, 1.10, 1.11 Message-ID: <200802082152.m18Lq58W011057@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/meta/ds Modified Files: Makefile Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- work download cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 6 Nov 2006 22:43:22 -0000 1.10 +++ Makefile 8 Feb 2008 21:52:03 -0000 1.11 @@ -1,5 +1,5 @@ GARNAME = ds -GARVERSION = 1.0.4 +GARVERSION = 1.1.0 CATEGORIES = meta # assume that if someone defines DEBUG=1 they mean DEBUG=full @@ -12,33 +12,71 @@ export USE_64=1 endif -LIBDEPS = ds/mozilla ds/icu ds/adminutil ds/setuputil ds/mod_nss ds/mod_admserv ds/mod_restartd +ifndef PREFIX + export PREFIX=/opt/dirsrv +endif -ifndef NOJAVA -LIBDEPS += ds/console ds/admservconsole +# depending on the platform, a component may already be provided +# LIBDEPS controls which ones are built from source +LIBDEPS = + +ifdef NSPR_SOURCE +LIBDEPS += ds/nspr endif -LIBDEPS += ds/onlinehelp ds/adminserver +ifdef NSS_SOURCE +LIBDEPS += ds/nss +endif -ifndef NOJAVA -LIBDEPS += ds/directoryconsole +ifdef SVRCORE_SOURCE +LIBDEPS += ds/svrcore endif ifdef SASL_SOURCE LIBDEPS += ds/cyrus-sasl endif + +ifdef MOZLDAP_SOURCE +LIBDEPS += ds/mozldap +endif + +ifdef PERLDAP_SOURCE +LIBDEPS += ds/perldap +endif + +ifdef DB_SOURCE LIBDEPS += ds/db +endif + +ifdef ICU_SOURCE +LIBDEPS += ds/icu +endif + ifdef SNMP_SOURCE LIBDEPS += ds/net-snmp endif -ifndef NOJAVA -LIBDEPS += ds/ldapjdk ds/crimson ds/dsmlgwjars +LIBDEPS += ds/ldapserver + +ifdef BUILD_DS_ADMIN +ifdef ADMINUTIL_SOURCE +LIBDEPS += ds/adminutil +endif + +ifdef MOD_NSS_SOURCE +LIBDEPS += ds/mod_nss endif -LIBDEPS += ds/dsonlinehelp ds/ldapserver +ifdef ADMINSERVER_SOURCE +LIBDEPS += ds/adminserver +endif +endif + +ifndef NOJAVA +LIBDEPS += ds/ldapjdk ds/jss ds/console ds/fedora-idm-console ds/admservconsole ds/directoryconsole +endif -DESCRIPTION = ds +DESCRIPTION = Directory Server include ../../gar.mk @@ -53,6 +91,8 @@ help: @echo Usage: make [BUILD_RPM=1] [NOJAVA=1] [DEBUG=1] [USE_64=1] [SASL_SOURCE=1] + @echo " PREFIX=/path - install files to use this directory as the runtime prefix - default /opt/dirsrv" + @echo " DESTDIR=/path - build prefix - no default" @echo " BUILD_RPM=1 - create an installable RPM (tarball otherwise)" @echo " NOJAVA=1 - skip all Java related code (console, etc.)" @echo " DEBUG=1 - build debugable code (default is optimized)" From fedora-directory-commits at redhat.com Fri Feb 8 21:51:53 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:53 -0500 Subject: [Fedora-directory-commits] dsbuild ds.conf.mk,1.2,1.3 Message-ID: <200802082152.m18LqNim011084@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545 Modified Files: ds.conf.mk Log Message: updated for Fedora DS 1.1 Index: ds.conf.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/ds.conf.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ds.conf.mk 8 Apr 2006 19:26:49 -0000 1.2 +++ ds.conf.mk 8 Feb 2008 21:51:51 -0000 1.3 @@ -1,15 +1,15 @@ -MASTER_SITES += http://directory.fedora.redhat.com/sources/ -MASTER_SITES += http://directory.fedora.redhat.com/download/ +MASTER_SITES += http://directory.fedoraproject.org/sources/ +MASTER_SITES += http://directory.fedoraproject.org/download/ # DSMLGWJAR_VERSION is defined in ds/dsmlgwjars/Makefile ifdef DSMLGWJAR_VERSION -MASTER_SITES += http://directory.fedora.redhat.com/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/ +MASTER_SITES += http://directory.fedoraproject.org/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/ endif # cvs information # use USE_CVS=1 on the make command line to grab the sources from CVS # instead of from the checksummed source tarballs # fedora anon cvs -FEDCVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec +FEDCVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec # mozilla anon cvs MOZCVSROOT=:pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot # default to fedora for now since the mozilla sources are more static @@ -18,3 +18,71 @@ CVSTAG=HEAD # each ds/*/Makefile must define the CVS modules e.g. #CVSMODULES=ldapserver + +# override this if you do not have GNU install +INSTALL=install + +# common args to be passed to configure +DS_CONFIGURE_ARGS = + +ifdef PREFIX +CONFIGURE_ARGS += --prefix=$(PREFIX) +DS_CONFIGURE_ARGS += --prefix=$(PREFIX) +endif + +ifeq ($(USE_64), 1) +CONFIGURE_OPTS += --enable-64bit +endif + +ifndef CFLAGS +ifdef DEBUG +CFLAGS=-g +else +CFLAGS=-O2 +endif +endif + +CONFIGURE_ENV += CFLAGS=$(CFLAGS) + +# component information +ifdef NSPR_SOURCE +export NSPR_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/nspr4 +export NSPR_LIB_DIR=$(DESTDIR)$(PREFIX)/lib +DS_CONFIGURE_ARGS += --with-nspr-inc=$(NSPR_INCLUDE_DIR) --with-nspr-lib=$(NSPR_LIB_DIR) +endif + +ifdef NSS_SOURCE +export NSS_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/nss3 +export NSS_LIB_DIR=$(DESTDIR)$(PREFIX)/lib +DS_CONFIGURE_ARGS += --with-nss-inc=$(NSS_INCLUDE_DIR) --with-nss-lib=$(NSS_LIB_DIR) +endif + +ifdef SVRCORE_SOURCE +DS_CONFIGURE_ARGS += --with-svrcore-inc=$(DESTDIR)$(PREFIX)/include --with-svrcore-lib=$(DESTDIR)$(PREFIX)/lib +endif + +ifdef SASL_SOURCE +DS_CONFIGURE_ARGS += --with-sasl=$(DESTDIR)$(PREFIX) +else +DS_CONFIGURE_ARGS += --with-sasl +endif + +ifdef MOZLDAP_SOURCE +DS_CONFIGURE_ARGS += --with-ldapsdk=$(DESTDIR)$(PREFIX) +endif + +ifdef ICU_SOURCE +DS_CONFIGURE_ARGS += --with-icu=$(DESTDIR)$(PREFIX) +endif + +ifdef DB_SOURCE +DS_CONFIGURE_ARGS += --with-db=$(DESTDIR)$(PREFIX) +endif + +ifdef SNMP_SOURCE +DS_CONFIGURE_ARGS += --with-netsnmp=$(DESTDIR)$(PREFIX) +endif + +ifdef ADMINUTIL_SOURCE +DS_CONFIGURE_ARGS += --with-adminutil=$(DESTDIR)$(PREFIX) +endif From fedora-directory-commits at redhat.com Fri Feb 8 21:51:53 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:53 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver .cvsignore, NONE, 1.1 Makefile, 1.9, 1.10 checksums, 1.11, 1.12 Message-ID: <200802082152.m18LqNjA011090@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/adminserver Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 6 Nov 2006 21:51:27 -0000 1.9 +++ Makefile 8 Feb 2008 21:51:51 -0000 1.10 @@ -1,55 +1,44 @@ include ../../objdirname.mk -GARNAME = fedora-adminserver -GARVERSION = 1.0.3 +GARNAME = fedora-ds-admin +GARVERSION = 1.1.1 CATEGORIES = ds PATCHFILES = ifdef USE_CVS CVSMODULES=adminserver else -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 endif LIBDEPS = -DESCRIPTION = adminserver +DESCRIPTION = Fedora DS Admin Server -#CONFIGURE_SCRIPTS = $(WORKSRC)/configure -BUILD_SCRIPTS = $(WORKSRC)/Makefile -#INSTALL_SCRIPTS = $(WORKSRC)/Makefile -INSTALL_SCRIPTS = custom - -BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ - MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ - ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4 \ - SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \ - ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.3 \ - MOD_ADMSERV_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.3/.libs \ - MOD_RESTARTD_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.3/.libs \ - MOD_NSS_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.5/.libs \ - MOD_NSS_BINPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.5 - -ifndef NOJAVA -BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work \ - ADMSERVCONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/admservconsole/work -endif # NOJAVA +CONFIGURE_SCRIPTS = $(WORKSRC)/configure +CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) --enable-bundle +ifdef APR_CONFIG +CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG) +endif +ifdef APXS +CONFIGURE_ARGS += --with-apxs=$(APXS) +CONFIGURE_ENV += CPPFLAGS="$(shell $(APXS) -q CPPFLAGS)" +endif +ifdef HTTPD +CONFIGURE_ARGS += --with-httpd=$(HTTPD) +endif -ifneq ($(DEBUG), full) -BUILD_ARGS += BUILD_DEBUG=optimize +ifdef MOD_NSS_SOURCE +CONFIGURE_ARGS += --with-modnss-lib=$(DESTDIR)$(PREFIX)/lib/dirsrv/modules --with-modnss-bin=$(DESTDIR)$(PREFIX)/sbin endif +BUILD_SCRIPTS = $(WORKSRC)/Makefile +INSTALL_SCRIPTS = $(WORKSRC)/Makefile + ifdef USE_CVS post-extract: extract-cvs endif -configure-custom: - $(MAKECOOKIE) - -install-custom: - $(MAKECOOKIE) - include ../../gar.conf.mk include ../category.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- checksums 16 Oct 2006 15:59:14 -0000 1.11 +++ checksums 8 Feb 2008 21:51:51 -0000 1.12 @@ -1 +1 @@ -c4c209e2c387a41d8519a52cbe9323a6 download/fedora-adminserver-1.0.3.tar.gz +f50f2b6c983851c5e912047807bbcca6 download/fedora-ds-admin-1.1.1.tar.bz2 From fedora-directory-commits at redhat.com Fri Feb 8 21:51:54 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:54 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil .cvsignore, NONE, 1.1 Makefile, 1.6, 1.7 checksums, 1.10, 1.11 Message-ID: <200802082152.m18LqOFb011094@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/adminutil Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 6 Nov 2006 21:51:28 -0000 1.6 +++ Makefile 8 Feb 2008 21:51:51 -0000 1.7 @@ -1,42 +1,29 @@ include ../../objdirname.mk -GARNAME = fedora-adminutil -GARVERSION = 1.0.4 +GARNAME = adminutil +GARVERSION = 1.1.5 CATEGORIES = ds PATCHFILES = ifdef USE_CVS CVSMODULES=adminutil else -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 endif LIBDEPS = DESCRIPTION = adminutil -#CONFIGURE_SCRIPTS = $(WORKSRC)/configure +CONFIGURE_SCRIPTS = $(WORKSRC)/configure +CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) BUILD_SCRIPTS = $(WORKSRC)/Makefile -#INSTALL_SCRIPTS = $(WORKSRC)/Makefile -INSTALL_SCRIPTS = custom -BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) - -ifeq ($(DEBUG), full) -BUILD_ARGS += DEBUG=full -else -BUILD_ARGS += BUILD_DEBUG=optimize -endif +INSTALL_SCRIPTS = $(WORKSRC)/Makefile ifdef USE_CVS post-extract: extract-cvs endif -configure-custom: - $(MAKECOOKIE) - -install-custom: - $(MAKECOOKIE) - include ../../gar.conf.mk include ../category.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- checksums 8 Nov 2006 04:13:41 -0000 1.10 +++ checksums 8 Feb 2008 21:51:51 -0000 1.11 @@ -1 +1 @@ -8bafc54cdc08e3886b6a68d0ac9367a0 download/fedora-adminutil-1.0.4.tar.gz +1ce95159db07040d7095b805e9b3b533 download/adminutil-1.1.5.tar.bz2 From fedora-directory-commits at redhat.com Fri Feb 8 21:51:55 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:55 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/cyrus-sasl .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200802082152.m18LqP5A011128@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/cyrus-sasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/cyrus-sasl Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/cyrus-sasl/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 8 Feb 2008 21:51:52 -0000 1.2 @@ -1,9 +1,9 @@ GARNAME = cyrus-sasl -GARVERSION = 2.1.20 +GARVERSION = 2.1.22 CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule -MYPATCH = cyrus-sasl-2.1.20-gcc4.patch +MYPATCH = DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH) PATCHFILES = @@ -13,9 +13,11 @@ CONFIGURE_SCRIPTS = $(WORKSRC)/configure BUILD_SCRIPTS = $(WORKSRC)/Makefile -INSTALL_SCRIPTS = custom +INSTALL_SCRIPTS = $(WORKSRC)/Makefile -CONFIGURE_ARGS = --enable-static --enable-gssapi=/usr/kerberos/include --without-des --without-openssl +#CONFIGURE_ARGS = --enable-gssapi=/usr/kerberos/include --without-des --without-openssl +CONFIGURE_ARGS = --enable-gssapi --without-des --without-openssl \ + --with-dblib=none --with-plugindir=$(PREFIX)/lib/sasl2 ifdef DEBUG CONFIGURE_ENV = CFLAGS=-g @@ -24,12 +26,11 @@ endif # this is our "custom" patch target +ifdef MYPATCH post-patch: cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 ) $(MAKECOOKIE) - -install-custom: - $(MAKECOOKIE) +endif include ../../gar.conf.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/cyrus-sasl/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 8 Feb 2008 21:51:53 -0000 1.2 @@ -1,2 +1 @@ -268ead27f4ac39bcfe17d9e38e0f2977 download/cyrus-sasl-2.1.20.tar.gz -55e7a90561d9b02e0e7e0d598f5f6356 download/cyrus-sasl-2.1.20-gcc4.patch +45dde9d19193ae9dd388eb68b2027bc9 download/cyrus-sasl-2.1.22.tar.gz From fedora-directory-commits at redhat.com Fri Feb 8 21:51:55 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:55 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/db .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200802082152.m18LqPNK011132@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/db In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/db Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/db/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 8 Feb 2008 21:51:53 -0000 1.2 @@ -2,40 +2,37 @@ GARVERSION = 4.2.52.NC CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 4.2.52.1.diff 4.2.52.2.diff 4.2.52.3.diff 4.2.52.4.diff +PATCHFILES = 4.2.52.1.diff 4.2.52.2.diff 4.2.52.3.diff 4.2.52.4.diff 4.2.52.5.diff LIBDEPS = DESCRIPTION = db CONFIGURE_SCRIPTS = custom -BUILD_SCRIPTS = custom -INSTALL_SCRIPTS = custom +BUILD_SCRIPTS = $(WORKSRC)/built/Makefile +INSTALL_SCRIPTS = $(WORKSRC)/built/Makefile CONFIGURE_ARGS = --enable-dynamic +CONFIGURE_ENV += LIBSO_LIBS=-lpthread + ifdef DEBUG CONFIGURE_ARGS += --enable-debug --enable-umrw -CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ARGS += --disable-debug -CONFIGURE_ENV = CFLAGS=-O2 endif -BUILD_ARGS = LIBDB_ARGS="libdb.a" +BUILD_ARGS = LIBDB_ARGS="libdb-4.2.a" -configure-custom: +# db does not allow you to run configure directly from the source "dist" +# directory, so you have to create a "built" directory and copy +# configure into there +pre-configure: mkdir -p $(WORKSRC)/built - cd $(WORKSRC)/built && $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) - $(MAKECOOKIE) -build-custom: - cd $(WORKSRC)/built && $(MAKE) $(BUILD_ARGS) - cd $(WORKSRC)/built && rm -f db_archive db_checkpoint db_deadlock \ - db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify - cd $(WORKSRC)/built && $(MAKE) LDFLAGS="-static " libdb.a all - -install-custom: +configure-custom: + @echo ' $(call TMSG_LIB,Running configure in,$(WORKSRC)/built)' + cd $(WORKSRC)/built && $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) $(MAKECOOKIE) include ../../gar.conf.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/db/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 8 Feb 2008 21:51:53 -0000 1.2 @@ -3,3 +3,4 @@ 1ca0c3556ccfd3af178da2ccc8724ba2 download/4.2.52.2.diff f904e0eac44c6cac865de9c33cd4965e download/4.2.52.3.diff 9e1bcadecd6a137245ad831bc9021e38 download/4.2.52.4.diff +de8f8dc57b7d878905910a94330eece5 download/4.2.52.5.diff From fedora-directory-commits at redhat.com Fri Feb 8 21:51:57 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:57 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/icu .cvsignore, NONE, 1.1 Makefile, 1.2, 1.3 checksums, 1.3, 1.4 Message-ID: <200802082152.m18LqS8O011145@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/icu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/icu Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:28:51 -0000 1.2 +++ Makefile 8 Feb 2008 21:51:55 -0000 1.3 @@ -1,33 +1,27 @@ -GARNAME = icu -GARVERSION = 3.4 +GARNAME = icu4c +GARVERSION = 3_8_1 CATEGORIES = ds -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tgz PATCHFILES = - LIBDEPS = -DESCRIPTION = icu +DESCRIPTION = ICU + +WORKSRC = work/icu CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = $(WORKSRC)/source/Makefile -INSTALL_SCRIPTS = custom +INSTALL_SCRIPTS = $(WORKSRC)/source/Makefile ifdef DEBUG DEBUGFLAG = --enable-debug endif -CONFIGURE_ARGS = LinuxRedHat --prefix=`pwd`/../built --enable-rpath --disable-ustdio $(DEBUGFLAG) +CONFIGURE_ARGS = LinuxRedHat --enable-rpath --disable-ustdio $(DEBUGFLAG) configure-custom: - if test -d $(WORKSRC); then \ - rmdir $(WORKSRC) ;\ - mv work/icu $(WORKSRC) ;\ - fi - cd $(WORKSRC)/source && ./runConfigureICU $(CONFIGURE_ARGS) - $(MAKECOOKIE) - -install-custom: - cd $(WORKSRC)/source && $(MAKE) install + @echo ' $(call TMSG_LIB,Running runConfigureICU in,$(WORKSRC)/source)' + cd $(WORKSRC)/source && $(CONFIGURE_ENV) ./runConfigureICU $(CONFIGURE_ARGS) $(MAKECOOKIE) include ../../gar.conf.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/checksums,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checksums 24 Feb 2006 17:23:38 -0000 1.3 +++ checksums 8 Feb 2008 21:51:55 -0000 1.4 @@ -1 +1 @@ -b19f3b9eec1c44fba86b07f287801084 download/icu-3.4.tgz +a827dbc9d909febd4ec39b90386868ba download/icu4c-3_8_1-src.tgz From fedora-directory-commits at redhat.com Fri Feb 8 21:51:59 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:51:59 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver .cvsignore, NONE, 1.1 Makefile, 1.8, 1.9 checksums, 1.14, 1.15 Message-ID: <200802082152.m18LqTt4011152@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/ldapserver Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 6 Nov 2006 21:51:28 -0000 1.8 +++ Makefile 8 Feb 2008 21:51:57 -0000 1.9 @@ -1,103 +1,39 @@ include ../../objdirname.mk -GARNAME = fedora-ds -GARVERSION = 1.0.4 +GARNAME = fedora-ds-base +GARVERSION = 1.1.0 CATEGORIES = ds -# have the regular download rule download the patch rather than listing it in PATCHFILES -# this is so we can override the default patch rule -#MYPATCH = ldapserver-gcc4.patch -PATCHFILES = ldap_cm_Makefile_104.patch +PATCHFILES = PKGDIR = $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work/pkg ifdef USE_CVS CVSMODULES = ldapserver else -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 endif LIBDEPS = -DESCRIPTION = ldapserver +DESCRIPTION = Fedora Directory Server (base) -#CONFIGURE_SCRIPTS = $(WORKSRC)/configure -BUILD_SCRIPTS = $(WORKSRC)/Makefile -#INSTALL_SCRIPTS = $(WORKSRC)/Makefile -INSTALL_SCRIPTS = custom -BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \ - USE_SETUPUTIL=1 USE_DSGW=1 USE_ORGCHART=1 USE_ADMINSERVER=1 \ - USE_PERLDAP=1 \ - MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ - MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ - ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4 \ - SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \ - DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \ - ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.3 \ - ONLINEHELP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/dsonlinehelp/work/fedora-dsonlinehelp-1.0 - -ifdef SASL_SOURCE -BUILD_ARGS += SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20 -else -BUILD_ARGS += SASL_SOURCE_ROOT= -endif - -ifdef SNMP_SOURCE -BUILD_ARGS += NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1 -else -BUILD_ARGS += NETSNMP_SOURCE_ROOT= -endif +CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) --enable-bundle -ifndef NOJAVA -BUILD_ARGS += BUILD_JAVA_CODE=1 GET_JAVA_FROM_PATH=1 GET_ANT_FROM_PATH=1 \ - USE_DSMLGW=1 USE_CONSOLE=1 USE_JAVATOOLS=1 \ - LDAPCONSOLE_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/directoryconsole/work \ - DSMLGWJARS_BUILD_DIR=$(ABS_GARDIR)/$(CATEGORIES)/dsmlgwjars/download \ - LDAPJDK_DIR=$(ABS_GARDIR)/$(CATEGORIES)/ldapjdk/download \ - CRIMSONJAR_BUILD_DIR=$(ABS_GARDIR)/$(CATEGORIES)/crimson/download -else -BUILD_ARGS += BUILD_JAVA_CODE=0 -endif # NOJAVA - -ifeq ($(DEBUG), optimize) -BUILD_ARGS += BUILD_DEBUG=optimize -endif -ifndef DEBUG -BUILD_ARGS += BUILD_DEBUG=optimize -endif +CONFIGURE_SCRIPTS = $(WORKSRC)/configure +BUILD_SCRIPTS = $(WORKSRC)/Makefile +INSTALL_SCRIPTS = $(WORKSRC)/Makefile ifdef USE_CVS post-extract: extract-cvs endif # this is our "custom" patch target -post-patch: ifdef MYPATCH +post-patch: cat $(addprefix download/,$(MYPATCH)) | ( cd work/$(GARNAME)-$(GARVERSION) ; patch -p1 ) -endif $(MAKECOOKIE) - -configure-custom: - $(MAKECOOKIE) - -install-custom: -ifdef BUILD_RPM - @echo The Fedora DS RPM should be in $(ABS_GARDIR)/$(CATEGORIES)/ldapserver/work - @echo After installing the RPM, - @echo cd /opt/fedora-ds \; ./setup/setup -else - @echo "" - @echo Directory Server installation is a manual process during which you must provide - @echo information about your host, port, directory manager password, and more. A setup - @echo program is provided. - @echo cd $(PKGDIR) \; ./setup endif - @echo You can find more information in the installation guide at: - @echo "http://directory.fedora.redhat.com/wiki/Setup" - @echo "AND" - @echo "http://directory.fedora.redhat.com/wiki/Install_Guide" - $(MAKECOOKIE) -#include ../../gar.conf.mk +include ../../gar.conf.mk include ../category.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- checksums 7 Nov 2006 04:28:24 -0000 1.14 +++ checksums 8 Feb 2008 21:51:57 -0000 1.15 @@ -1,2 +1 @@ -fca8c94d2bfdc3a762c0e8b09ab04b09 download/fedora-ds-1.0.4.tar.gz -657d4f7cca9c3a4ea65012ae8203d395 download/ldap_cm_Makefile_104.patch +a60d1ce51207e61c48b70aa85ae5e5a5 download/fedora-ds-base-1.1.0.tar.bz2 From fedora-directory-commits at redhat.com Fri Feb 8 21:52:00 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:00 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_nss .cvsignore, NONE, 1.1 Makefile, 1.6, 1.7 checksums, 1.6, 1.7 Message-ID: <200802082152.m18LqUgb011156@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/mod_nss Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 17 Oct 2006 17:31:11 -0000 1.6 +++ Makefile 8 Feb 2008 21:51:57 -0000 1.7 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_nss -GARVERSION = 1.0.5 +GARVERSION = 1.0.7 CATEGORIES = ds PATCHFILES = @@ -15,15 +15,8 @@ DESCRIPTION = mod_nss -MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist - -ifdef BUILD_MODULE_RPM - CONFIGURE_SCRIPTS = custom - BUILD_SCRIPTS = custom -else - CONFIGURE_SCRIPTS = $(WORKSRC)/configure - BUILD_SCRIPTS = $(WORKSRC)/Makefile -endif +CONFIGURE_SCRIPTS = $(WORKSRC)/configure +BUILD_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom BUILD_ARGS = @@ -32,41 +25,23 @@ post-extract: extract-cvs endif -ifdef BUILD_MODULE_RPM - ifeq ($(DEBUG),full) - FLAVOR=dbg - else - FLAVOR=opt - endif - - RPM_ARCH := $(shell uname -i) - RPM_TOP = $(ABS_GARDIR)/$(CATEGORIES)/mod_nss - -configure-custom: - $(MAKECOOKIE) - -build-custom: - $(MAKECOOKIE) - -else # BUILD_MODULE_RPM - -CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib - -ifeq ($(DEBUG),full) -CONFIGURE_ENV = CFLAGS=-g -else -CONFIGURE_ENV = CFLAGS=-O2 +CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) +ifdef APR_CONFIG +CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG) +endif +ifdef APXS +CONFIGURE_ARGS += --with-apxs=$(APXS) +CONFIGURE_ENV += CPPFLAGS="$(shell $(APXS) -q CPPFLAGS)" +endif +ifdef HTTPD +CONFIGURE_ARGS += --with-httpd=$(HTTPD) endif - -endif # BUILD_MODULE_RPM install-custom: -ifdef BUILD_MODULE_RPM - rm -rf BUILD SPECS - mkdir BUILD SPECS - rpmbuild --define "_topdir $(RPM_TOP)" --define "_sourcedir $(RPM_TOP)/download" --define "_rpmdir work" --define "_srcrpmdir work" --define "ARCH $(RPM_ARCH)" --define "flavor $(FLAVOR)" --define "platform $(NSOS_ARCH)" --define "nsprincdir $(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/include" --define "nsprlibdir $(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib" --define "nssincdir $(MOZILLA_DIST)/public/nss" --define "nsslibdir $(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib" --nodeps --clean -ta $(RPM_TOP)/download/$(DISTFILES) - rm -rf BUILD SPECS -endif + mkdir -p $(DESTDIR)$(PREFIX)/lib/dirsrv/modules + $(INSTALL) -m 755 $(WORKSRC)/.libs/libmodnss.so $(DESTDIR)$(PREFIX)/lib/dirsrv/modules + mkdir -p $(DESTDIR)$(PREFIX)/sbin + $(INSTALL) -m 755 $(WORKSRC)/nss_pcache $(DESTDIR)$(PREFIX)/sbin $(MAKECOOKIE) include ../../gar.conf.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/checksums,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- checksums 17 Oct 2006 17:31:11 -0000 1.6 +++ checksums 8 Feb 2008 21:51:57 -0000 1.7 @@ -1 +1 @@ -cf14258f47075c937c5a1ac93a96c521 download/mod_nss-1.0.5.tar.gz +71107cbc702bf07c6c79843aa92a0e09 download/mod_nss-1.0.7.tar.gz From fedora-directory-commits at redhat.com Fri Feb 8 21:52:02 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 8 Feb 2008 16:52:02 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/net-snmp .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200802082152.m18LqW3I011160@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/net-snmp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/net-snmp Modified Files: Makefile checksums Added Files: .cvsignore Log Message: updated for Fedora DS 1.1 --- NEW FILE .cvsignore --- download work cookies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/net-snmp/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 8 Feb 2008 21:52:00 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = net-snmp -GARVERSION = 5.2.1 +GARVERSION = 5.4.1 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -8,25 +8,11 @@ DESCRIPTION = net-snmp -CONFIGURE_SCRIPTS = custom +CONFIGURE_SCRIPTS = $(WORKSRC)/configure BUILD_SCRIPTS = $(WORKSRC)/Makefile -INSTALL_SCRIPTS = custom +INSTALL_SCRIPTS = $(WORKSRC)/Makefile -CONFIGURE_ARGS = --prefix=`pwd`/built --with-default-snmp-version=3 --with-sys-contact="" --with-sys-location="" --with-logfile="" --with-persistent-directory="/var/net-snmp" --disable-applications --disable-manuals --disable-scripts --disable-mibs --with-copy-persistent-files="no" - -ifdef DEBUG -CONFIGURE_ENV = CFLAGS=-g -else -CONFIGURE_ENV = CFLAGS=-O2 -endif - -configure-custom: - cd $(WORKSRC) && echo "" | $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) - $(MAKECOOKIE) - -install-custom: - cd $(WORKSRC) && $(MAKE) install - $(MAKECOOKIE) +CONFIGURE_ARGS = --with-defaults --with-default-snmp-version=3 --with-sys-contact="" --with-sys-location="" --with-logfile="" --with-persistent-directory="/var/net-snmp" --disable-applications --disable-manuals --disable-scripts --disable-mibs --with-copy-persistent-files="no" --with-perl-modules=no --disable-embedded-perl include ../../gar.conf.mk Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/net-snmp/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 8 Feb 2008 21:52:00 -0000 1.2 @@ -1 +1 @@ -4c38451b1f5914789da370b79dc06124 download/net-snmp-5.2.1.tar.gz +6c974df7a5a5b1579f72115e6b045bda download/net-snmp-5.4.1.tar.gz From fedora-directory-commits at redhat.com Sat Feb 9 18:23:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Sat, 9 Feb 2008 13:23:40 -0500 Subject: [Fedora-directory-commits] dsgw error.c,1.2,1.3 Message-ID: <200802091823.m19INecB018838@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819 Modified Files: error.c Log Message: do not print empty message Index: error.c =================================================================== RCS file: /cvs/dirsec/dsgw/error.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- error.c 14 Jan 2008 22:58:30 -0000 1.2 +++ error.c 9 Feb 2008 18:23:38 -0000 1.3 @@ -191,12 +191,12 @@ dsgw_emitf( "\n%s\n\n", msg ); if ( extra != NULL ) { - if ( lderrtxt == NULL ) { + if ( lderrtxt == NULL || !*lderrtxt ) { dsgw_emitf( "
(%s)", extra ); } else { dsgw_emitf( "
(%s - %s)", extra, lderrtxt ); } - } else if ( lderrtxt != NULL ) { + } else if ( lderrtxt != NULL && *lderrtxt ) { dsgw_emitf( "
(%s)", lderrtxt ); } From fedora-directory-commits at redhat.com Sat Feb 9 18:24:25 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Sat, 9 Feb 2008 13:24:25 -0500 Subject: [Fedora-directory-commits] dsgw/tests valgrind.supp, NONE, 1.1 setup.sh, 1.2, 1.3 Message-ID: <200802091824.m19IOPi2018960@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18919 Modified Files: setup.sh Added Files: valgrind.supp Log Message: add domodify tests --- NEW FILE valgrind.supp --- { Problem with ICU Memcheck:Cond fun:__strcpy_chk fun:entryOpen fun:ures_open_3_6 fun:res_getstring } { Problem with ICU Memcheck:Cond fun:__strcpy_chk fun:init_entry fun:findFirstExisting fun:entryOpen fun:ures_open_3_6 fun:res_getstring } { Problem with ICU Memcheck:Cond fun:__strcpy_chk fun:init_entry fun:entryOpen fun:ures_open_3_6 fun:res_getstring } { Problem with ICU Memcheck:Cond fun:dsgw_vxprintf fun:dsgw_emitfv fun:dsgw_emitf fun:dsgw_html_begin } { Problem with sasl Memcheck:Cond fun:__strcpy_chk fun:_sasl_load_plugins fun:sasl_client_init } Index: setup.sh =================================================================== RCS file: /cvs/dirsec/dsgw/tests/setup.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- setup.sh 7 Feb 2008 22:46:56 -0000 1.2 +++ setup.sh 9 Feb 2008 18:24:23 -0000 1.3 @@ -57,8 +57,7 @@ DSGW_CONTEXT_DIR=`pwd`/testtmp ; export DSGW_CONTEXT_DIR -sed -e "s#@host@#$hostname#g" \ - -e "s#@port@#$port#g" \ +sed -e "s#@ldapurl@#$ldapurl#g" \ -e "s#@suffix@#$suffix#g" \ -e "s#@dirmgr@#cn=directory manager#g" \ -e "s#@contextdir@#$DSGW_CONTEXT_DIR#g" \ @@ -66,8 +65,7 @@ -e "s#@configdir@#$sroot/share/dirsrv/dsgw/config#g" \ config/dsgw.tmpl > testtmp/dsgw.conf -sed -e "s#@host@#$hostname#g" \ - -e "s#@port@#$port#g" \ +sed -e "s#@ldapurl@#$ldapurl#g" \ -e "s#@suffix@#$suffix#g" \ -e "s#@dirmgr@#cn=directory manager#g" \ -e "s#@contextdir@#$DSGW_CONTEXT_DIR#g" \ @@ -104,7 +102,7 @@ DEBUGCMD=VALGRIND #DEBUGCMD="$GDB" -PROGS="edit" +PROGS="domodify" # use scripts for orgchart perl scripts SCRIPTS="" From fedora-directory-commits at redhat.com Sat Feb 9 18:24:25 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Sat, 9 Feb 2008 13:24:25 -0500 Subject: [Fedora-directory-commits] dsgw/tests/domodify testpost.3, NONE, 1.1 testpost.4, NONE, 1.1 testpost.5, NONE, 1.1 testpost.6, NONE, 1.1 testpost.7, NONE, 1.1 testpost.8, NONE, 1.1 testpost.9, NONE, 1.1 testpost.2, 1.1, 1.2 Message-ID: <200802091824.m19IOPtD018966@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/domodify In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18919/domodify Modified Files: testpost.2 Added Files: testpost.3 testpost.4 testpost.5 testpost.6 testpost.7 testpost.8 testpost.9 Log Message: add domodify tests --- NEW FILE testpost.3 --- changetype=unknown&dn=bogus&quiet=&verbose=true& --- NEW FILE testpost.4 --- changetype=modify&dn=bogus&quiet=&verbose=true& --- NEW FILE testpost.5 --- changetype=modify&dn=bogus&quiet=&verbose=true&changed_DN=true --- NEW FILE testpost.6 --- changetype=modify&dn=bogus&quiet=&verbose=true&changed_DN=true&replace_=1 --- NEW FILE testpost.7 --- changetype=modify&dn=bogus&quiet=&verbose=true&changed_DN=true&replace_DN_=1 --- NEW FILE testpost.8 --- changetype=modify&dn=bogus&quiet=&verbose=true&changed_DN=true&replace_DN_foo=1 --- NEW FILE testpost.9 --- changetype=modify&dn=bogus&quiet=&verbose=true&changed_DN=true&replace_DN_foo=1&replace_DN_bar=2 Index: testpost.2 =================================================================== RCS file: /cvs/dirsec/dsgw/tests/domodify/testpost.2,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testpost.2 7 Feb 2008 22:46:57 -0000 1.1 +++ testpost.2 9 Feb 2008 18:24:23 -0000 1.2 @@ -1 +1 @@ -changetype=&dn=&quiet=&verbose=& \ No newline at end of file +changetype=&dn=&quiet=&verbose=true& \ No newline at end of file From fedora-directory-commits at redhat.com Thu Feb 14 23:48:22 2008 From: fedora-directory-commits at redhat.com (Jack Magne (jmagne)) Date: Thu, 14 Feb 2008 18:48:22 -0500 Subject: [Fedora-directory-commits] coolkey/src/coolkey log.cpp, 1.2, 1.3 machdep.cpp, 1.6, 1.7 object.cpp, 1.2, 1.3 slot.cpp, 1.9, 1.10 Message-ID: <200802142348.m1ENmMru004605@cvs-int.fedora.redhat.com> Author: jmagne Update of /cvs/dirsec/coolkey/src/coolkey In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4582 Modified Files: log.cpp machdep.cpp object.cpp slot.cpp Log Message: Fix for gcc 4.3, bug#427666, rev. rrelyea. Index: log.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/log.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- log.cpp 14 Feb 2007 19:54:01 -0000 1.2 +++ log.cpp 14 Feb 2008 23:48:19 -0000 1.3 @@ -18,6 +18,8 @@ * ***** END COPYRIGHT BLOCK *****/ #include +#include +#include #include "mypkcs11.h" #include #include Index: machdep.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- machdep.cpp 15 Aug 2007 00:34:17 -0000 1.6 +++ machdep.cpp 14 Feb 2008 23:48:19 -0000 1.7 @@ -33,6 +33,8 @@ #include #include #include +#include +#include #endif #ifdef _WIN32 Index: object.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/object.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- object.cpp 9 Feb 2007 18:53:21 -0000 1.2 +++ object.cpp 14 Feb 2008 23:48:19 -0000 1.3 @@ -21,6 +21,7 @@ #include "PKCS11Exception.h" #include "object.h" #include +#include using std::find_if; Index: slot.cpp =================================================================== RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- slot.cpp 16 Oct 2007 00:05:31 -0000 1.9 +++ slot.cpp 14 Feb 2008 23:48:19 -0000 1.10 @@ -25,7 +25,6 @@ #include "PKCS11Exception.h" #include #include "slot.h" -#include #include "zlib.h" #include "params.h" @@ -33,7 +32,6 @@ #define MIN(x, y) ((x) < (y) ? (x) : (y)) -using std::auto_ptr; #ifdef DEBUG From fedora-directory-commits at redhat.com Tue Feb 19 05:58:25 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 19 Feb 2008 00:58:25 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof - New directory Message-ID: <200802190558.m1J5wPYB006597@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6582/memberof Log Message: Directory /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof added to the repository From fedora-directory-commits at redhat.com Tue Feb 19 06:04:58 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 19 Feb 2008 01:04:58 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, NONE, 1.1 Message-ID: <200802190604.m1J64wJC014229@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13952/ldap/servers/plugins/memberof Added Files: memberof.c Log Message: Initial import of memberof plugin from FreeIPA (refactored from changeset 640:9c57bd91b32f if ipa-memberof.c). --- NEW FILE memberof.c --- /** 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. * * Authors: * Pete Rowley * * Copyright (C) 2007 Red Hat, Inc. * All rights reserved. * END COPYRIGHT BLOCK **/ /* The memberof plugin updates the memberof attribute of entries * based on modifications performed on groupofuniquenames entries * * In addition the plugin provides a DS task that may be started * administrative clients and that creates the initial memberof * list for imported entries and/or fixes the memberof list of * existing entries that have inconsistent state (for example, * if the memberof attribute was incorrectly edited directly) * * To start the memberof task add an entry like: * * dn: cn=memberof task 2, cn=memberof task, cn=tasks, cn=config * objectClass: top * objectClass: extensibleObject * cn: sample task * basedn: dc=example, dc=com * filter: (uid=test4) * * where "basedn" is required and refers to the top most node to perform the * task on, and where "filter" is an optional attribute that provides a filter * describing the entries to be worked on */ #ifdef HAVE_CONFIG_H # include #endif #include "slapi-plugin.h" #include "dirver.h" #include /* PLUGIN_MAGIC_VENDOR_STR */ #include "string.h" #include "nspr.h" #define MEMBEROF_GROUP_ATTR "member" #define MEMBEROF_ATTR "memberof" #define MEMBEROF_GROUP_ATTR_IS_DN 1 #define MEMBEROF_GROUP_ATTR_TYPE "uid" #define MEMBEROF_GROUP_FILTER "(" MEMBEROF_GROUP_ATTR "=*)" #define MEMBEROF_PLUGIN_SUBSYSTEM "memberof-plugin" /* used for logging */ static Slapi_PluginDesc pdesc = { "memberof", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "memberof plugin" }; static void* _PluginID = NULL; static Slapi_Filter *memberof_group_filter = NULL; static Slapi_Mutex *memberof_operation_lock = 0; typedef struct _memberofstringll { char *dn; void *next; } memberofstringll; /****** secrets *********/ /*from FDS slap.h * until we get a proper api for access */ #define TASK_RUNNING_AS_TASK 0x0 /*from FDS slapi-private.h * until we get a proper api for access */ #define SLAPI_DSE_CALLBACK_OK (1) #define SLAPI_DSE_CALLBACK_ERROR (-1) #define SLAPI_DSE_CALLBACK_DO_NOT_APPLY (0) /****************************************************************************** * Online tasks interface (to support import, export, etc) * After some cleanup, we could consider making these public. */ struct _slapi_task { struct _slapi_task *next; char *task_dn; int task_exitcode; /* for the end user */ int task_state; /* (see above) */ int task_progress; /* number between 0 and task_work */ int task_work; /* "units" of work to be done */ int task_flags; /* (see above) */ /* it is the task's responsibility to allocate this memory & free it: */ char *task_status; /* transient status info */ char *task_log; /* appended warnings, etc */ void *task_private; /* for use by backends */ TaskCallbackFn cancel; /* task has been cancelled by user */ TaskCallbackFn destructor; /* task entry is being destroyed */ int task_refcount; }; /****** secrets ********/ /*** function prototypes ***/ /* exported functions */ int memberof_postop_init(Slapi_PBlock *pb ); /* plugin callbacks */ static int memberof_postop_del(Slapi_PBlock *pb ); static int memberof_postop_modrdn(Slapi_PBlock *pb ); static int memberof_postop_modify(Slapi_PBlock *pb ); static int memberof_postop_add(Slapi_PBlock *pb ); static int memberof_postop_start(Slapi_PBlock *pb); static int memberof_postop_close(Slapi_PBlock *pb); /* supporting cast */ static int memberof_oktodo(Slapi_PBlock *pb); static char *memberof_getdn(Slapi_PBlock *pb); static int memberof_modop_one(Slapi_PBlock *pb, int mod_op, char *op_this, char *op_to); static int memberof_modop_one_r(Slapi_PBlock *pb, int mod_op, char *group_dn, char *op_this, char *op_to, memberofstringll *stack); static int memberof_add_one(Slapi_PBlock *pb, char *addthis, char *addto); static int memberof_del_one(Slapi_PBlock *pb, char *delthis, char *delfrom); static int memberof_mod_smod_list(Slapi_PBlock *pb, int mod, char *groupdn, Slapi_Mod *smod); static int memberof_add_smod_list(Slapi_PBlock *pb, char *groupdn, Slapi_Mod *smod); static int memberof_del_smod_list(Slapi_PBlock *pb, char *groupdn, Slapi_Mod *smod); static int memberof_mod_attr_list(Slapi_PBlock *pb, int mod, char *groupdn, Slapi_Attr *attr); static int memberof_mod_attr_list_r(Slapi_PBlock *pb, int mod, char *group_dn, char *op_this, Slapi_Attr *attr, memberofstringll *stack); static int memberof_add_attr_list(Slapi_PBlock *pb, char *groupdn, Slapi_Attr *attr); static int memberof_del_attr_list(Slapi_PBlock *pb, char *groupdn, Slapi_Attr *attr); static int memberof_moddn_attr_list(Slapi_PBlock *pb, char *pre_dn, char *post_dn, Slapi_Attr *attr); static int memberofd_replace_list(Slapi_PBlock *pb, char *group_dn); static void memberof_set_plugin_id(void * plugin_id); static void *memberof_get_plugin_id(); static int memberof_compare(const void *a, const void *b); static void memberof_load_array(Slapi_Value **array, Slapi_Attr *attr); static Slapi_Filter *memberof_string2filter(char *strfilter); static int memberof_is_legit_member(Slapi_PBlock *pb, char *group_dn, char *op_this, char *op_to, memberofstringll *stack); static int memberof_del_dn_from_groups(Slapi_PBlock *pb, char *dn); static int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, char *type, plugin_search_entry_callback callback, void *callback_data); static int memberof_is_group_member(Slapi_Value *groupdn, Slapi_Value *memberdn); static int memberof_test_membership(Slapi_PBlock *pb, char *dn); static int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data); static int memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data); static int memberof_replace_dn_type_callback(Slapi_Entry *e, void *callback_data); static int memberof_replace_dn_from_groups(Slapi_PBlock *pb, char *pre_dn, char *post_dn); static int memberof_modop_one_replace_r(Slapi_PBlock *pb, int mod_op, char *group_dn, char *op_this, char *replace_with, char *op_to, memberofstringll *stack); static void memberof_lock(); static void memberof_unlock(); static int memberof_add_groups_search_callback(Slapi_Entry *e, void *callback_data); static int memberof_add_membership(Slapi_PBlock *pb, char *op_this, char *op_to); static int memberof_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg); static const char *fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val); [...1631 lines suppressed...] "<-- memberof_is_legit_member\n" ); return rc; } void memberof_lock() { slapi_lock_mutex(memberof_operation_lock); } void memberof_unlock() { slapi_unlock_mutex(memberof_operation_lock); } /* * */ typedef struct _task_data { char *dn; char *filter_str; Slapi_Task *task; } task_data; void memberof_memberof_fixup_task_thread(void *arg) { task_data *td = (task_data *)arg; Slapi_Task *task = td->task; int rc = 0; task->task_work = 1; task->task_progress = 0; task->task_state = SLAPI_TASK_RUNNING; slapi_task_status_changed(task); slapi_task_log_notice(task, "Memberof task starts (arg: %s) ...\n", td->filter_str); /* do real work */ rc = memberof_fix_memberof(td->dn, td->filter_str); slapi_task_log_notice(task, "Memberof task finished."); slapi_task_log_status(task, "Memberof task finished."); task->task_progress = 1; task->task_exitcode = rc; task->task_state = SLAPI_TASK_FINISHED; slapi_task_status_changed(task); slapi_ch_free_string(&td->dn); slapi_ch_free_string(&td->filter_str); { /* make the compiler happy */ void *ptd = td; slapi_ch_free(&ptd); } } /* extract a single value from the entry (as a string) -- if it's not in the * entry, the default will be returned (which can be NULL). * you do not need to free anything returned by this. */ const char *fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val) { Slapi_Attr *attr; Slapi_Value *val = NULL; if (slapi_entry_attr_find(e, attrname, &attr) != 0) return default_val; slapi_attr_first_value(attr, &val); return slapi_value_get_string(val); } int memberof_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg) { PRThread *thread = NULL; int rv = SLAPI_DSE_CALLBACK_OK; task_data *mytaskdata = NULL; Slapi_Task *task = NULL; const char *filter; const char *dn = 0; *returncode = LDAP_SUCCESS; /* get arg(s) */ if ((dn = fetch_attr(e, "basedn", 0)) == NULL) { *returncode = LDAP_OBJECT_CLASS_VIOLATION; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } if ((filter = fetch_attr(e, "filter", "(objectclass=inetuser)")) == NULL) { *returncode = LDAP_OBJECT_CLASS_VIOLATION; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } /* allocate new task now */ task = slapi_new_task(slapi_entry_get_ndn(e)); task->task_state = SLAPI_TASK_SETUP; task->task_work = 1; task->task_progress = 0; /* create a pblock to pass the necessary info to the task thread */ mytaskdata = (task_data*)slapi_ch_malloc(sizeof(task_data)); if (mytaskdata == NULL) { *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; goto out; } mytaskdata->dn = slapi_ch_strdup(dn); mytaskdata->filter_str = slapi_ch_strdup(filter); mytaskdata->task = task; /* start the sample task as a separate thread */ thread = PR_CreateThread(PR_USER_THREAD, memberof_memberof_fixup_task_thread, (void *)mytaskdata, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE); if (thread == NULL) { slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM, "unable to create task thread!\n"); *returncode = LDAP_OPERATIONS_ERROR; rv = SLAPI_DSE_CALLBACK_ERROR; slapi_ch_free_string(&mytaskdata->dn); slapi_ch_free_string(&mytaskdata->filter_str); { void *ptask = mytaskdata; slapi_ch_free(&ptask); goto out; } } /* thread successful -- don't free the pb, let the thread do that. */ return SLAPI_DSE_CALLBACK_OK; out: if (task) { slapi_destroy_task(task); } return rv; } int memberof_fix_memberof(char *dn, char *filter_str) { int rc = 0; Slapi_PBlock *search_pb = slapi_pblock_new(); slapi_search_internal_set_pb(search_pb, dn, LDAP_SCOPE_SUBTREE, filter_str, 0, 0, 0, 0, memberof_get_plugin_id(), 0); rc = slapi_search_internal_callback_pb(search_pb, 0, 0, memberof_fix_memberof_callback, 0); slapi_pblock_destroy(search_pb); return rc; } /* memberof_fix_memberof_callback() * Add initial and/or fix up broken group list in entry * * 1. Make sure direct membership groups are in the entry * 2. Add all groups that current group list allows through nested membership * 3. Trim groups that have no relationship to entry */ int memberof_fix_memberof_callback(Slapi_Entry *e, void *callback_data) { int rc = 0; char *dn = slapi_entry_get_dn(e); memberof_add_groups data = {dn, dn}; /* step 1. and step 2. */ rc = memberof_call_foreach_dn(0, dn, MEMBEROF_GROUP_ATTR, memberof_add_groups_search_callback, &data); if(0 == rc) { /* step 3. */ rc = memberof_test_membership_callback(e, 0); } return rc; } From fedora-directory-commits at redhat.com Tue Feb 19 06:04:58 2008 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 19 Feb 2008 01:04:58 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile.am, 1.64, 1.65 Makefile.in, 1.82, 1.83 aclocal.m4, 1.61, 1.62 config.guess, 1.45, 1.46 config.h.in, 1.12, 1.13 config.sub, 1.45, 1.46 configure, 1.78, 1.79 depcomp, 1.46, 1.47 install-sh, 1.46, 1.47 ltmain.sh, 1.23, 1.24 missing, 1.46, 1.47 Message-ID: <200802190604.m1J64w1U014221@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13952 Modified Files: Makefile.am Makefile.in aclocal.m4 config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing Log Message: Initial import of memberof plugin from FreeIPA (refactored from changeset 640:9c57bd91b32f if ipa-memberof.c). Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- Makefile.am 26 Oct 2007 22:04:37 -0000 1.64 +++ Makefile.am 19 Feb 2008 06:04:55 -0000 1.65 @@ -115,7 +115,7 @@ serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \ libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \ libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \ - libpassthru-plugin.la libpresence-plugin.la \ + libmemberof-plugin.la libpassthru-plugin.la libpresence-plugin.la \ libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \ libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ libviews-plugin.la $(LIBPAM_PASSTHRU_PLUGIN) $(LIBDNA_PLUGIN) $(LIBBITWISE_PLUGIN) @@ -647,6 +647,14 @@ libcollation_plugin_la_LINK = $(CXXLINK) #------------------------ +# libmemberof-plugin +#------------------------ +libmemberof_plugin_la_SOURCES= ldap/servers/plugins/memberof/memberof.c + +libmemberof_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) +libmemberof_plugin_la_LDFLAGS = -avoid-version + +#------------------------ # libpam-passthru-plugin #------------------------ libpam_passthru_plugin_la_SOURCES = ldap/servers/plugins/pam_passthru/pam_ptconfig.c \ View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.82 -r 1.83 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- Makefile.in 19 Dec 2007 20:18:34 -0000 1.82 +++ Makefile.in 19 Feb 2008 06:04:55 -0000 1.83 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,15 +18,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,11 +43,11 @@ pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT) noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c +subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure compile config.guess config.sub \ depcomp install-sh ltmain.sh missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ $(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/mozldap.m4 \ @@ -61,7 +57,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -126,6 +122,9 @@ ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo libattr_unique_plugin_la_OBJECTS = \ $(am_libattr_unique_plugin_la_OBJECTS) +libattr_unique_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libattr_unique_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libback_ldbm_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) am_libback_ldbm_la_OBJECTS = \ ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo \ @@ -188,10 +187,16 @@ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_key.lo \ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_srch.lo libback_ldbm_la_OBJECTS = $(am_libback_ldbm_la_OBJECTS) +libback_ldbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libback_ldbm_la_LDFLAGS) $(LDFLAGS) -o $@ libbitwise_plugin_la_LIBADD = am_libbitwise_plugin_la_OBJECTS = \ ldap/servers/plugins/bitwise/libbitwise_plugin_la-bitwise.lo libbitwise_plugin_la_OBJECTS = $(am_libbitwise_plugin_la_OBJECTS) +libbitwise_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libbitwise_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @enable_bitwise_TRUE at am_libbitwise_plugin_la_rpath = -rpath \ @enable_bitwise_TRUE@ $(serverplugindir) libchainingdb_plugin_la_LIBADD = @@ -222,6 +227,9 @@ ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_utils.lo libchainingdb_plugin_la_OBJECTS = \ $(am_libchainingdb_plugin_la_OBJECTS) +libchainingdb_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libchainingdb_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libcollation_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libcollation_plugin_la_OBJECTS = ldap/servers/plugins/collation/libcollation_plugin_la-collate.lo \ @@ -233,25 +241,46 @@ ldap/servers/plugins/cos/libcos_plugin_la-cos.lo \ ldap/servers/plugins/cos/libcos_plugin_la-cos_cache.lo libcos_plugin_la_OBJECTS = $(am_libcos_plugin_la_OBJECTS) +libcos_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libcos_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdes_plugin_la_LIBADD = am_libdes_plugin_la_OBJECTS = \ ldap/servers/plugins/rever/libdes_plugin_la-des.lo \ ldap/servers/plugins/rever/libdes_plugin_la-rever.lo libdes_plugin_la_OBJECTS = $(am_libdes_plugin_la_OBJECTS) +libdes_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libdes_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdistrib_plugin_la_LIBADD = am_libdistrib_plugin_la_OBJECTS = \ ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo libdistrib_plugin_la_OBJECTS = $(am_libdistrib_plugin_la_OBJECTS) +libdistrib_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libdistrib_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdna_plugin_la_LIBADD = am_libdna_plugin_la_OBJECTS = \ ldap/servers/plugins/dna/libdna_plugin_la-dna.lo libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS) +libdna_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libdna_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @enable_dna_TRUE at am_libdna_plugin_la_rpath = -rpath $(serverplugindir) libhttp_client_plugin_la_LIBADD = am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \ ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo libhttp_client_plugin_la_OBJECTS = \ $(am_libhttp_client_plugin_la_OBJECTS) +libhttp_client_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libhttp_client_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ +libmemberof_plugin_la_LIBADD = +am_libmemberof_plugin_la_OBJECTS = ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo +libmemberof_plugin_la_OBJECTS = $(am_libmemberof_plugin_la_OBJECTS) +libmemberof_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libmemberof_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libns_dshttpd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -323,6 +352,10 @@ ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptpreop.lo libpam_passthru_plugin_la_OBJECTS = \ $(am_libpam_passthru_plugin_la_OBJECTS) +libpam_passthru_plugin_la_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libpam_passthru_plugin_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @enable_pam_passthru_TRUE at am_libpam_passthru_plugin_la_rpath = -rpath \ @enable_pam_passthru_TRUE@ $(serverplugindir) libpassthru_plugin_la_LIBADD = @@ -334,9 +367,15 @@ ldap/servers/plugins/passthru/libpassthru_plugin_la-ptpreop.lo \ ldap/servers/plugins/passthru/libpassthru_plugin_la-ptutil.lo libpassthru_plugin_la_OBJECTS = $(am_libpassthru_plugin_la_OBJECTS) +libpassthru_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpassthru_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libpresence_plugin_la_LIBADD = am_libpresence_plugin_la_OBJECTS = ldap/servers/plugins/presence/libpresence_plugin_la-presence.lo libpresence_plugin_la_OBJECTS = $(am_libpresence_plugin_la_OBJECTS) +libpresence_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpresence_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libpwdstorage_plugin_la_LIBADD = am_libpwdstorage_plugin_la_OBJECTS = ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-clear_pwd.lo \ ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-crypt_pwd.lo \ @@ -348,9 +387,15 @@ ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-ssha_pwd.lo libpwdstorage_plugin_la_OBJECTS = \ $(am_libpwdstorage_plugin_la_OBJECTS) +libpwdstorage_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libpwdstorage_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libreferint_plugin_la_LIBADD = am_libreferint_plugin_la_OBJECTS = ldap/servers/plugins/referint/libreferint_plugin_la-referint.lo libreferint_plugin_la_OBJECTS = $(am_libreferint_plugin_la_OBJECTS) +libreferint_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libreferint_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplication_plugin_la-cl5_api.lo \ @@ -409,6 +454,9 @@ ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo libreplication_plugin_la_OBJECTS = \ $(am_libreplication_plugin_la_OBJECTS) +libreplication_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libreplication_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libretrocl_plugin_la_LIBADD = am_libretrocl_plugin_la_OBJECTS = \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo \ @@ -418,11 +466,17 @@ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_rootdse.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo libretrocl_plugin_la_OBJECTS = $(am_libretrocl_plugin_la_OBJECTS) +libretrocl_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ [...5946 lines suppressed...] + test -z "$(propertydir)" || $(MKDIR_P) "$(DESTDIR)$(propertydir)" @list='$(property_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -8704,7 +8788,7 @@ done install-sampledataDATA: $(sampledata_DATA) @$(NORMAL_INSTALL) - test -z "$(sampledatadir)" || $(mkdir_p) "$(DESTDIR)$(sampledatadir)" + test -z "$(sampledatadir)" || $(MKDIR_P) "$(DESTDIR)$(sampledatadir)" @list='$(sampledata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -8721,7 +8805,7 @@ done install-schemaDATA: $(schema_DATA) @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)" + test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" @list='$(schema_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -8787,24 +8871,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/m4 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -8818,7 +8900,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -8893,7 +8975,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -8919,7 +9001,7 @@ $(DATA) config.h installdirs: for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -8961,6 +9043,8 @@ -rm -f ldap/servers/plugins/dna/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(am__dirstamp) + -rm -f ldap/servers/plugins/memberof/$(DEPDIR)/$(am__dirstamp) + -rm -f ldap/servers/plugins/memberof/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(am__dirstamp) -rm -f ldap/servers/plugins/passthru/$(DEPDIR)/$(am__dirstamp) @@ -9027,7 +9111,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/memberof/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slap! d/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -9049,19 +9133,27 @@ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-taskSCRIPTS +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-sbinPROGRAMS install-sbinSCRIPTS +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/memberof/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slap! d/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -9079,14 +9171,15 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \ - uninstall-mibDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA \ - uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-sbinSCRIPTS uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS + uninstall-configDATA uninstall-infDATA uninstall-initSCRIPTS \ + uninstall-initconfigSCRIPTS uninstall-mibDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA uninstall-sampledataDATA \ + uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ @@ -9098,27 +9191,27 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-binSCRIPTS install-configDATA \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-infDATA install-info install-info-am \ install-initSCRIPTS install-initconfigSCRIPTS install-man \ - install-mibDATA install-nodist_propertyDATA \ - install-perlSCRIPTS install-propertyDATA \ - install-sampledataDATA install-sbinPROGRAMS \ - install-sbinSCRIPTS install-schemaDATA \ + install-mibDATA install-nodist_propertyDATA install-pdf \ + install-pdf-am install-perlSCRIPTS install-propertyDATA \ + install-ps install-ps-am install-sampledataDATA \ + install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-strip install-taskSCRIPTS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \ - uninstall-mibDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA \ - uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-sbinSCRIPTS uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS + uninstall-configDATA uninstall-infDATA uninstall-initSCRIPTS \ + uninstall-initconfigSCRIPTS uninstall-mibDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA uninstall-sampledataDATA \ + uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS dirver.h: Makefile Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- aclocal.m4 19 Dec 2007 20:18:34 -0000 1.61 +++ aclocal.m4 19 Feb 2008 06:04:55 -0000 1.62 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 AC_PROG_LIBTOOL +# serial 51 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -176,7 +181,7 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -263,8 +268,9 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* @@ -276,8 +282,9 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -293,12 +300,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -529,13 +544,17 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -551,7 +570,11 @@ esac ;; *64-bit*) + libsuff=64 case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -623,7 +646,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -664,11 +687,12 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -782,24 +806,27 @@ fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -1026,7 +1053,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -1034,7 +1062,7 @@ mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1174,6 +1202,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1191,7 +1220,8 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1205,20 +1235,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1375,12 +1443,8 @@ shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1397,18 +1461,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1446,7 +1498,7 @@ shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -1509,7 +1561,7 @@ postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[[3-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1564,7 +1616,7 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1577,28 +1629,13 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1610,18 +1647,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -1703,6 +1728,10 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1808,7 +1837,8 @@ # _LT_AC_TAGCONFIG # ---------------- AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_ARG_WITH([tags], [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], [include additional configurations @<:@automatic@:>@])], [tagnames="$withval"]) @@ -2069,7 +2099,7 @@ # AC_PATH_TOOL_PREFIX # ------------------- -# find a file program which can recognise shared library +# find a file program which can recognize shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_MSG_CHECKING([for $1]) @@ -2132,7 +2162,7 @@ # AC_PATH_MAGIC # ------------- -# find a file program which can recognise a shared library +# find a file program which can recognize a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -2279,7 +2309,7 @@ # how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependent libraries], +[AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -2318,16 +2348,22 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -2365,7 +2401,7 @@ esac ;; -interix3*) +interix[[3-9]]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ;; @@ -2381,7 +2417,7 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -2415,6 +2451,10 @@ lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -2467,7 +2507,7 @@ lt_cv_path_NM="$NM" else lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do @@ -2683,10 +2723,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' _LT_AC_SYS_COMPILER @@ -2788,10 +2828,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2937,7 +2977,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -3096,10 +3136,10 @@ case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -3133,7 +3173,7 @@ freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3182,9 +3222,7 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; @@ -3252,7 +3290,7 @@ ;; esac ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -3292,7 +3330,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -3372,6 +3410,29 @@ # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -3410,16 +3471,20 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -3581,15 +3646,10 @@ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -3636,6 +3696,12 @@ fi _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -3879,7 +3945,7 @@ # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in -interix3*) +interix[[3-9]]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. _LT_AC_TAGVAR(predep_objects,$1)= @@ -3887,13 +3953,46 @@ _LT_AC_TAGVAR(postdeps,$1)= ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -3942,10 +4041,17 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4024,10 +4130,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4080,7 +4186,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -4169,6 +4275,7 @@ _LT_AC_TAGVAR(module_cmds, $1) \ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ _LT_AC_TAGVAR(exclude_expsyms, $1) \ _LT_AC_TAGVAR(include_expsyms, $1); do @@ -4215,7 +4322,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4305,9 +4412,6 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -4441,11 +4545,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) # Dependencies to place before the objects being linked to create a # shared library. @@ -4457,7 +4561,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4537,13 +4641,13 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) @@ -4626,6 +4730,7 @@ # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([LT_AC_PROG_SED]) AC_REQUIRE([AC_PROG_NM]) AC_REQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -4662,7 +4767,7 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[[ABCDGIRSTW]]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -4852,12 +4957,14 @@ # like `-m68040'. _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -4869,7 +4976,7 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -4935,7 +5042,7 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4978,7 +5085,7 @@ ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -5005,6 +5112,14 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac ;; esac ;; @@ -5125,13 +5240,15 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; @@ -5141,7 +5258,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -5199,7 +5316,7 @@ esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' @@ -5232,7 +5349,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -5251,6 +5368,22 @@ # All Alpha code is PIC. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; esac ;; @@ -5260,6 +5393,10 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + rdos*) + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + solaris*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5354,7 +5491,8 @@ # ------------------------------------ # See if the linker supports building shared libraries. AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -5371,7 +5509,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -5510,7 +5648,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -5528,7 +5666,7 @@ fi ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -5543,7 +5681,7 @@ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -5561,13 +5699,22 @@ ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi else _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5607,7 +5754,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -5726,7 +5873,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5819,7 +5966,7 @@ # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; @@ -5861,10 +6008,10 @@ case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -5904,7 +6051,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -6026,24 +6173,28 @@ ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -6102,17 +6253,16 @@ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6169,7 +6319,7 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6244,7 +6394,7 @@ # to ld, don't add -lc before -lgcc. AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest @@ -6347,6 +6497,30 @@ [AC_CHECK_TOOL(RC, windres, no) ]) + +# Cheap backport of AS_EXECUTABLE_P and required macros +# from Autoconf 2.59; we should not use $as_executable_p directly. + +# _AS_TEST_PREPARE +# ---------------- +m4_ifndef([_AS_TEST_PREPARE], +[m4_defun([_AS_TEST_PREPARE], +[if test -x / >/dev/null 2>&1; then + as_executable_p='test -x' +else + as_executable_p='test -f' +fi +])])# _AS_TEST_PREPARE + +# AS_EXECUTABLE_P +# --------------- +# Check whether a file is executable. +m4_ifndef([AS_EXECUTABLE_P], +[m4_defun([AS_EXECUTABLE_P], +[AS_REQUIRE([_AS_TEST_PREPARE])dnl +$as_executable_p $1[]dnl +])])# AS_EXECUTABLE_P + # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # # a released version of Autoconf we should remove this # @@ -6367,7 +6541,7 @@ test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done @@ -6410,7 +6584,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6420,14 +6594,29 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6484,14 +6673,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -6500,8 +6689,10 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -6515,15 +6706,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -6551,6 +6741,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -6616,6 +6807,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -6668,7 +6860,8 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -6693,8 +6886,9 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6741,8 +6935,8 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6765,16 +6959,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -6794,6 +6992,9 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -6829,6 +7030,10 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -6864,7 +7069,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -6969,13 +7174,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 5 # AM_PROG_CC_C_O # -------------- @@ -6983,6 +7189,7 @@ AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC @@ -6995,18 +7202,22 @@ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" CC="$am_aux_dir/compile $CC" fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7022,6 +7233,7 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -7032,7 +7244,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7040,60 +7252,23 @@ # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -7205,9 +7380,21 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- config.guess 19 Dec 2007 20:18:34 -0000 1.45 +++ config.guess 19 Feb 2008 06:04:55 -0000 1.46 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -206,8 +207,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,7 +768,14 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -779,8 +790,11 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -794,7 +808,7 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -817,6 +831,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +868,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,9 +891,16 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -916,6 +944,9 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; @@ -961,7 +992,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -971,7 +1002,11 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1182,7 +1217,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1261,6 +1295,9 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 Index: config.h.in =================================================================== RCS file: /cvs/dirsec/ldapserver/config.h.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config.h.in 19 Oct 2007 18:48:27 -0000 1.12 +++ config.h.in 19 Feb 2008 06:04:55 -0000 1.13 @@ -368,7 +368,7 @@ /* Define to `int' if does not define. */ #undef pid_t -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ #undef size_t /* SunOS5 */ Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- config.sub 19 Dec 2007 20:18:34 -0000 1.45 +++ config.sub 19 Feb 2008 06:04:55 -0000 1.46 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -239,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,28 +268,27 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -286,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -305,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -316,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,31 +349,30 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -696,6 +708,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +880,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -885,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1101,7 +1130,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1203,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1340,6 +1371,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1349,9 +1386,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.78 -r 1.79 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- configure 19 Dec 2007 20:18:34 -0000 1.78 +++ configure 19 Feb 2008 06:04:55 -0000 1.79 @@ -1,27 +1,56 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for dirsrv 1.1.0. +# Generated by GNU Autoconf 2.61 for dirsrv 1.1.0. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -31,8 +60,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -46,18 +110,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -65,157 +130,388 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { [...19476 lines suppressed...] - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -26753,20 +27420,32 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -26788,53 +27467,79 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- depcomp 19 Dec 2007 20:18:34 -0000 1.46 +++ depcomp 19 Feb 2008 06:04:55 -0000 1.47 @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2006-10-15.18 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Foundation, Inc. # 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 @@ -91,7 +92,20 @@ ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" stat=$? if test $stat -eq 0; then : else @@ -276,6 +290,46 @@ rm -f "$tmpdepfile" ;; +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -288,13 +342,13 @@ if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to + # static library. This mechanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and + # compilations output dependencies in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- install-sh 19 Dec 2007 20:18:34 -0000 1.46 +++ install-sh 19 Feb 2008 06:04:55 -0000 1.47 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -39,15 +39,24 @@ # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. + +nl=' +' +IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi -# put in absolute paths if you don't have them in your path; or use env. vars. +# Put in absolute file names if you don't have them in your path; +# or use environment vars. mvprog="${MVPROG-mv}" cpprog="${CPPROG-cp}" @@ -58,7 +67,13 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -chmodcmd="$chmodprog 0755" +posix_glob= +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chmodcmd=$chmodprog chowncmd= chgrpcmd= stripcmd= @@ -95,7 +110,7 @@ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " -while test -n "$1"; do +while test $# -ne 0; do case $1 in -c) shift continue;; @@ -111,9 +126,15 @@ --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" + -m) mode=$2 shift shift + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac continue;; -o) chowncmd="$chownprog $2" @@ -136,25 +157,33 @@ --version) echo "$0 $scriptversion"; exit $?;; - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done + --) shift break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; esac done -if test -z "$1"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done +fi + +if test $# -eq 0; then if test -z "$dir_arg"; then echo "$0: no input file specified." >&2 exit 1 @@ -164,6 +193,33 @@ exit 0 fi +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + for src do # Protect names starting with `-'. @@ -173,15 +229,11 @@ if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -208,53 +260,188 @@ echo "$0: $dstarg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. + obsolete_mkdir_used=false - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac - pathcomp= + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; + esac + + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac + + oIFS=$IFS + IFS=/ + $posix_glob && set -f + set fnord $dstdir shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit + $posix_glob && set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi - pathcomp=$pathcomp/ - done + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -262,10 +449,9 @@ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -276,10 +462,10 @@ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ || { # The rename failed, perhaps because mv can't rename something else # to itself, or perhaps because mv is so ancient that it does not @@ -291,11 +477,12 @@ # reasons. In this case, the final cleanup might fail but the new # file should still install successfully. { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 } else @@ -304,16 +491,13 @@ } && # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + $doit $mvcmd "$dsttmp" "$dst" } - } - fi || { (exit 1); exit 1; } -done + } || exit 1 -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} + trap '' 0 + fi +done # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ltmain.sh 19 Oct 2007 18:48:27 -0000 1.23 +++ ltmain.sh 19 Feb 2008 06:04:55 -0000 1.24 @@ -1,8 +1,8 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.22 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" +VERSION=1.5.24 +TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -57,6 +57,8 @@ else case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -114,10 +116,10 @@ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - fi" + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" done # Make sure IFS has a sensible default @@ -206,7 +208,13 @@ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + $SED -n -e '1,100{ + / I /{ + s,.*,import, + p + q + } + }'` case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -340,11 +348,11 @@ my_xlib_u=$my_xlib while :; do case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac done extracted_archives="$extracted_archives $my_xlib_u" my_xdir="$my_gentop/$my_xlib_u" @@ -474,11 +482,12 @@ ;; --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + echo "\ +$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +Copyright (C) 2007 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? ;; @@ -775,7 +784,7 @@ *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; + *.[fF][09]?) xform=[fF][09]. ;; *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; @@ -1160,8 +1169,8 @@ do case $arg in -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1170,19 +1179,19 @@ fi prefer_static_libs=yes ;; - -static) + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1630,7 +1639,7 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -1650,10 +1659,11 @@ # -m* pass through architecture-specific compiler args for GCC # -m*, -t[45]*, -txscale* pass through architecture-specific # compiler args for GCC - # -pg pass through profiling flag for GCC + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1681,9 +1691,9 @@ -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. + # and Darwin in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -2124,7 +2134,7 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -2520,9 +2530,9 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3229,9 +3239,10 @@ age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; esac ;; @@ -3290,7 +3301,8 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3304,8 +3316,11 @@ ;; irix | nonstopux) - major=`expr $current - $age + 1` - + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; @@ -3442,11 +3457,11 @@ fi # Eliminate all temporary directories. -# for path in $notinst_path; do -# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` -# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` -# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` -# done + #for path in $notinst_path; do + # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3547,7 +3562,7 @@ int main() { return 0; } EOF $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l\(.*\)'` @@ -3909,7 +3924,10 @@ test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + case $archive_cmds in + *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; + *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; + esac else eval dep_rpath=\"$hardcode_libdir_flag_spec\" fi @@ -4275,7 +4293,7 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -5295,6 +5313,8 @@ else case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -6391,8 +6411,10 @@ if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE + if test ! -f "$dir/$dlname"; then + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit $EXIT_FAILURE + fi fi ;; @@ -6458,14 +6480,11 @@ # Restore saved environment variables for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + fi" done - # Now prepare to actually exec the command. exec_cmd="\$cmd$args" else Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- missing 19 Dec 2007 20:18:34 -0000 1.46 +++ missing 19 Feb 2008 06:04:55 -0000 1.47 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 From fedora-directory-commits at redhat.com Tue Feb 19 15:10:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:10:40 -0500 Subject: [Fedora-directory-commits] dsgw/tests/csearch - New directory Message-ID: <200802191510.m1JFAeEn023258@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/csearch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23231/csearch Log Message: Directory /cvs/dirsec/dsgw/tests/csearch added to the repository From fedora-directory-commits at redhat.com Tue Feb 19 15:10:40 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:10:40 -0500 Subject: [Fedora-directory-commits] dsgw/tests/dnedit - New directory Message-ID: <200802191510.m1JFAeMU023263@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/dnedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23231/dnedit Log Message: Directory /cvs/dirsec/dsgw/tests/dnedit added to the repository From fedora-directory-commits at redhat.com Tue Feb 19 15:20:24 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:20:24 -0500 Subject: [Fedora-directory-commits] dsgw/tests/csearch testpost.1, NONE, 1.1 testpost.10, NONE, 1.1 testpost.11, NONE, 1.1 testpost.12, NONE, 1.1 testpost.13, NONE, 1.1 testpost.14, NONE, 1.1 testpost.15, NONE, 1.1 testpost.2, NONE, 1.1 testpost.3, NONE, 1.1 testpost.4, NONE, 1.1 testpost.5, NONE, 1.1 testpost.6, NONE, 1.1 testpost.7, NONE, 1.1 testpost.8, NONE, 1.1 testpost.9, NONE, 1.1 Message-ID: <200802191520.m1JFKObu023936@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/csearch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23811/dsgw/tests/csearch Added Files: testpost.1 testpost.10 testpost.11 testpost.12 testpost.13 testpost.14 testpost.15 testpost.2 testpost.3 testpost.4 testpost.5 testpost.6 testpost.7 testpost.8 testpost.9 Log Message: 1) The old code used a CGI variable called completion_javascript - this variable contained arbitrary javascript code that was eval'd on in the client browser. I have removed this code and put it in the resource file. The dsgw code will set completion_javascript to one of the 3 keywords, and the new function emit_completion_javascript will look up the code in the resource file and output it with any required arguments. It just seems like a really bad idea to execute arbitrary blobs of javascript passed in a CGI argument. 2) Make the checking for the template file names stricter. 3) Added many new tests. 4) When removing unused or duplicate LDAP Mods, if we remove the last one, just free the entire array. --- NEW FILE testpost.1 --- --- NEW FILE testpost.10 --- file=match --- NEW FILE testpost.11 --- file=string --- NEW FILE testpost.12 --- file=base --- NEW FILE testpost.13 --- file=attr&searchType=">You've just been p0wnd --- NEW FILE testpost.14 --- file=attr&searchType=People --- NEW FILE testpost.15 --- file=match&searchType=People&searchAttr=full name --- NEW FILE testpost.2 --- file=/ --- NEW FILE testpost.3 --- file=. --- NEW FILE testpost.4 --- file=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --- NEW FILE testpost.5 --- file=../aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --- NEW FILE testpost.6 --- file=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/.. --- NEW FILE testpost.7 --- file=../../../../ --- NEW FILE testpost.8 --- file=type --- NEW FILE testpost.9 --- file=attr From fedora-directory-commits at redhat.com Tue Feb 19 15:20:24 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:20:24 -0500 Subject: [Fedora-directory-commits] dsgw/tests setup.sh,1.3,1.4 Message-ID: <200802191520.m1JFKONt023931@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23811/dsgw/tests Modified Files: setup.sh Log Message: 1) The old code used a CGI variable called completion_javascript - this variable contained arbitrary javascript code that was eval'd on in the client browser. I have removed this code and put it in the resource file. The dsgw code will set completion_javascript to one of the 3 keywords, and the new function emit_completion_javascript will look up the code in the resource file and output it with any required arguments. It just seems like a really bad idea to execute arbitrary blobs of javascript passed in a CGI argument. 2) Make the checking for the template file names stricter. 3) Added many new tests. 4) When removing unused or duplicate LDAP Mods, if we remove the last one, just free the entire array. Index: setup.sh =================================================================== RCS file: /cvs/dirsec/dsgw/tests/setup.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- setup.sh 9 Feb 2008 18:24:23 -0000 1.3 +++ setup.sh 19 Feb 2008 15:20:22 -0000 1.4 @@ -1,14 +1,14 @@ #!/bin/sh testdir="$1" -sroot=/home/$USER/11srv +sroot=/NotBackedUp/$USER/11srv port=1100 secport=1101 rootdn="cn=directory manager" -rootpw=password +rootpw=secret12 adminpw=admin #needinstance=1 -#needdata=1 +needdata=1 #usessl=1 PATH=/usr/lib64/mozldap:/usr/lib/mozldap:$PATH export PATH @@ -32,7 +32,7 @@ fi if [ "$needdata" ] ; then -$sroot/lib/dirsrv/slapd-localhost/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i $testdir/nsroot.ldif +$sroot/lib/dirsrv/slapd-localhost/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i $sroot/share/dirsrv/data/Example.ldif sleep 10 fi @@ -40,7 +40,7 @@ mkdir testtmp if [ "$usessl" ] ; then - ldapurl="ldaps://$hostname:$secport/$suffix" + ldapurl="ldaps://$hostname:$secport" # grab CA cert certutil -L -d $sroot/etc/dirsrv/$inst -n "CA certificate" -a > testtmp/cacert.asc # pin file @@ -51,7 +51,7 @@ certutil -A -d testtmp -n "CA certificate" -t "CT,," -a -i testtmp/cacert.asc port=$secport else - ldapurl="ldap://localhost:$port/$suffix" + ldapurl="ldap://localhost:$port" hostname=localhost fi @@ -88,21 +88,21 @@ pwpfile=/tmp/pwp.$$ cat > $pwpfile < /dev/null | sort -n > $getlist + find $testdir/$prog -name skip -prune -o -name testget.\* -print 2> /dev/null | sort -n > $getlist for test in `cat $getlist` ; do runATest "$prog" GET "$test" ctxnum=1 for ctx in "" "/" "." "../../../" "somebogusvalue" "pb" "dsgw" ; do if [ -s "$test" ] ; then - runATest "$prog" GET "$test" .$ctxnum "&context=$ctx" + runATest "$prog" GET "$test" .$ctxnum "&context=$ctx&binddn=$rootdn&passwd=$rootpw" else - runATest "$prog" GET "$test" .$ctxnum "context=$ctx" + runATest "$prog" GET "$test" .$ctxnum "context=$ctx&binddn=$rootdn&passwd=$rootpw" fi ctxnum=`expr $ctxnum + 1` done @@ -206,12 +206,12 @@ prog="$1" # test must be in dir of same name shift postlist=/tmp/posttests.$$ - find $testdir/$prog -name testpost.\* -print 2> /dev/null | sort -n > $postlist + find $testdir/$prog -name skip -prune -o -name testpost.\* -print 2> /dev/null | sort -n > $postlist for test in `cat $postlist` ; do runATest "$prog" POST "$test" ctxnum=1 for ctx in "" "/" "." "../../../" "somebogusvalue" "pb" "dsgw" ; do - runATest "$prog" POST "$test" .$ctxnum "&context=$ctx" + runATest "$prog" POST "$test" .$ctxnum "&context=$ctx&binddn=$rootdn&passwd=$rootpw" ctxnum=`expr $ctxnum + 1` done done From fedora-directory-commits at redhat.com Tue Feb 19 15:20:26 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:20:26 -0500 Subject: [Fedora-directory-commits] dsgw/tests/dnedit testget.1, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 Message-ID: <200802191520.m1JFKQRd023953@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/dnedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23811/dsgw/tests/dnedit Added Files: testget.1 testget.2 testget.3 Log Message: 1) The old code used a CGI variable called completion_javascript - this variable contained arbitrary javascript code that was eval'd on in the client browser. I have removed this code and put it in the resource file. The dsgw code will set completion_javascript to one of the 3 keywords, and the new function emit_completion_javascript will look up the code in the resource file and output it with any required arguments. It just seems like a really bad idea to execute arbitrary blobs of javascript passed in a CGI argument. 2) Make the checking for the template file names stricter. 3) Added many new tests. 4) When removing unused or duplicate LDAP Mods, if we remove the last one, just free the entire array. --- NEW FILE testget.1 --- --- NEW FILE testget.2 --- dn=uid=scarter,ou=people,dc=example,dc=com&template=template&attr=attr&desc=desc --- NEW FILE testget.3 --- dn=uid=scarter,ou=people,dc=example,dc=com&template=template&attr='You've just been p0wned&desc=desc From fedora-directory-commits at redhat.com Tue Feb 19 15:20:26 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:20:26 -0500 Subject: [Fedora-directory-commits] dsgw/tests/domodify testpost.10, NONE, 1.1 testpost.11, NONE, 1.1 testpost.12, NONE, 1.1 testpost.13, NONE, 1.1 testpost.14, NONE, 1.1 testpost.15, NONE, 1.1 testpost.16, NONE, 1.1 testpost.17, NONE, 1.1 Message-ID: <200802191520.m1JFKQ2A023958@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/domodify In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23811/dsgw/tests/domodify Added Files: testpost.10 testpost.11 testpost.12 testpost.13 testpost.14 testpost.15 testpost.16 testpost.17 Log Message: 1) The old code used a CGI variable called completion_javascript - this variable contained arbitrary javascript code that was eval'd on in the client browser. I have removed this code and put it in the resource file. The dsgw code will set completion_javascript to one of the 3 keywords, and the new function emit_completion_javascript will look up the code in the resource file and output it with any required arguments. It just seems like a really bad idea to execute arbitrary blobs of javascript passed in a CGI argument. 2) Make the checking for the template file names stricter. 3) Added many new tests. 4) When removing unused or duplicate LDAP Mods, if we remove the last one, just free the entire array. --- NEW FILE testpost.10 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&changed_DN=true&replace_DN_uid=changeduid --- NEW FILE testpost.11 --- changetype=modify&dn=uid=changeduid,ou=people,dc=example,dc=com&quiet=&verbose=true&changed_DN=true&replace_DN_uid=scarter --- NEW FILE testpost.12 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&changed_nosuchattr=true --- NEW FILE testpost.13 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&delete_nosuchattr=1&changed_nosuchattr=true --- NEW FILE testpost.14 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&delete_nosuchattr=1&changed_nosuchattr=false --- NEW FILE testpost.15 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&delete_nosuchattr=1&delete_nosuchattr1=1&changed_nosuchattr=false --- NEW FILE testpost.16 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&add_ou= Test OU Foo Test OU Bar Test OU Baz Test OU Biff &add_mls_description=multiline $$$$$$$$$$$$$$$$\\\\\\\\\\\\\\\\\\\\\ $$$$$$$$$$$$$$$$\\\\\\\\\\\\\\\\\\\\\ $$$$$$$$$$$$$$$$\\\\\\\\\\\\\\\\\\\\\ $$$$$$$$$$$$$$$$\\\\\\\\\\\\\\\\\\\\\ $$$$$$$$$$$$$$$$\\\\\\\\\\\\\\\\\\\\\ $$$$$$$$$$$$$$$$\\\\\\\\\\\\\\\\\\\\\ description$that$has\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\many\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\lines&add_unique_cn=Test Unique CN --- NEW FILE testpost.17 --- changetype=modify&dn=uid=scarter,ou=people,dc=example,dc=com&quiet=&verbose=true&replace_ou=Accounting&replace_ou=People&replace_ou=Test OU&completion_javascript=NOTFOUND From fedora-directory-commits at redhat.com Tue Feb 19 15:20:23 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:20:23 -0500 Subject: [Fedora-directory-commits] dsgw dbtdsgw.h, 1.1.1.1, 1.2 dnedit.c, 1.3, 1.4 domodify.c, 1.2, 1.3 dsgw.h, 1.6, 1.7 dsgwutil.c, 1.8, 1.9 edit.c, 1.3, 1.4 entrydisplay.c, 1.5, 1.6 htmlout.c, 1.2, 1.3 ldaputil.c, 1.2, 1.3 Message-ID: <200802191520.m1JFKs4o024010@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23811/dsgw Modified Files: dbtdsgw.h dnedit.c domodify.c dsgw.h dsgwutil.c edit.c entrydisplay.c htmlout.c ldaputil.c Log Message: 1) The old code used a CGI variable called completion_javascript - this variable contained arbitrary javascript code that was eval'd on in the client browser. I have removed this code and put it in the resource file. The dsgw code will set completion_javascript to one of the 3 keywords, and the new function emit_completion_javascript will look up the code in the resource file and output it with any required arguments. It just seems like a really bad idea to execute arbitrary blobs of javascript passed in a CGI argument. 2) Make the checking for the template file names stricter. 3) Added many new tests. 4) When removing unused or duplicate LDAP Mods, if we remove the last one, just free the entire array. Index: dbtdsgw.h =================================================================== RCS file: /cvs/dirsec/dsgw/dbtdsgw.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dbtdsgw.h 1 Jun 2006 19:43:40 -0000 1.1.1.1 +++ dbtdsgw.h 19 Feb 2008 15:20:21 -0000 1.2 @@ -464,5 +464,20 @@ ResDef( DBT_missingArgumentForOrgChartSearchAttr_ , 413, "Missing argument for \"orgchart-attrib-farleft-rdn\" directive\n" )/*extracted from config.c*/ ResDef( DBT_theCharsetIsNotSupported , 414, "The charset is not supported\n" ) ResDef( DBT_invalidTemplateVarLen, 415, "The string length %d of template variable \"%s\" is too long\n" ) + ResDef( DBT_completionJavascriptAdd, 416, "parent.updateList(parent.controlFrame.document.searchForm.faMode.value, parent.dnlist, parent.stagingFrame.dnlist, parent.outputFrame);parent.controlFrame.document.searchForm.faMode.value=\"add\";" ) + ResDef( DBT_completionJavascriptStd, 417, + "if (dsmodify_dn.length == 0) " + "document.writeln( \\'\\' + dsmodify_info +" + " \\'\\' );" + " else " + "parent.document.location.href=\\'edit?tmplname=%s" + "&context=%s&dn=\\' + dsmodify_dn + \\'&info=\\' + escape(dsmodify_info)\n" + ) + ResDef( DBT_completionJavascriptCu, 418, + "var comp_js = 'var cu=\\\\\\\'edit?context=%s&dn=%s\\\\\\\'; this.document.location.href=cu;'\n" + ) + ResDef( DBT_unknownValueForCompletionJavascript, 419, + "Invalid value '%s' for variable completion_javascript" ) + END_STR(dsgw) Index: dnedit.c =================================================================== RCS file: /cvs/dirsec/dsgw/dnedit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dnedit.c 15 Jan 2008 18:23:43 -0000 1.3 +++ dnedit.c 19 Feb 2008 15:20:21 -0000 1.4 @@ -115,8 +115,10 @@ * * Moral of the story - next time someone asks you to write C code which * writes JavaScript code which writes JavaScript code... just say "no". + * + * I feel your pain, so I have removed the pain. */ - "var comp_js = 'var cu=\\\\\\\'%s?context=%s&dn=%s\\\\\\\'; this.document.location.href=cu;'\n", + "var comp_js = 'CU'\n", dsgw_getvp( DSGW_CGINUM_EDIT ), context, edn ); dsgw_emits("var dnlist = new Array;\n" ); for ( i = 0; attrvals && attrvals[ i ] != NULL; i++ ) { @@ -403,3 +405,11 @@ "\n" ); return 0; } + +/* + emacs settings + Local Variables: + indent-tabs-mode: t + tab-width: 8 + End: +*/ Index: domodify.c =================================================================== RCS file: /cvs/dirsec/dsgw/domodify.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- domodify.c 28 Jan 2008 21:22:47 -0000 1.2 +++ domodify.c 19 Feb 2008 15:20:21 -0000 1.3 @@ -348,8 +348,10 @@ dsgw_emitf( "dsmodify_dn = '%s';\n", ( changetype == DSGW_CHANGETYPE_DELETE ) ? "": encodeddn ); - dsgw_emitf( "eval('%s');\n", jscomp ); dsgw_emits( "\n" ); + dsgw_emit_completion_javascript(jscomp, + ( changetype == DSGW_CHANGETYPE_DELETE ) ? "": + encodeddn ); } } else { jscomp = NULL; @@ -468,6 +470,11 @@ if ( pmods != NULL ) { remove_modifyops( pmods, attr ); + if (!pmods[0]) { + /* removed the last one, so just free all of them */ + free(pmods); + pmods = NULL; + } } } } Index: dsgw.h =================================================================== RCS file: /cvs/dirsec/dsgw/dsgw.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsgw.h 31 Jan 2008 03:03:33 -0000 1.6 +++ dsgw.h 19 Feb 2008 15:20:21 -0000 1.7 @@ -793,6 +793,8 @@ char *dsgw_get_auth_cookie(); void dsgw_emit_helpbutton( char *topic ); void dsgw_emit_homebutton(); +void dsgw_emit_completion_javascript( const char *key_str, const char *dn ); + char *dsgw_build_urlprefix(); void dsgw_init_searchprefs( struct ldap_searchobj **solistp ); void dsgw_addtemplate( dsgwtmpl **tlpp, char *template, int count, @@ -827,7 +829,7 @@ unsigned long options ); void dsgw_display_entry( dsgwtmplinfo *tip, LDAP *ld, LDAPMessage *entry, LDAPMessage *attrsonly_entry, char *dn ); -void dsgw_display_done( dsgwtmplinfo *tip ); +void dsgw_display_done( dsgwtmplinfo *tip, char *dn ); char *dsgw_mls_convertlines( char *val, char *sep, int *linesp, int emitlines, int quote_html_specials ); void dsgw_set_searchdesc( dsgwtmplinfo *tip, char*, char*, char*); Index: dsgwutil.c =================================================================== RCS file: /cvs/dirsec/dsgw/dsgwutil.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dsgwutil.c 1 Feb 2008 17:04:22 -0000 1.8 +++ dsgwutil.c 19 Feb 2008 15:20:21 -0000 1.9 @@ -262,8 +262,7 @@ char *path, *pattern; int len; - if ( strstr( filename, "//" ) != NULL || - strstr( filename, ".." ) != NULL ) { + if ( !dsgw_valid_docname(filename) ) { dsgw_error( DSGW_ERR_BADFILEPATH, filename, DSGW_ERROPT_EXIT, 0, NULL ); } Index: edit.c =================================================================== RCS file: /cvs/dirsec/dsgw/edit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- edit.c 28 Jan 2008 21:22:47 -0000 1.3 +++ edit.c 19 Feb 2008 15:20:21 -0000 1.4 @@ -233,7 +233,7 @@ tip = dsgw_display_init( DSGW_TMPLTYPE_DISPLAY, tmplname, options ); dsgw_display_entry( tip, ld, NULL, NULL, dn ); - dsgw_display_done( tip ); + dsgw_display_done( tip, dn ); } } Index: entrydisplay.c =================================================================== RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- entrydisplay.c 1 Feb 2008 17:04:22 -0000 1.5 +++ entrydisplay.c 19 Feb 2008 15:20:21 -0000 1.6 @@ -681,7 +681,7 @@ void -dsgw_display_done( dsgwtmplinfo *tip ) +dsgw_display_done( dsgwtmplinfo *tip, char *dn ) { char line[ BIG_LINE ], *jscomp; @@ -700,6 +700,7 @@ jscomp = dsgw_get_cgi_var( "completion_javascript", DSGW_CGIVAR_OPTIONAL ); if ( jscomp != NULL ) { + dsgw_emit_completion_javascript(jscomp, dn ? dn : ""); dsgw_emits( "\n" ); @@ -2853,14 +2854,10 @@ { if ( template != NULL ) { dsgw_emitf( - "\\' + dsmodify_info +" - " \\'\\' );" - " else " - "parent.document.location.href=\\'%s?tmplname=%s" - "&context=%s&dn=\\' + dsmodify_dn + \\'&info=\\' + escape(dsmodify_info)\">\n", - dsgw_getvp( DSGW_CGINUM_EDIT ), template, context ); + "\n", + template); + dsgw_emits( + "\n"); } } Index: htmlout.c =================================================================== RCS file: /cvs/dirsec/dsgw/htmlout.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- htmlout.c 14 Jan 2008 22:58:30 -0000 1.2 +++ htmlout.c 19 Feb 2008 15:20:21 -0000 1.3 @@ -458,6 +458,62 @@ dsgw_emits ( "document.confirmForm.submit();\n"); } +void +dsgw_emit_completion_javascript( + const char *key_str, + const char *dn +) +{ + char *tmplname = NULL; + char *context = dsgw_get_cgi_var("context", DSGW_CGIVAR_OPTIONAL); + int key; + char *msg = NULL; + + if (!key_str) { + return; + } + + if (!strcasecmp(key_str, "ADD")) { + key = DBT_completionJavascriptAdd; + } else if (!strcasecmp(key_str, "STD")) { + key = DBT_completionJavascriptStd; + } else if (!strcasecmp(key_str, "CU")) { + key = DBT_completionJavascriptCu; + } else { + char *fmt = XP_GetClientStr(DBT_unknownValueForCompletionJavascript); + msg = PR_smprintf(fmt, key_str); + dsgw_error( DSGW_ERR_BADFORMDATA, msg, DSGW_ERROPT_EXIT, 0, NULL ); + return; + } + + msg = XP_GetClientStr(key); + + dsgw_emits( "\n" ); + + return; +} + /* emacs settings Local Variables: Index: ldaputil.c =================================================================== RCS file: /cvs/dirsec/dsgw/ldaputil.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ldaputil.c 28 Jan 2008 21:22:47 -0000 1.2 +++ ldaputil.c 19 Feb 2008 15:20:21 -0000 1.3 @@ -793,7 +793,7 @@ } } - dsgw_display_done( tip ); + dsgw_display_done( tip, NULL ); } @@ -930,7 +930,7 @@ } else { /* use template to create a nicely formatted display */ dsgw_display_entry( tip, ld, entry, aoentry, NULL ); - dsgw_display_done( tip ); + dsgw_display_done( tip, dn ); } if ( attr0 != NULL ) { From fedora-directory-commits at redhat.com Tue Feb 19 15:20:24 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 19 Feb 2008 10:20:24 -0500 Subject: [Fedora-directory-commits] dsgw/config display-dnedit.html.in, 1.1, 1.2 display-dneditpeople.html.in, 1.1, 1.2 Message-ID: <200802191520.m1JFKsSa024019@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23811/dsgw/config Modified Files: display-dnedit.html.in display-dneditpeople.html.in Log Message: 1) The old code used a CGI variable called completion_javascript - this variable contained arbitrary javascript code that was eval'd on in the client browser. I have removed this code and put it in the resource file. The dsgw code will set completion_javascript to one of the 3 keywords, and the new function emit_completion_javascript will look up the code in the resource file and output it with any required arguments. It just seems like a really bad idea to execute arbitrary blobs of javascript passed in a CGI argument. 2) Make the checking for the template file names stricter. 3) Added many new tests. 4) When removing unused or duplicate LDAP Mods, if we remove the last one, just free the entire array. Index: display-dnedit.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/config/display-dnedit.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- display-dnedit.html.in 14 Jan 2008 22:31:17 -0000 1.1 +++ display-dnedit.html.in 19 Feb 2008 15:20:21 -0000 1.2 @@ -108,7 +108,7 @@ - + Index: display-dneditpeople.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/config/display-dneditpeople.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- display-dneditpeople.html.in 14 Jan 2008 22:31:17 -0000 1.1 +++ display-dneditpeople.html.in 19 Feb 2008 15:20:21 -0000 1.2 @@ -106,7 +106,7 @@ - + From fedora-directory-commits at redhat.com Fri Feb 22 01:12:59 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 21 Feb 2008 20:12:59 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src upgradeServer, 1.5.2.1, 1.5.2.2 Message-ID: <200802220112.m1M1CxHZ028713@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28687 Modified Files: Tag: Directory71RtmBranch upgradeServer Log Message: Resolves: #429071 Summary: RHDS7.1SP4: Don't Allow * To Be Inserted Into SASL Mapping Search Problem description: when upgrade from existing 7.1 to 7.1 sp4, the server instances loses the default sasl mapping, which used be hardcoded and now defined in the config file. Fix description: upgradeServer scripts adds the basic set of sasl mapping entries. Index: upgradeServer =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -r1.5.2.1 -r1.5.2.2 --- upgradeServer 7 Sep 2005 00:51:53 -0000 1.5.2.1 +++ upgradeServer 22 Feb 2008 01:12:57 -0000 1.5.2.2 @@ -149,15 +149,37 @@ my $isOID = 0; my $isJPEG = 0; my $isSpInSt = 0; - my $reqNameChange = 0; + my $reqNameChange = 0; + + my $kerberosUidMapping = 0; + my $rfc2829dn = 0; + my $rfc2829u = 0; + my $uidMapping = 0; + + my $userroot = 0; + my $suffix = ""; open( DSE, "$dse_ldiffile" ) || die "Can't open $dse_ldiffile: $!\n"; - my $new_filename = "$dse_ldiffile"."_new"; + my $new_filename = "$dse_ldiffile"."_new"; open( OUTFILE, "> $new_filename" ); while($line = ) { $isOID = 1 if ( $line =~ /^dn:\s*cn=OID Syntax,\s*cn=plugins,\s*cn=config/i); $isJPEG = 1 if ( $line =~ /^dn:\s*cn=JPEG Syntax,\s*cn=plugins,\s*cn=config/i); $isSpInSt = 1 if ( $line =~ /^dn:\s*cn=Space Insensitive String Syntax,\s*cn=plugins,\s*cn=config/i); + + $kerberosUidMapping = 1 if ( $line =~ /^dn:\s*cn=Kerberos uid mapping,\s*cn=mapping,\s*cn=sasl,\s*cn=config/i); + $rfc2829dn = 1 if ( $line =~ /^dn:\s*cn=rfc 2829 dn syntax,\s*cn=mapping,\s*cn=sasl,\s*cn=config/i); + $rfc2829u = 1 if ( $line =~ /^dn:\s*cn=rfc 2829 u syntax,\s*cn=mapping,\s*cn=sasl,\s*cn=config/i); + $uidMapping = 1 if ( $line =~ /^dn:\s*cn=uid mapping,\s*cn=mapping,\s*cn=sasl,\s*cn=config/i); + + $userroot = 1 if ( $line =~ /^dn:\scn=userRoot,\s*cn=ldbm database,\s*cn=plugins,\s*cn=config/i); + + if ( $userroot && $line =~ /^nsslapd-suffix: /i ) { + (my $attr, $suffix) = split(' ', $line, 2); + chomp($suffix); + $userroot = 0; + } + if( ($line =~ s/uid uniqueness/attribute uniqueness/) || ($line =~ s/uid-plugin/attr-unique-plugin/) ){ # the plugin name has changed @@ -169,9 +191,10 @@ } close( DSE ); - close(OUTFILE); + close( OUTFILE ); - if ($isOID && $isJPEG && $isSpInSt && !$reqNameChange) { + if ( $isOID && $isJPEG && $isSpInSt && !$reqNameChange && + $kerberosUidMapping && $rfc2829dn && $rfc2829u && $uidMapping ) { # nothing to be done - just return unlink($new_filename); return; @@ -187,7 +210,7 @@ close( DSE ); close(OUTFILE); } - unlink($new_filename) or die "Cannot unlink $new_filename \n"; + unlink($new_filename) or die "Cannot unlink $new_filename \n"; open( DSE, ">>$dse_ldiffile" ) || die "Can't open $dse_ldiffile: $!\n"; @@ -246,6 +269,50 @@ print DSE "\n"; } + unless ($kerberosUidMapping) { + print DSE "dn: cn=Kerberos uid mapping,cn=mapping,cn=sasl,cn=config\n"; + print DSE "objectClass: top\n"; + print DSE "objectClass: nsSaslMapping\n"; + print DSE "cn: Kerberos uid mapping\n"; + print DSE "nsSaslMapRegexString: \\(.*\\)@\\(.*\\)\\.\\(.*\\)\n"; + print DSE "nsSaslMapBaseDNTemplate: dc=\\2,dc=\\3\n"; + print DSE "nsSaslMapFilterTemplate: (uid=\\1)\n"; + print DSE "\n"; + } + + unless ($rfc2829dn) { + print DSE "dn: cn=rfc 2829 dn syntax,cn=mapping,cn=sasl,cn=config\n"; + print DSE "objectClass: top\n"; + print DSE "objectClass: nsSaslMapping\n"; + print DSE "cn: rfc 2829 dn syntax\n"; + print DSE "nsSaslMapRegexString: ^dn:\\(.*\\)\n"; + print DSE "nsSaslMapBaseDNTemplate: \\1\n"; + print DSE "nsSaslMapFilterTemplate: (objectclass=*)\n"; + print DSE "\n"; + } + + unless ($rfc2829u) { + print DSE "dn: cn=rfc 2829 u syntax,cn=mapping,cn=sasl,cn=config\n"; + print DSE "objectClass: top\n"; + print DSE "objectClass: nsSaslMapping\n"; + print DSE "cn: rfc 2829 u syntax\n"; + print DSE "nsSaslMapRegexString: ^u:\\(.*\\)\n"; + print DSE "nsSaslMapBaseDNTemplate: $suffix\n"; + print DSE "nsSaslMapFilterTemplate: (uid=\\1)\n"; + print DSE "\n"; + } + + unless ($uidMapping) { + print DSE "dn: cn=uid mapping,cn=mapping,cn=sasl,cn=config\n"; + print DSE "objectClass: top\n"; + print DSE "objectClass: nsSaslMapping\n"; + print DSE "cn: uid mapping\n"; + print DSE "nsSaslMapRegexString: ^[^:@]+\$\n"; + print DSE "nsSaslMapBaseDNTemplate: $suffix\n"; + print DSE "nsSaslMapFilterTemplate: (uid=&)\n"; + print DSE "\n"; + } + close( DSE ); } From fedora-directory-commits at redhat.com Wed Feb 27 03:01:07 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:01:07 -0500 Subject: [Fedora-directory-commits] dsgw/tests/newentry - New directory Message-ID: <200802270301.m1R317tQ028775@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/newentry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26411/newentry Log Message: Directory /cvs/dirsec/dsgw/tests/newentry added to the repository From fedora-directory-commits at redhat.com Wed Feb 27 03:01:07 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:01:07 -0500 Subject: [Fedora-directory-commits] dsgw/tests/dosearch - New directory Message-ID: <200802270301.m1R317wg028824@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/dosearch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26411/dosearch Log Message: Directory /cvs/dirsec/dsgw/tests/dosearch added to the repository From fedora-directory-commits at redhat.com Wed Feb 27 03:01:07 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:01:07 -0500 Subject: [Fedora-directory-commits] dsgw/tests/search - New directory Message-ID: <200802270301.m1R317iu028872@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26411/search Log Message: Directory /cvs/dirsec/dsgw/tests/search added to the repository From fedora-directory-commits at redhat.com Wed Feb 27 03:36:53 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:53 -0500 Subject: [Fedora-directory-commits] dsgw/tests/dnedit testget.4,NONE,1.1 Message-ID: <200802270336.m1R3arB4030963@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/dnedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/dnedit Added Files: testget.4 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) --- NEW FILE testget.4 --- dn=uid=scarter,ou=people,dc=example,dc=com&template=template&attr=ou&desc=Description of OU attribute From fedora-directory-commits at redhat.com Wed Feb 27 03:36:55 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:55 -0500 Subject: [Fedora-directory-commits] dsgw/tests/dosearch testget.1, NONE, 1.1 testget.10, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 testget.4, NONE, 1.1 testget.5, NONE, 1.1 testget.6, NONE, 1.1 testget.7, NONE, 1.1 testget.8, NONE, 1.1 testget.9, NONE, 1.1 testpost.1, NONE, 1.1 testpost.2, NONE, 1.1 testpost.3, NONE, 1.1 testpost.4, NONE, 1.1 testpost.5, NONE, 1.1 testpost.6, NONE, 1.1 testpost.7, NONE, 1.1 testpost.8, NONE, 1.1 Message-ID: <200802270336.m1R3atug031009@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/dosearch In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/dosearch Added Files: testget.1 testget.10 testget.2 testget.3 testget.4 testget.5 testget.6 testget.7 testget.8 testget.9 testpost.1 testpost.2 testpost.3 testpost.4 testpost.5 testpost.6 testpost.7 testpost.8 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) --- NEW FILE testget.1 --- --- NEW FILE testget.10 --- dn=cn=monitor&displaytemplate=person --- NEW FILE testget.2 --- ldq=foo?bar?baz?biff --- NEW FILE testget.3 --- ldq=objectclass --- NEW FILE testget.4 --- dn=cn=config --- NEW FILE testget.5 --- dn=entrydoesnotexist --- NEW FILE testget.6 --- dn=cn=config&ldq=?sub?(objectclass=nsbackendinstance) --- NEW FILE testget.7 --- dn=cn=config&ldq=?&sub=?(&objectclass=%3Dnsbackendinstance) --- NEW FILE testget.8 --- dn=cn=config&ldq=objectclass,cn,modifyTimestamp --- NEW FILE testget.9 --- dn=cn=monitor&displaytemplate=doesnotexist --- NEW FILE testpost.1 --- --- NEW FILE testpost.2 --- mode=unknownmode&searchstring=searchstring&type=type&base=cn=config&listifone=true&editable=true&link2edit=true&dnlist_js=true --- NEW FILE testpost.3 --- mode=auth&searchstring=scarter&type=type&base=cn=config&listifone=true&editable=true&link2edit=true&dnlist_js=true --- NEW FILE testpost.4 --- mode=pattern&searchstring=scarter&type=person&base=dc=example,dc=com&listifone=true&editable=true&link2edit=true&dnlist_js=true&attr=objectclass&filterpattern=* --- NEW FILE testpost.5 --- mode=pattern&searchstring=scarter&type=People&base=dc=example,dc=com&listifone=true&editable=true&link2edit=true&dnlist_js=true&attr=objectclass&filterpattern=* --- NEW FILE testpost.6 --- mode=pattern&searchstring=scarter&type=People&base=dc=example,dc=com&listifone=true&editable=true&link2edit=true&dnlist_js=true&attr=user id&filterpattern=uid=scarter&filterprefix=(|(&filtersuffix=)(objectclass=top))&searchdesc=This is the searchdesc field --- NEW FILE testpost.7 --- mode=smart&searchstring=scarter&type=People&base=dc=example,dc=com&listifone=true&editable=true&link2edit=true&dnlist_js=true --- NEW FILE testpost.8 --- mode=complex&searchstring=scarter&type=People&base=dc=example,dc=com&listifone=true&editable=true&link2edit=true&dnlist_js=true&attr=user id&match=is&searchdesc=This is the searchdesc field From fedora-directory-commits at redhat.com Wed Feb 27 03:36:55 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:55 -0500 Subject: [Fedora-directory-commits] dsgw/tests/edit testget.13,1.1,1.2 Message-ID: <200802270336.m1R3atnG031015@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/edit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/edit Modified Files: testget.13 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) Index: testget.13 =================================================================== RCS file: /cvs/dirsec/dsgw/tests/edit/testget.13,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testget.13 7 Feb 2008 22:46:57 -0000 1.1 +++ testget.13 27 Feb 2008 03:36:53 -0000 1.2 @@ -1 +1 @@ -info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=uid&dndesc=u i d&add=1&tmplname=person \ No newline at end of file +info=&dn=uid=newuser,ou=people,dc=example,dc=com&dnattr=uid&dndesc=u i d&add=1&tmplname=person \ No newline at end of file From fedora-directory-commits at redhat.com Wed Feb 27 03:36:55 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:55 -0500 Subject: [Fedora-directory-commits] dsgw/tests/lang testget.13,NONE,1.1 Message-ID: <200802270336.m1R3atfW031020@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/lang In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/lang Added Files: testget.13 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) --- NEW FILE testget.13 --- file=confirm.html&YES=CONFIRMVALUE1 From fedora-directory-commits at redhat.com Wed Feb 27 03:36:57 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:57 -0500 Subject: [Fedora-directory-commits] dsgw/tests/search testget.1, NONE, 1.1 testget.2, NONE, 1.1 Message-ID: <200802270336.m1R3avDN031030@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/search Added Files: testget.1 testget.2 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) --- NEW FILE testget.1 --- --- NEW FILE testget.2 --- file=string From fedora-directory-commits at redhat.com Wed Feb 27 03:36:56 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:56 -0500 Subject: [Fedora-directory-commits] dsgw/tests/newentry testget.1, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 testget.4, NONE, 1.1 testget.5, NONE, 1.1 testpost.1, NONE, 1.1 testpost.2, NONE, 1.1 Message-ID: <200802270336.m1R3auWu031025@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/newentry In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/newentry Added Files: testget.1 testget.2 testget.3 testget.4 testget.5 testpost.1 testpost.2 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) --- NEW FILE testget.1 --- --- NEW FILE testget.2 --- file=/ --- NEW FILE testget.3 --- file=type --- NEW FILE testget.4 --- file=name --- NEW FILE testget.5 --- file=name&etype=orgperson --- NEW FILE testpost.1 --- --- NEW FILE testpost.2 --- entrytype=People&entryname=newentry&rdntag=uid&selectLocation=dc=example,dc=com&dnsuffix=suffix From fedora-directory-commits at redhat.com Wed Feb 27 03:36:52 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:52 -0500 Subject: [Fedora-directory-commits] dsgw/config list-Auth.html.in,1.1,1.2 Message-ID: <200802270337.m1R3bMrG031063@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/config Modified Files: list-Auth.html.in Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) Index: list-Auth.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/config/list-Auth.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- list-Auth.html.in 14 Jan 2008 22:31:17 -0000 1.1 +++ list-Auth.html.in 27 Feb 2008 03:36:50 -0000 1.2 @@ -54,6 +54,9 @@ > + +> From fedora-directory-commits at redhat.com Wed Feb 27 03:36:52 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:52 -0500 Subject: [Fedora-directory-commits] dsgw cgiutil.c, 1.4, 1.5 csearch.c, 1.4, 1.5 dbtdsgw.h, 1.2, 1.3 dnedit.c, 1.4, 1.5 doauth.c, 1.3, 1.4 dosearch.c, 1.4, 1.5 dsgw.h, 1.7, 1.8 dsgwgetlang.c, 1.5, 1.6 dsgwi18n.h, 1.1.1.1, 1.2 dsgwutil.c, 1.9, 1.10 emitauth.c, 1.2, 1.3 entrydisplay.c, 1.6, 1.7 htmlout.c, 1.3, 1.4 htmlparse.c, 1.2, 1.3 lang.c, 1.3, 1.4 ldaputil.c, 1.3, 1.4 newentry.c, 1.2, 1.3 search.c, 1.2, 1.3 Message-ID: <200802270337.m1R3bM7N031046@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw Modified Files: cgiutil.c csearch.c dbtdsgw.h dnedit.c doauth.c dosearch.c dsgw.h dsgwgetlang.c dsgwi18n.h dsgwutil.c emitauth.c entrydisplay.c htmlout.c htmlparse.c lang.c ldaputil.c newentry.c search.c Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) Index: cgiutil.c =================================================================== RCS file: /cvs/dirsec/dsgw/cgiutil.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cgiutil.c 30 Jan 2008 17:16:45 -0000 1.4 +++ cgiutil.c 27 Feb 2008 03:36:50 -0000 1.5 @@ -202,7 +202,14 @@ char * dsgw_get_cgi_var(char *varname, int required) { - char *ans = get_cgi_var(varname, NULL, NULL); + char **vars = get_input_ptr(); + char *ans = NULL; + + if (!vars) { + return ans; + } + + ans = get_cgi_var(varname, NULL, NULL); if (!ans) { /* try all uppercase varname */ char *upvarname = dsgw_utf8StrToUpper(varname); ans = get_cgi_var(upvarname, NULL, NULL); Index: csearch.c =================================================================== RCS file: /cvs/dirsec/dsgw/csearch.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- csearch.c 30 Jan 2008 02:22:46 -0000 1.4 +++ csearch.c 27 Feb 2008 03:36:50 -0000 1.5 @@ -285,13 +285,11 @@ dsgw_emitf ("\n" "\n" "\n" - "\n" - "\n" "\n" "\n" "\n" "\n", - gc->gc_ldapsearchbase, gc->gc_ldapserver, gc->gc_ldapport, context); + gc->gc_ldapsearchbase, context); } else if ( dsgw_directive_is( line, "DS_CSEARCH_TYPE_SELECT" )) { dsgw_emitf ("\n", authdesturl); + dsgw_emitf ("\n", + authdestdn); } } else if ( dsgw_directive_is( line, "DS_AUTH_SEARCH_NAME" )) { @@ -228,6 +237,8 @@ if ( authdesturl != NULL ) { dsgw_emitf ("\n", authdesturl ); + dsgw_emitf ("\n", + authdestdn ); } } else if ( dsgw_directive_is( line, "DS_AUTH_PASSWORD_SCRIPT" )) { @@ -260,11 +271,15 @@ if ( authdesturl != NULL ) { dsgw_emitf ("\n", authdesturl ); + dsgw_emitf ("\n", + authdestdn ); } } else if ( dsgw_directive_is( line, "DS_AUTH_PASSWORD_NAME" )) { auto char** xdn = ldap_explode_dn( user, 1 ); - dsgw_emits( xdn[ 0 ] ); + if (xdn && xdn[0]) { + dsgw_emits( xdn[ 0 ] ); + } ldap_value_free( xdn ); } else if ( dsgw_directive_is( line, "DS_AUTH_PASSWORD_BUTTONS" )) { Index: entrydisplay.c =================================================================== RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- entrydisplay.c 19 Feb 2008 15:20:21 -0000 1.6 +++ entrydisplay.c 27 Feb 2008 03:36:50 -0000 1.7 @@ -701,9 +701,6 @@ DSGW_CGIVAR_OPTIONAL ); if ( jscomp != NULL ) { dsgw_emit_completion_javascript(jscomp, dn ? dn : ""); - dsgw_emits( "\n" ); } fflush( stdout ); @@ -769,7 +766,8 @@ dsgw_quote_emits (QUOTATION_JAVASCRIPT, urlprefix); dsgw_emits( ";\n" " } else {\n" - "\tdocument.editEntryForm.authdesturl.value = editURL;\n" + "\tdocument.editEntryForm.authdesturl.value = 'edit';\n" + "\tdocument.editEntryForm.authdestdn.value = encodeddn;\n" "\ta = open("); dsgw_quote_emits (QUOTATION_JAVASCRIPT, urlprefix); @@ -816,7 +814,7 @@ dsgw_emits( "var changetype = '';\n\n" ); dsgw_emits( "function confirmModify(ctype, prompt)\n{\n" ); dsgw_emits( " changetype = ctype;\n" ); - dsgw_emit_confirm (NULL, "opener.submitModify(opener.changetype);", NULL/*no*/, + dsgw_emit_confirm (NULL, "CONFIRMVALUE2", NULL/*no*/, NULL /* options */, 0, "prompt"); dsgw_emits( "}\n" ); @@ -847,7 +845,7 @@ dsgw_getvp( DSGW_CGINUM_DNEDIT ), encodeddn, context ); dsgw_emits( " if( !changesMade() ) window.location.href = DNEditURL;\n" " else {\n"); - dsgw_emit_confirm( NULL, "opener.location.href = opener.DNEditURL;", NULL/*no*/, + dsgw_emit_confirm( NULL, "CONFIRMVALUE3", NULL/*no*/, XP_GetClientStr(DBT_continueWithoutSavingWindow_), 1, XP_GetClientStr(DBT_continueWithoutSaving_)); dsgw_emits( " }\n"); @@ -866,7 +864,7 @@ dsgw_emits( "function closeIfOK()\n{\n" " if ( !changesMade() ) top.close();\n" " else {\n" ); - dsgw_emit_confirm( NULL, "opener.top.close();", NULL/*no*/, + dsgw_emit_confirm( NULL, "CONFIRMVALUE4", NULL/*no*/, XP_GetClientStr(DBT_discardChangesWindow_), 1, XP_GetClientStr(DBT_discardChanges_)); dsgw_emits( " }\n}\n" ); @@ -2015,14 +2013,8 @@ } if (( adip->adi_opts & DSGW_ATTROPT_LINK2EDIT ) != 0 ) { - auto const char* vp = dsgw_getvp( DSGW_CGINUM_EDIT ); - /* urlprefix = vp + "?&context=CONTEXT&dn=": */ - auto const size_t vplen = strlen (vp); - urlprefix = dsgw_ch_malloc (vplen + 6 + strlen(context) + 9); - memcpy( urlprefix, vp, vplen ); - strcat( urlprefix, "?&context="); - strcat( urlprefix, context); - strcat( urlprefix, "&dn="); + urlprefix = PR_smprintf("%s?context=%s&dn=", + dsgw_getvp( DSGW_CGINUM_EDIT ), context); } else { urlprefix = dsgw_build_urlprefix(); } @@ -2131,7 +2123,7 @@ dsgw_emits( "\n" ); } - free( urlprefix ); + PR_smprintf_free( urlprefix ); } @@ -2587,6 +2579,7 @@ } dsgw_emitf( "\n" + "\n" "\n", buttonlabel, encodeddn ); } @@ -3127,11 +3120,7 @@ int32_t myStrlen = 0; /* Create a Date/Time Format using the locale */ - if (countri) { - locale = PR_smprintf("%s_%s", langwich, countri); - } else { - locale = PR_smprintf("%s", langwich); - } + locale = dsgw_get_locale_from_accept_language(); edatefmt = udat_open( UDAT_DEFAULT, /* default date style for locale */ @@ -3141,24 +3130,10 @@ NULL, 0, /* no pattern */ &err); - PR_smprintf_free(locale); + free(locale); locale = NULL; if (!edatefmt || (err != U_ZERO_ERROR)) { - if (edatefmt) { - udat_close(edatefmt); - } - err = U_ZERO_ERROR; - edatefmt = udat_open( - UDAT_DEFAULT, /* default date style for locale */ - UDAT_DEFAULT, /* default time style for locale */ - gc->gc_DefaultLanguage, /* default language */ - NULL, 0, /* use default timezone */ - NULL, 0, /* no pattern */ - &err); - } - - if (!edatefmt || (err != U_ZERO_ERROR)) { dsgw_error( DSGW_ERR_LDAPGENERAL, NULL, DSGW_ERROPT_EXIT, err, NULL ); /*fprintf(stderr, "ERROR: NLS_NewDateTimeFormat(0): %d\n", err);*/ } Index: htmlout.c =================================================================== RCS file: /cvs/dirsec/dsgw/htmlout.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- htmlout.c 19 Feb 2008 15:20:21 -0000 1.3 +++ htmlout.c 27 Feb 2008 03:36:50 -0000 1.4 @@ -514,6 +514,47 @@ return; } +void +dsgw_emit_confirm_script() +{ + char *yes_key_str = dsgw_get_cgi_var("YES", DSGW_CGIVAR_OPTIONAL); +/* char *no_key_str = dsgw_get_cgi_var("NO", DSGW_CGIVAR_OPTIONAL); unused apparently */ + int yes_key, no_key; + char *yes = NULL, *no = NULL; + + if (!yes_key_str) { + yes_key = 0; + } else if (!strcasecmp(yes_key_str, "CONFIRMVALUE1")) { + yes_key = DBT_confirmValue1; + } else if (!strcasecmp(yes_key_str, "CONFIRMVALUE2")) { + yes_key = DBT_confirmValue2; + } else if (!strcasecmp(yes_key_str, "CONFIRMVALUE3")) { + yes_key = DBT_confirmValue3; + } else if (!strcasecmp(yes_key_str, "CONFIRMVALUE4")) { + yes_key = DBT_confirmValue4; + } else if (!strcasecmp(yes_key_str, "CONFIRMVALUE5")) { + yes_key = DBT_confirmValue5; + } + no_key = 0; /* unused apparently */ + + yes = XP_GetClientStr(yes_key); + + dsgw_emitf ("\n"); + + return; +} + /* emacs settings Local Variables: Index: htmlparse.c =================================================================== RCS file: /cvs/dirsec/dsgw/htmlparse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- htmlparse.c 14 Jan 2008 22:58:30 -0000 1.2 +++ htmlparse.c 27 Feb 2008 03:36:50 -0000 1.3 @@ -439,7 +439,7 @@ dsgw_emits ("\n"); - } - + dsgw_emit_confirm_script(); } else if ( dsgw_directive_is( line, "DS_CONFIRM_BUTTON_OK" )) { dsgw_emitf ("\n", XP_GetClientStr(DBT_ok_2)); Index: ldaputil.c =================================================================== RCS file: /cvs/dirsec/dsgw/ldaputil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ldaputil.c 19 Feb 2008 15:20:21 -0000 1.3 +++ ldaputil.c 27 Feb 2008 03:36:50 -0000 1.4 @@ -535,10 +535,9 @@ void dsgw_ldapurl_search( LDAP *ld, char *ldapurl ) { - int rc, ec, saveport, did_init_ldap; + int rc, ec, did_init_ldap; LDAPMessage *msgp; LDAPURLDesc *ludp; - char *saveserver; unsigned long no_options = 0; int one_attr = 0; @@ -562,10 +561,6 @@ } if ( ld == NULL ) { - saveserver = gc->gc_ldapserver; - gc->gc_ldapserver = ludp->lud_host; - saveport = gc->gc_ldapport; - gc->gc_ldapport = ludp->lud_port; one_attr = ( ludp->lud_attrs != NULL && ludp->lud_attrs[ 0 ] != NULL && ludp->lud_attrs[ 1 ] == NULL ); (void)dsgw_init_ldap( &ld, NULL, 0, one_attr ); did_init_ldap = 1; @@ -593,8 +588,6 @@ if ( did_init_ldap ) { ldap_unbind( ld ); - gc->gc_ldapserver = saveserver; - gc->gc_ldapport = saveport; } } Index: newentry.c =================================================================== RCS file: /cvs/dirsec/dsgw/newentry.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- newentry.c 14 Jan 2008 22:58:30 -0000 1.2 +++ newentry.c 27 Feb 2008 03:36:50 -0000 1.3 @@ -251,57 +251,29 @@ static char* compute_newurl() { - char *tmplname = "tmplname="; - size_t tmplnamelen = strlen(tmplname); - auto char* entryType = dsgw_get_cgi_var( "entrytype", DSGW_CGIVAR_REQUIRED ); - auto char* entryName = dsgw_get_cgi_var( "entryname", DSGW_CGIVAR_REQUIRED ); - auto char* rdnTag = dsgw_get_cgi_var( "rdntag", DSGW_CGIVAR_REQUIRED ); - auto char* dnSuffix = dsgw_get_cgi_var( "selectLocation", DSGW_CGIVAR_OPTIONAL ); - auto size_t entryTypeLen = strlen (entryType); - auto size_t entryNameLen = strlen (entryName); - auto size_t rdnTagLen = strlen (rdnTag); - auto size_t dnSuffixLen; - auto char* dn; - auto char* newurl = NULL; + char* entryType = dsgw_get_cgi_var( "entrytype", DSGW_CGIVAR_REQUIRED ); + char* entryName = dsgw_get_cgi_var( "entryname", DSGW_CGIVAR_REQUIRED ); + char* rdnTag = dsgw_get_cgi_var( "rdntag", DSGW_CGIVAR_REQUIRED ); + char* dnSuffix = dsgw_get_cgi_var( "selectLocation", DSGW_CGIVAR_OPTIONAL ); + char* dn; + char* edn; + char* newurl = NULL; + int escapeName = (strchr (entryName, ',') || strchr (entryName, ';')); if (!dnSuffix || !*dnSuffix) { dnSuffix = dsgw_get_cgi_var( "dnsuffix", DSGW_CGIVAR_REQUIRED ); } - dnSuffixLen = strlen (dnSuffix); - dn = dsgw_ch_malloc (rdnTagLen + 1 + entryNameLen + 2 + 1 + dnSuffixLen + 1); - memcpy (dn, rdnTag, rdnTagLen + 1); - strcat (dn, "="); - if ( strchr (entryName, ',') || strchr (entryName, ';') ) { - strcat (dn, "\""); - strcat (dn, entryName); - strcat (dn, "\""); - } else { - strcat (dn, entryName); - } - strcat (dn, ","); - strcat (dn, dnSuffix); - { - auto char* edn = dsgw_strdup_escaped (dn); - auto const char* const prefix = DSGW_URLPREFIX_CGI_HTTP "edit?"; - auto const char* const suffix = "&ADD=1"; - auto const size_t ednLen = strlen (edn); - auto const size_t prefixLen = strlen (prefix); - auto const size_t suffixLen = strlen (suffix); - auto const size_t contextLen = strlen (context) + 9; - - newurl = dsgw_ch_malloc (prefixLen + tmplnamelen + entryTypeLen + contextLen + suffixLen + 4 + ednLen + 1); - - memcpy (newurl, prefix, prefixLen + 1); - strcat (newurl, tmplname); - strcat (newurl, entryType); - strcat (newurl, "&context="); - strcat (newurl, context); - strcat (newurl, suffix); - strcat (newurl, "&dn="); - strcat (newurl, edn); - free (edn); - } - free (dn); + dn = PR_smprintf("%s=%s%s%s,%s", + rdnTag, escapeName ? "\"" : "", + entryName, escapeName ? "\"" : "", + dnSuffix); + edn = dsgw_strdup_escaped (dn); + free(dn); + + newurl = PR_smprintf(DSGW_URLPREFIX_CGI_HTTP "%s?tmplname=%s&context=%s&ADD=1&dn=%s", + dsgw_getvp( DSGW_CGINUM_EDIT ), entryType, context, edn); + free(edn); + return newurl; } @@ -357,7 +329,7 @@ static void post_request() { - auto char* newurl = compute_newurl(); + char* newurl = compute_newurl(); if (client_is_authenticated()) { /* Direct the client to GET newurl */ dsgw_emits ("" ); @@ -416,3 +388,11 @@ } exit( 0 ); } + +/* + emacs settings + Local Variables: + indent-tabs-mode: t + tab-width: 8 + End: +*/ Index: search.c =================================================================== RCS file: /cvs/dirsec/dsgw/search.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- search.c 14 Jan 2008 22:58:30 -0000 1.2 +++ search.c 27 Feb 2008 03:36:50 -0000 1.3 @@ -150,10 +150,8 @@ argc > 0 ? argv[0] : ""); dsgw_emitf ("\n" "\n" - "\n" - "\n" - "\n", - gc->gc_ldapsearchbase, gc->gc_ldapserver, gc->gc_ldapport ); + "\n", + gc->gc_ldapsearchbase ); } else if ( dsgw_directive_is( line, "DS_SEARCH_BASE" )) { #ifdef NOTFORNOW /* ldap_dn2ufn currently gobbles up 'dc' so don't use */ @@ -201,3 +199,11 @@ } dsgw_emits( "\n" ); } + +/* + emacs settings + Local Variables: + indent-tabs-mode: t + tab-width: 8 + End: +*/ From fedora-directory-commits at redhat.com Wed Feb 27 03:36:53 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:53 -0500 Subject: [Fedora-directory-commits] dsgw/pbconfig list-Auth.html.in,1.1,1.2 Message-ID: <200802270337.m1R3bNrB031066@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/pbconfig In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/pbconfig Modified Files: list-Auth.html.in Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) Index: list-Auth.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/pbconfig/list-Auth.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- list-Auth.html.in 14 Jan 2008 22:31:23 -0000 1.1 +++ list-Auth.html.in 27 Feb 2008 03:36:50 -0000 1.2 @@ -76,6 +76,9 @@ > + +> From fedora-directory-commits at redhat.com Wed Feb 27 03:36:53 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:53 -0500 Subject: [Fedora-directory-commits] dsgw/tests setup.sh, 1.4, 1.5 valgrind.supp, 1.1, 1.2 Message-ID: <200802270337.m1R3bN6V031070@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests Modified Files: setup.sh valgrind.supp Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) Index: setup.sh =================================================================== RCS file: /cvs/dirsec/dsgw/tests/setup.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- setup.sh 19 Feb 2008 15:20:22 -0000 1.4 +++ setup.sh 27 Feb 2008 03:36:51 -0000 1.5 @@ -1,7 +1,7 @@ #!/bin/sh testdir="$1" -sroot=/NotBackedUp/$USER/11srv +sroot=/home/$USER/11srv port=1100 secport=1101 rootdn="cn=directory manager" @@ -32,7 +32,7 @@ fi if [ "$needdata" ] ; then -$sroot/lib/dirsrv/slapd-localhost/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i $sroot/share/dirsrv/data/Example.ldif +$sroot/lib/dirsrv/slapd-vmhost/ldif2db.pl -D "$rootdn" -w "$rootpw" -n userRoot -i $sroot/share/dirsrv/data/Example.ldif sleep 10 fi @@ -81,8 +81,6 @@ #export ADMSERV_CONF_DIR #ADMSERV_LOG_DIR=$dir/testtmp #export ADMSERV_LOG_DIR -HTTP_ACCEPT_LANGUAGE=en -export HTTP_ACCEPT_LANGUAGE SERVER_URL=http://localhost export SERVER_URL @@ -98,17 +96,19 @@ #VGPREFIX="valgrind --tool=memcheck --leak-check=yes --suppressions=$HOME/valgrind.supp --num-callers=40 --suppressions=$testdir/valgrind.supp " # These are CGI programs - they assume they will run for a very short period of time - they use exit() instead of free() :P VGPREFIX="valgrind --tool=memcheck --leak-check=no --suppressions=$HOME/valgrind.supp --num-callers=40 --suppressions=$testdir/valgrind.supp " -#GDB="gdb -x .gdbinit " +GDB="gdb -x .gdbinit " DEBUGCMD=VALGRIND #DEBUGCMD="$GDB" -PROGS="dnedit" +PROGS="lang" # use scripts for orgchart perl scripts SCRIPTS="" #ClientLanguage=en_US ; export ClientLanguage HTTP_ACCEPT_LANGUAGE=en_US ; export HTTP_ACCEPT_LANGUAGE +#HTTP_COOKIE='nsdsgwauth=rndstr:cn=directory manager' ; export HTTP_COOKIE + runATest() { prog="$1" shift @@ -146,6 +146,7 @@ if [ -f /tmp/$prog.debug.$basetest ] ; then echo "break main" > .gdbinit else + echo no match /tmp/$prog.debug.$basetest rm -f .gdbinit fi if [ $type = "POST" ] ; then @@ -192,9 +193,9 @@ ctxnum=1 for ctx in "" "/" "." "../../../" "somebogusvalue" "pb" "dsgw" ; do if [ -s "$test" ] ; then - runATest "$prog" GET "$test" .$ctxnum "&context=$ctx&binddn=$rootdn&passwd=$rootpw" + runATest "$prog" GET "$test" .$ctxnum "&context=$ctx&binddn=$rootdn&passwd=$rootpw&password=$rootpw" else - runATest "$prog" GET "$test" .$ctxnum "context=$ctx&binddn=$rootdn&passwd=$rootpw" + runATest "$prog" GET "$test" .$ctxnum "context=$ctx&binddn=$rootdn&passwd=$rootpw&password=$rootpw" fi ctxnum=`expr $ctxnum + 1` done @@ -211,7 +212,7 @@ runATest "$prog" POST "$test" ctxnum=1 for ctx in "" "/" "." "../../../" "somebogusvalue" "pb" "dsgw" ; do - runATest "$prog" POST "$test" .$ctxnum "&context=$ctx&binddn=$rootdn&passwd=$rootpw" + runATest "$prog" POST "$test" .$ctxnum "&context=$ctx&binddn=$rootdn&passwd=$rootpw&password=$rootpw" ctxnum=`expr $ctxnum + 1` done done Index: valgrind.supp =================================================================== RCS file: /cvs/dirsec/dsgw/tests/valgrind.supp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- valgrind.supp 9 Feb 2008 18:24:23 -0000 1.1 +++ valgrind.supp 27 Feb 2008 03:36:51 -0000 1.2 @@ -4,7 +4,13 @@ fun:__strcpy_chk fun:entryOpen fun:ures_open_3_6 - fun:res_getstring +} +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + obj:/usr/lib64/libicuuc.so.36.0 + fun:ures_open_3_6 } { Problem with ICU @@ -14,7 +20,6 @@ fun:findFirstExisting fun:entryOpen fun:ures_open_3_6 - fun:res_getstring } { Problem with ICU @@ -23,7 +28,6 @@ fun:init_entry fun:entryOpen fun:ures_open_3_6 - fun:res_getstring } { Problem with ICU @@ -31,7 +35,6 @@ fun:dsgw_vxprintf fun:dsgw_emitfv fun:dsgw_emitf - fun:dsgw_html_begin } { Problem with sasl @@ -40,3 +43,60 @@ fun:_sasl_load_plugins fun:sasl_client_init } +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + fun:entryOpen + fun:ures_open_3_6 + fun:ucol_open_internal_3_6 + fun:ucol_open_3_6 +} +{ + Problem with ICU + Memcheck:Cond + fun:u_strlen_3_6 + fun:dsgw_strkeygen + fun:dsgw_keygen +} +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + fun:init_entry + fun:findFirstExisting + fun:entryOpen + fun:ures_openDirect_3_6 +} +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + obj:/usr/lib64/libicuuc.so.36.0 + obj:/usr/lib64/libicuuc.so.36.0 + obj:/usr/lib64/libicuuc.so.36.0 + fun:ures_openDirect_3_6 +} +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + fun:ures_getFunctionalEquivalent_3_6 +} +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + obj:/usr/lib64/libicuuc.so.36.0 + obj:/usr/lib64/libicuuc.so.36.0 + obj:/usr/lib64/libicuuc.so.36.0 + fun:ures_open_3_6 +} +{ + Problem with ICU + Memcheck:Cond + fun:__strcpy_chk + obj:/usr/lib64/libicuuc.so.36.0 + obj:/usr/lib64/libicuuc.so.36.0 + fun:ures_open_3_6 +} From fedora-directory-commits at redhat.com Wed Feb 27 03:36:53 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 26 Feb 2008 22:36:53 -0500 Subject: [Fedora-directory-commits] dsgw/tests/doauth testpost.4,1.1,1.2 Message-ID: <200802270337.m1R3bN8c031073@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/doauth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30811/dsgw/tests/doauth Modified Files: testpost.4 Log Message: 1) There were several places where DSGW would output and eval arbitrary javascript code passed in a CGI parameter. These have been replaced with resource strings. In all cases the values were output escaped, but still, we shouldn't be passing around bits of javascript code to execute. 2) ICU provides a function which can parse the HTTP_ACCEPT_LANGUAGE string and return the most appropriate locale, so we should use that for date calculation. 3) Found a couple of places where uninitialized values could be used, and fixed them. 4) Used PR_smprintf to simplify some strlen+malloc+strcpy+strcat code. 5) dsgw_get_cgi_var will check for NULL input 6) Do not pass in the ldap host and port in form parameters. Always just use the values from the config file. 7) Added many new tests and valgrind suppressions (almost all from ICU) Index: testpost.4 =================================================================== RCS file: /cvs/dirsec/dsgw/tests/doauth/testpost.4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- testpost.4 7 Feb 2008 22:46:57 -0000 1.1 +++ testpost.4 27 Feb 2008 03:36:51 -0000 1.2 @@ -1 +1 @@ -authdesturl=_authdesturl_param_ \ No newline at end of file +authdesturl=http://badhost \ No newline at end of file From fedora-directory-commits at redhat.com Wed Feb 27 16:59:13 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 27 Feb 2008 11:59:13 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile.in, 1.83, 1.84 aclocal.m4, 1.62, 1.63 config.guess, 1.46, 1.47 config.h.in, 1.13, 1.14 config.sub, 1.46, 1.47 configure, 1.79, 1.80 configure.ac, 1.45, 1.46 depcomp, 1.47, 1.48 install-sh, 1.47, 1.48 missing, 1.47, 1.48 Message-ID: <200802271659.m1RGxDEQ031562@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31481 Modified Files: Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing Log Message: Resolves bug 434403 View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.83 -r 1.84 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- Makefile.in 19 Feb 2008 06:04:55 -0000 1.83 +++ Makefile.in 27 Feb 2008 16:59:11 -0000 1.84 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,11 +18,15 @@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -43,11 +47,11 @@ pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT) noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c -subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure compile config.guess config.sub \ depcomp install-sh ltmain.sh missing +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ $(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/mozldap.m4 \ @@ -57,7 +61,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno + configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -122,9 +126,6 @@ ldap/servers/plugins/shared/libattr_unique_plugin_la-utils.lo libattr_unique_plugin_la_OBJECTS = \ $(am_libattr_unique_plugin_la_OBJECTS) -libattr_unique_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libattr_unique_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libback_ldbm_la_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) am_libback_ldbm_la_OBJECTS = \ ldap/servers/slapd/back-ldbm/libback_ldbm_la-ancestorid.lo \ @@ -187,16 +188,10 @@ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_key.lo \ ldap/servers/slapd/back-ldbm/libback_ldbm_la-vlv_srch.lo libback_ldbm_la_OBJECTS = $(am_libback_ldbm_la_OBJECTS) -libback_ldbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libback_ldbm_la_LDFLAGS) $(LDFLAGS) -o $@ libbitwise_plugin_la_LIBADD = am_libbitwise_plugin_la_OBJECTS = \ ldap/servers/plugins/bitwise/libbitwise_plugin_la-bitwise.lo libbitwise_plugin_la_OBJECTS = $(am_libbitwise_plugin_la_OBJECTS) -libbitwise_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libbitwise_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @enable_bitwise_TRUE at am_libbitwise_plugin_la_rpath = -rpath \ @enable_bitwise_TRUE@ $(serverplugindir) libchainingdb_plugin_la_LIBADD = @@ -227,9 +222,6 @@ ldap/servers/plugins/chainingdb/libchainingdb_plugin_la-cb_utils.lo libchainingdb_plugin_la_OBJECTS = \ $(am_libchainingdb_plugin_la_OBJECTS) -libchainingdb_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libchainingdb_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libcollation_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libcollation_plugin_la_OBJECTS = ldap/servers/plugins/collation/libcollation_plugin_la-collate.lo \ @@ -241,46 +233,25 @@ ldap/servers/plugins/cos/libcos_plugin_la-cos.lo \ ldap/servers/plugins/cos/libcos_plugin_la-cos_cache.lo libcos_plugin_la_OBJECTS = $(am_libcos_plugin_la_OBJECTS) -libcos_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libcos_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdes_plugin_la_LIBADD = am_libdes_plugin_la_OBJECTS = \ ldap/servers/plugins/rever/libdes_plugin_la-des.lo \ ldap/servers/plugins/rever/libdes_plugin_la-rever.lo libdes_plugin_la_OBJECTS = $(am_libdes_plugin_la_OBJECTS) -libdes_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libdes_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdistrib_plugin_la_LIBADD = am_libdistrib_plugin_la_OBJECTS = \ ldap/servers/plugins/distrib/libdistrib_plugin_la-distrib.lo libdistrib_plugin_la_OBJECTS = $(am_libdistrib_plugin_la_OBJECTS) -libdistrib_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libdistrib_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libdna_plugin_la_LIBADD = am_libdna_plugin_la_OBJECTS = \ ldap/servers/plugins/dna/libdna_plugin_la-dna.lo libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS) -libdna_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libdna_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ @enable_dna_TRUE at am_libdna_plugin_la_rpath = -rpath $(serverplugindir) libhttp_client_plugin_la_LIBADD = am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \ ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo libhttp_client_plugin_la_OBJECTS = \ $(am_libhttp_client_plugin_la_OBJECTS) -libhttp_client_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libhttp_client_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ -libmemberof_plugin_la_LIBADD = -am_libmemberof_plugin_la_OBJECTS = ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo -libmemberof_plugin_la_OBJECTS = $(am_libmemberof_plugin_la_OBJECTS) -libmemberof_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libmemberof_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libns_dshttpd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -352,10 +323,6 @@ ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptpreop.lo libpam_passthru_plugin_la_OBJECTS = \ $(am_libpam_passthru_plugin_la_OBJECTS) -libpam_passthru_plugin_la_LINK = $(LIBTOOL) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libpam_passthru_plugin_la_LDFLAGS) \ - $(LDFLAGS) -o $@ @enable_pam_passthru_TRUE at am_libpam_passthru_plugin_la_rpath = -rpath \ @enable_pam_passthru_TRUE@ $(serverplugindir) libpassthru_plugin_la_LIBADD = @@ -367,15 +334,9 @@ ldap/servers/plugins/passthru/libpassthru_plugin_la-ptpreop.lo \ ldap/servers/plugins/passthru/libpassthru_plugin_la-ptutil.lo libpassthru_plugin_la_OBJECTS = $(am_libpassthru_plugin_la_OBJECTS) -libpassthru_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libpassthru_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libpresence_plugin_la_LIBADD = am_libpresence_plugin_la_OBJECTS = ldap/servers/plugins/presence/libpresence_plugin_la-presence.lo libpresence_plugin_la_OBJECTS = $(am_libpresence_plugin_la_OBJECTS) -libpresence_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libpresence_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libpwdstorage_plugin_la_LIBADD = am_libpwdstorage_plugin_la_OBJECTS = ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-clear_pwd.lo \ ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-crypt_pwd.lo \ @@ -387,15 +348,9 @@ ldap/servers/plugins/pwdstorage/libpwdstorage_plugin_la-ssha_pwd.lo libpwdstorage_plugin_la_OBJECTS = \ $(am_libpwdstorage_plugin_la_OBJECTS) -libpwdstorage_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libpwdstorage_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libreferint_plugin_la_LIBADD = am_libreferint_plugin_la_OBJECTS = ldap/servers/plugins/referint/libreferint_plugin_la-referint.lo libreferint_plugin_la_OBJECTS = $(am_libreferint_plugin_la_OBJECTS) -libreferint_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libreferint_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplication_plugin_la-cl5_api.lo \ @@ -454,9 +409,6 @@ ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo libreplication_plugin_la_OBJECTS = \ $(am_libreplication_plugin_la_OBJECTS) -libreplication_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libreplication_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ libretrocl_plugin_la_LIBADD = am_libretrocl_plugin_la_OBJECTS = \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo \ @@ -466,17 +418,11 @@ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_rootdse.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo libretrocl_plugin_la_OBJECTS = $(am_libretrocl_plugin_la_OBJECTS) -libretrocl_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ [...5946 lines suppressed...] + test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)" @list='$(property_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -8788,7 +8704,7 @@ done install-sampledataDATA: $(sampledata_DATA) @$(NORMAL_INSTALL) - test -z "$(sampledatadir)" || $(MKDIR_P) "$(DESTDIR)$(sampledatadir)" + test -z "$(sampledatadir)" || $(mkdir_p) "$(DESTDIR)$(sampledatadir)" @list='$(sampledata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -8805,7 +8721,7 @@ done install-schemaDATA: $(schema_DATA) @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" + test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)" @list='$(schema_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -8871,22 +8787,24 @@ distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + mkdir $(distdir) + $(mkdir_p) $(distdir)/m4 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -8900,7 +8818,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -8975,7 +8893,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -9001,7 +8919,7 @@ $(DATA) config.h installdirs: for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -9043,8 +8961,6 @@ -rm -f ldap/servers/plugins/dna/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(am__dirstamp) - -rm -f ldap/servers/plugins/memberof/$(DEPDIR)/$(am__dirstamp) - -rm -f ldap/servers/plugins/memberof/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(am__dirstamp) -rm -f ldap/servers/plugins/passthru/$(DEPDIR)/$(am__dirstamp) @@ -9111,7 +9027,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/memberof/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slap! d/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -9133,27 +9049,19 @@ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-taskSCRIPTS -install-dvi: install-dvi-am - install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-sbinPROGRAMS install-sbinSCRIPTS -install-html: install-html-am - install-info: install-info-am install-man: -install-pdf: install-pdf-am - -install-ps: install-ps-am - installcheck-am: maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/memberof/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slap! d/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -9171,15 +9079,14 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-infDATA uninstall-initSCRIPTS \ - uninstall-initconfigSCRIPTS uninstall-mibDATA \ - uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ - uninstall-propertyDATA uninstall-sampledataDATA \ - uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ - uninstall-schemaDATA uninstall-serverLTLIBRARIES \ - uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS - -.MAKE: install-am install-strip + uninstall-configDATA uninstall-infDATA uninstall-info-am \ + uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \ + uninstall-mibDATA uninstall-nodist_propertyDATA \ + uninstall-perlSCRIPTS uninstall-propertyDATA \ + uninstall-sampledataDATA uninstall-sbinPROGRAMS \ + uninstall-sbinSCRIPTS uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ + uninstall-taskSCRIPTS .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ @@ -9191,27 +9098,27 @@ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-binSCRIPTS install-configDATA \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ + install-data install-data-am install-exec install-exec-am \ install-infDATA install-info install-info-am \ install-initSCRIPTS install-initconfigSCRIPTS install-man \ - install-mibDATA install-nodist_propertyDATA install-pdf \ - install-pdf-am install-perlSCRIPTS install-propertyDATA \ - install-ps install-ps-am install-sampledataDATA \ - install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \ + install-mibDATA install-nodist_propertyDATA \ + install-perlSCRIPTS install-propertyDATA \ + install-sampledataDATA install-sbinPROGRAMS \ + install-sbinSCRIPTS install-schemaDATA \ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-strip install-taskSCRIPTS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-configDATA uninstall-infDATA uninstall-initSCRIPTS \ - uninstall-initconfigSCRIPTS uninstall-mibDATA \ - uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ - uninstall-propertyDATA uninstall-sampledataDATA \ - uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ - uninstall-schemaDATA uninstall-serverLTLIBRARIES \ - uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS + uninstall-configDATA uninstall-infDATA uninstall-info-am \ + uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \ + uninstall-mibDATA uninstall-nodist_propertyDATA \ + uninstall-perlSCRIPTS uninstall-propertyDATA \ + uninstall-sampledataDATA uninstall-sbinPROGRAMS \ + uninstall-sbinSCRIPTS uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ + uninstall-taskSCRIPTS dirver.h: Makefile Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- aclocal.m4 19 Feb 2008 06:04:55 -0000 1.62 +++ aclocal.m4 27 Feb 2008 16:59:11 -0000 1.63 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,14 +11,9 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 48 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -181,7 +176,7 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -268,9 +263,8 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* @@ -282,9 +276,8 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -300,20 +293,12 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -544,17 +529,13 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -570,11 +551,7 @@ esac ;; *64-bit*) - libsuff=64 case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -646,7 +623,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -687,12 +664,11 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_CACHE_CHECK([$1], [$2], +[AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext + printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -806,27 +782,24 @@ fi ;; *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ;; esac ]) @@ -1053,8 +1026,7 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -1062,7 +1034,7 @@ mkdir conftest cd conftest mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1202,7 +1174,6 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1220,8 +1191,7 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1235,58 +1205,20 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -m4_if($1,[],[ if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) +fi need_lib_prefix=unknown hardcode_into_libs=no @@ -1443,8 +1375,12 @@ shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1461,6 +1397,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1498,7 +1446,7 @@ shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - *) # from 4.6 on, and DragonFly + freebsd*) # from 4.6 on shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -1561,7 +1509,7 @@ postinstall_cmds='chmod 555 $lib' ;; -interix[[3-9]]*) +interix3*) version_type=linux need_lib_prefix=no need_version=no @@ -1616,7 +1564,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux*) version_type=linux need_lib_prefix=no need_version=no @@ -1629,13 +1577,28 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1647,6 +1610,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -1728,10 +1703,6 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -rdos*) - dynamic_linker=no - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -1837,8 +1808,7 @@ # _LT_AC_TAGCONFIG # ---------------- AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], +[AC_ARG_WITH([tags], [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], [include additional configurations @<:@automatic@:>@])], [tagnames="$withval"]) @@ -2099,7 +2069,7 @@ # AC_PATH_TOOL_PREFIX # ------------------- -# find a file program which can recognize shared library +# find a file program which can recognise shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_MSG_CHECKING([for $1]) @@ -2162,7 +2132,7 @@ # AC_PATH_MAGIC # ------------- -# find a file program which can recognize a shared library +# find a file program which can recognise a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -2309,7 +2279,7 @@ # how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognize dependent libraries], +[AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -2348,22 +2318,16 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -2401,7 +2365,7 @@ esac ;; -interix[[3-9]]*) +interix3*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ;; @@ -2417,7 +2381,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux*) lt_cv_deplibs_check_method=pass_all ;; @@ -2451,10 +2415,6 @@ lt_cv_deplibs_check_method=pass_all ;; -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -2507,7 +2467,7 @@ lt_cv_path_NM="$NM" else lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do @@ -2723,10 +2683,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +lt_simple_link_test_code='int main(){return(0);}\n' _LT_AC_SYS_COMPILER @@ -2828,10 +2788,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" +lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2977,7 +2937,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - : + _LT_AC_TAGVAR(hardcode_direct, $1)=yes else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -3136,10 +3096,10 @@ case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -3173,7 +3133,7 @@ freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3222,7 +3182,9 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in - hppa*64*|ia64*) ;; + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + ;; *) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; @@ -3290,7 +3252,7 @@ ;; esac ;; - interix[[3-9]]*) + interix3*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -3330,7 +3292,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - linux* | k*bsd*-gnu) + linux*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -3410,29 +3372,6 @@ # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; esac ;; lynxos*) @@ -3471,20 +3410,16 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi + output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -3646,10 +3581,15 @@ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -3696,12 +3636,6 @@ fi _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac fi ;; esac @@ -3945,7 +3879,7 @@ # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in -interix[[3-9]]*) +interix3*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. _LT_AC_TAGVAR(predep_objects,$1)= @@ -3953,46 +3887,13 @@ _LT_AC_TAGVAR(postdeps,$1)= ;; -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - solaris*) case $cc_basename in CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' ;; esac ;; @@ -4041,17 +3942,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" +lt_simple_compile_test_code=" subroutine t\n return\n end\n" # Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" +lt_simple_link_test_code=" program t\n end\n" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4130,10 +4024,10 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" +lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4186,7 +4080,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -4275,7 +4169,6 @@ _LT_AC_TAGVAR(module_cmds, $1) \ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ _LT_AC_TAGVAR(exclude_expsyms, $1) \ _LT_AC_TAGVAR(include_expsyms, $1); do @@ -4322,7 +4215,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4412,6 +4305,9 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -4545,11 +4441,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -4561,7 +4457,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4641,13 +4537,13 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path +fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" # Set to yes if exported symbols are required. always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) @@ -4730,7 +4626,6 @@ # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([LT_AC_PROG_SED]) AC_REQUIRE([AC_PROG_NM]) AC_REQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -4767,7 +4662,7 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux* | k*bsd*-gnu) +linux*) if test "$host_cpu" = ia64; then symcode='[[ABCDGIRSTW]]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -4957,14 +4852,12 @@ # like `-m68040'. _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | os2* | pw32*) + mingw* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -4976,7 +4869,7 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix[[3-9]]*) + interix3*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -5042,7 +4935,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -5085,7 +4978,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -5112,14 +5005,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac ;; esac ;; @@ -5240,15 +5125,13 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; @@ -5258,7 +5141,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix[[3-9]]*) + interix3*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -5316,7 +5199,7 @@ esac ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' @@ -5349,7 +5232,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux* | k*bsd*-gnu) + linux*) case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -5368,22 +5251,6 @@ # All Alpha code is PIC. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; esac ;; @@ -5393,10 +5260,6 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - solaris*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5491,8 +5354,7 @@ # ------------------------------------ # See if the linker supports building shared libraries. AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -5509,7 +5371,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -5648,7 +5510,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -5666,7 +5528,7 @@ fi ;; - interix[[3-9]]*) + interix3*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -5681,7 +5543,7 @@ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | k*bsd*-gnu) + linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -5699,22 +5561,13 @@ ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi else _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5754,7 +5607,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -5873,7 +5726,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - : + _LT_AC_TAGVAR(hardcode_direct, $1)=yes else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5966,7 +5819,7 @@ # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; @@ -6008,10 +5861,10 @@ case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -6051,7 +5904,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | kfreebsd*-gnu | dragonfly*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -6173,28 +6026,24 @@ ;; openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else - _LT_AC_TAGVAR(ld_shlibs, $1)=no + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac fi ;; @@ -6253,16 +6102,17 @@ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; + case $wlarc in + '') + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6319,7 +6169,7 @@ fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6394,7 +6244,7 @@ # to ld, don't add -lc before -lgcc. AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest @@ -6497,30 +6347,6 @@ [AC_CHECK_TOOL(RC, windres, no) ]) - -# Cheap backport of AS_EXECUTABLE_P and required macros -# from Autoconf 2.59; we should not use $as_executable_p directly. - -# _AS_TEST_PREPARE -# ---------------- -m4_ifndef([_AS_TEST_PREPARE], -[m4_defun([_AS_TEST_PREPARE], -[if test -x / >/dev/null 2>&1; then - as_executable_p='test -x' -else - as_executable_p='test -f' -fi -])])# _AS_TEST_PREPARE - -# AS_EXECUTABLE_P -# --------------- -# Check whether a file is executable. -m4_ifndef([AS_EXECUTABLE_P], -[m4_defun([AS_EXECUTABLE_P], -[AS_REQUIRE([_AS_TEST_PREPARE])dnl -$as_executable_p $1[]dnl -])])# AS_EXECUTABLE_P - # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # # a released version of Autoconf we should remove this # @@ -6541,7 +6367,7 @@ test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done @@ -6584,7 +6410,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6594,29 +6420,14 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6673,14 +6484,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -6689,10 +6500,8 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) if $2; then $1_TRUE= $1_FALSE='#' @@ -6706,14 +6515,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -6741,7 +6551,6 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -6807,7 +6616,6 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -6860,8 +6668,7 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([AMDEPBACKSLASH]) ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -6886,9 +6693,8 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6935,8 +6741,8 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6959,20 +6765,16 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.58])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi # test whether we have cygpath @@ -6992,9 +6794,6 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -7030,10 +6829,6 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -7069,7 +6864,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -7174,14 +6969,13 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 3 # AM_PROG_CC_C_O # -------------- @@ -7189,7 +6983,6 @@ AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC @@ -7202,22 +6995,18 @@ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" CC="$am_aux_dir/compile $CC" fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7233,7 +7022,6 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -7244,7 +7032,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7252,23 +7040,60 @@ # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) # Helper functions for option handling. -*- Autoconf -*- @@ -7380,21 +7205,9 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. Index: config.guess =================================================================== RCS file: /cvs/dirsec/ldapserver/config.guess,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- config.guess 19 Feb 2008 06:04:55 -0000 1.46 +++ config.guess 27 Feb 2008 16:59:11 -0000 1.47 @@ -1,10 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2005-07-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -107,7 +106,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -207,11 +206,8 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -768,14 +764,7 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -790,11 +779,8 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -808,7 +794,7 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + amd64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -831,9 +817,6 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -868,11 +851,7 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -891,16 +870,9 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -944,9 +916,6 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; @@ -992,7 +961,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + #ifdef __INTEL_COMPILER LIBC=gnu #else LIBC=gnuaout @@ -1002,11 +971,7 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1217,6 +1182,7 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1295,9 +1261,6 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 Index: config.h.in =================================================================== RCS file: /cvs/dirsec/ldapserver/config.h.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- config.h.in 19 Feb 2008 06:04:55 -0000 1.13 +++ config.h.in 27 Feb 2008 16:59:11 -0000 1.14 @@ -335,6 +335,9 @@ /* UNIX */ #undef XP_UNIX +/* GNU Source */ +#undef _GNU_SOURCE + /* Source namespace */ #undef _HPUX_SOURCE @@ -368,7 +371,7 @@ /* Define to `int' if does not define. */ #undef pid_t -/* Define to `unsigned int' if does not define. */ +/* Define to `unsigned' if does not define. */ #undef size_t /* SunOS5 */ Index: config.sub =================================================================== RCS file: /cvs/dirsec/ldapserver/config.sub,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- config.sub 19 Feb 2008 06:04:55 -0000 1.46 +++ config.sub 27 Feb 2008 16:59:11 -0000 1.47 @@ -1,10 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -120,9 +119,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -173,10 +171,6 @@ -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -193,10 +187,6 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -241,7 +231,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -249,8 +239,7 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -268,27 +257,28 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | mt \ + | ms1 \ | msp430 \ - | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -296,9 +286,6 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; - ms1) - basic_machine=mt-unknown - ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -318,7 +305,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ + | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -329,7 +316,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -349,30 +336,31 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | mt-* \ + | ms1-* \ | msp430-* \ - | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -708,9 +696,6 @@ basic_machine=i386-pc os=-msdos ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; mvs) basic_machine=i370-ibm os=-mvs @@ -818,12 +803,6 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -880,10 +859,6 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -910,10 +885,6 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; sei) basic_machine=mips-sei os=-seiux @@ -1130,7 +1101,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1203,23 +1174,21 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1371,12 +1340,6 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; *-acorn) os=-riscix1.2 ;; @@ -1386,9 +1349,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.79 -r 1.80 configure Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- configure 19 Feb 2008 06:04:55 -0000 1.79 +++ configure 27 Feb 2008 16:59:11 -0000 1.80 @@ -1,56 +1,27 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for dirsrv 1.1.0. +# Generated by GNU Autoconf 2.59 for dirsrv 1.1.0. # # Report bugs to . # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -60,43 +31,8 @@ fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - # Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' @@ -110,19 +46,18 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -130,388 +65,157 @@ # Name of the executable. -as_me=`$as_basename -- "$0" || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : [...19491 lines suppressed...] +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -27420,32 +26758,20 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` else continue fi @@ -27467,79 +26793,53 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - esac -done # for ac_tag +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- configure.ac 19 Dec 2007 20:18:34 -0000 1.45 +++ configure.ac 27 Feb 2008 16:59:11 -0000 1.46 @@ -263,6 +263,7 @@ AC_DEFINE([LINUX2_0], [1], [Linux 2.0]) AC_DEFINE([LINUX2_2], [1], [Linux 2.2]) AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) + AC_DEFINE([_GNU_SOURCE], [1], [GNU Source]) platform="linux" # relative to sysconfdir initdir=/rc.d/init.d Index: depcomp =================================================================== RCS file: /cvs/dirsec/ldapserver/depcomp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- depcomp 19 Feb 2008 06:04:55 -0000 1.47 +++ depcomp 27 Feb 2008 16:59:11 -0000 1.48 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2005-07-09.11 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # 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 @@ -92,20 +91,7 @@ ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : else @@ -290,46 +276,6 @@ rm -f "$tmpdepfile" ;; -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -342,13 +288,13 @@ if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to + # static library. This mecanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and + # compilations output dependencies in in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is Index: install-sh =================================================================== RCS file: /cvs/dirsec/ldapserver/install-sh,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- install-sh 19 Feb 2008 06:04:55 -0000 1.47 +++ install-sh 27 Feb 2008 16:59:11 -0000 1.48 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2005-05-14.22 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -39,24 +39,15 @@ # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi -# Put in absolute file names if you don't have them in your path; -# or use environment vars. +# put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" cpprog="${CPPROG-cp}" @@ -67,13 +58,7 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -posix_glob= -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chmodcmd=$chmodprog +chmodcmd="$chmodprog 0755" chowncmd= chgrpcmd= stripcmd= @@ -110,7 +95,7 @@ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " -while test $# -ne 0; do +while test -n "$1"; do case $1 in -c) shift continue;; @@ -126,15 +111,9 @@ --help) echo "$usage"; exit $?;; - -m) mode=$2 + -m) chmodcmd="$chmodprog $2" shift shift - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac continue;; -o) chowncmd="$chownprog $2" @@ -157,33 +136,25 @@ --version) echo "$0 $scriptversion"; exit $?;; - --) shift + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; esac done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done -fi - -if test $# -eq 0; then +if test -z "$1"; then if test -z "$dir_arg"; then echo "$0: no input file specified." >&2 exit 1 @@ -193,33 +164,6 @@ exit 0 fi -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - for src do # Protect names starting with `-'. @@ -229,11 +173,15 @@ if test -n "$dir_arg"; then dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else + src= + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -260,188 +208,53 @@ echo "$0: $dstarg: Is a directory" >&2 exit 1 fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? + dst=$dst/`basename "$src"` fi fi - obsolete_mkdir_used=false + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac + # Make sure that the destination directory exists. - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; - esac - - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac - - oIFS=$IFS - IFS=/ - $posix_glob && set -f - set fnord $dstdir - shift - $posix_glob && set +f - IFS=$oIFS + pathcomp= - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit fi - fi + pathcomp=$pathcomp/ + done fi if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + else + dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -449,9 +262,10 @@ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + $doit $cpprog "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits. # @@ -462,10 +276,10 @@ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ || { # The rename failed, perhaps because mv can't rename something else # to itself, or perhaps because mv is so ancient that it does not @@ -477,12 +291,11 @@ # reasons. In this case, the final cleanup might fail but the new # file should still install successfully. { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { - echo "$0: cannot unlink or rename $dst" >&2 + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 (exit 1); exit 1 } else @@ -491,14 +304,17 @@ } && # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } - } || exit 1 - - trap '' 0 - fi + } + fi || { (exit 1); exit 1; } done +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" Index: missing =================================================================== RCS file: /cvs/dirsec/ldapserver/missing,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- missing 19 Feb 2008 06:04:55 -0000 1.47 +++ missing 27 Feb 2008 16:59:11 -0000 1.48 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -33,8 +33,6 @@ fi run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -46,7 +44,7 @@ msg="missing on your system" -case $1 in +case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -79,7 +77,6 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -109,7 +106,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case $1 in +case "$1" in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -138,7 +135,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case "$1" in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -167,7 +164,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case $f in + case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -195,8 +192,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file else @@ -217,25 +214,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if test ! -f y.tab.h; then + if [ ! -f y.tab.h ]; then echo >y.tab.h fi - if test ! -f y.tab.c; then + if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -247,18 +244,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if test ! -f lex.yy.c; then + if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -270,9 +267,11 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then touch $file else test -z "$file" || exec >$file @@ -290,17 +289,11 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -324,13 +317,13 @@ fi firstarg="$1" if shift; then - case $firstarg in + case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case $firstarg in + case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 From fedora-directory-commits at redhat.com Wed Feb 27 17:04:27 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 27 Feb 2008 12:04:27 -0500 Subject: [Fedora-directory-commits] ldapserver aclocal.m4, 1.63, 1.64 configure, 1.80, 1.81 missing, 1.48, 1.49 install-sh, 1.48, 1.49 depcomp, 1.48, 1.49 compile, 1.45, 1.46 config.guess, 1.47, 1.48 Makefile.in, 1.84, 1.85 config.sub, 1.47, 1.48 Message-ID: <200802271704.m1RH4RkX007003@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6953 Modified Files: aclocal.m4 configure missing install-sh depcomp compile config.guess Makefile.in config.sub Log Message: merge in autotool file fixes for gcc43 with the memberof autotool file additions Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- Makefile.in 27 Feb 2008 16:59:11 -0000 1.84 +++ Makefile.in 27 Feb 2008 17:04:25 -0000 1.85 @@ -252,6 +252,9 @@ ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo libhttp_client_plugin_la_OBJECTS = \ $(am_libhttp_client_plugin_la_OBJECTS) +libmemberof_plugin_la_LIBADD = +am_libmemberof_plugin_la_OBJECTS = ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo +libmemberof_plugin_la_OBJECTS = $(am_libmemberof_plugin_la_OBJECTS) libns_dshttpd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -724,7 +727,7 @@ $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \ $(libdna_plugin_la_SOURCES) \ $(libhttp_client_plugin_la_SOURCES) \ - $(libns_dshttpd_la_SOURCES) \ + $(libmemberof_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) \ $(libpam_passthru_plugin_la_SOURCES) \ $(libpassthru_plugin_la_SOURCES) \ $(libpresence_plugin_la_SOURCES) \ @@ -749,7 +752,7 @@ $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) \ $(libdna_plugin_la_SOURCES) \ $(libhttp_client_plugin_la_SOURCES) \ - $(libns_dshttpd_la_SOURCES) \ + $(libmemberof_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) \ $(libpam_passthru_plugin_la_SOURCES) \ $(libpassthru_plugin_la_SOURCES) \ $(libpresence_plugin_la_SOURCES) \ @@ -1033,7 +1036,7 @@ serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \ libback-ldbm.la libchainingdb-plugin.la libcos-plugin.la libdes-plugin.la \ libdistrib-plugin.la libhttp-client-plugin.la libcollation-plugin.la \ - libpassthru-plugin.la libpresence-plugin.la \ + libmemberof-plugin.la libpassthru-plugin.la libpresence-plugin.la \ libpwdstorage-plugin.la libreferint-plugin.la libreplication-plugin.la \ libretrocl-plugin.la libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ libviews-plugin.la $(LIBPAM_PASSTHRU_PLUGIN) $(LIBDNA_PLUGIN) $(LIBBITWISE_PLUGIN) @@ -1550,6 +1553,13 @@ libcollation_plugin_la_LINK = $(CXXLINK) #------------------------ +# libmemberof-plugin +#------------------------ +libmemberof_plugin_la_SOURCES = ldap/servers/plugins/memberof/memberof.c +libmemberof_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) +libmemberof_plugin_la_LDFLAGS = -avoid-version + +#------------------------ # libpam-passthru-plugin #------------------------ libpam_passthru_plugin_la_SOURCES = ldap/servers/plugins/pam_passthru/pam_ptconfig.c \ @@ -2576,6 +2586,17 @@ ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp) libhttp-client-plugin.la: $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_DEPENDENCIES) $(LINK) -rpath $(serverplugindir) $(libhttp_client_plugin_la_LDFLAGS) $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_LIBADD) $(LIBS) +ldap/servers/plugins/memberof/$(am__dirstamp): + @$(mkdir_p) ldap/servers/plugins/memberof + @: > ldap/servers/plugins/memberof/$(am__dirstamp) +ldap/servers/plugins/memberof/$(DEPDIR)/$(am__dirstamp): + @$(mkdir_p) ldap/servers/plugins/memberof/$(DEPDIR) + @: > ldap/servers/plugins/memberof/$(DEPDIR)/$(am__dirstamp) +ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo: \ + ldap/servers/plugins/memberof/$(am__dirstamp) \ + ldap/servers/plugins/memberof/$(DEPDIR)/$(am__dirstamp) +libmemberof-plugin.la: $(libmemberof_plugin_la_OBJECTS) $(libmemberof_plugin_la_DEPENDENCIES) + $(LINK) -rpath $(serverplugindir) $(libmemberof_plugin_la_LDFLAGS) $(libmemberof_plugin_la_OBJECTS) $(libmemberof_plugin_la_LIBADD) $(LIBS) lib/libaccess/$(am__dirstamp): @$(mkdir_p) lib/libaccess @: > lib/libaccess/$(am__dirstamp) @@ -3934,6 +3955,8 @@ -rm -f ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo -rm -f ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.$(OBJEXT) -rm -f ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo + -rm -f ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.$(OBJEXT) + -rm -f ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo -rm -f ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptconfig.$(OBJEXT) -rm -f ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptconfig.lo -rm -f ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptdebug.$(OBJEXT) @@ -4671,6 +4694,7 @@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/dna/$(DEPDIR)/libdna_plugin_la-dna.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_impl.Plo at am__quote@ + at AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/memberof/$(DEPDIR)/libmemberof_plugin_la-memberof.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/pam_passthru/$(DEPDIR)/libpam_passthru_plugin_la-pam_ptconfig.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/pam_passthru/$(DEPDIR)/libpam_passthru_plugin_la-pam_ptdebug.Plo at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ldap/servers/plugins/pam_passthru/$(DEPDIR)/libpam_passthru_plugin_la-pam_ptimpl.Plo at am__quote@ @@ -5978,6 +6002,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhttp_client_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/http/libhttp_client_plugin_la-http_impl.lo `test -f 'ldap/servers/plugins/http/http_impl.c' || echo '$(srcdir)/'`ldap/servers/plugins/http/http_impl.c +ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo: ldap/servers/plugins/memberof/memberof.c + at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemberof_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo -MD -MP -MF "ldap/servers/plugins/memberof/$(DEPDIR)/libmemberof_plugin_la-memberof.Tpo" -c -o ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo `test -f 'ldap/servers/plugins/memberof/memberof.c' || echo '$(srcdir)/'`ldap/servers/plugins/memberof/memberof.c; \ + at am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/memberof/$(DEPDIR)/libmemberof_plugin_la-memberof.Tpo" "ldap/servers/plugins/memberof/$(DEPDIR)/libmemberof_plugin_la-memberof.Plo"; else rm -f "ldap/servers/plugins/memberof/$(DEPDIR)/libmemberof_plugin_la-memberof.Tpo"; exit 1; fi + at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/plugins/memberof/memberof.c' object='ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemberof_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/memberof/libmemberof_plugin_la-memberof.lo `test -f 'ldap/servers/plugins/memberof/memberof.c' || echo '$(srcdir)/'`ldap/servers/plugins/memberof/memberof.c + lib/libadmin/libns_dshttpd_la-error.lo: lib/libadmin/error.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libns_dshttpd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib/libadmin/libns_dshttpd_la-error.lo -MD -MP -MF "lib/libadmin/$(DEPDIR)/libns_dshttpd_la-error.Tpo" -c -o lib/libadmin/libns_dshttpd_la-error.lo `test -f 'lib/libadmin/error.c' || echo '$(srcdir)/'`lib/libadmin/error.c; \ @am__fastdepCC_TRUE@ then mv -f "lib/libadmin/$(DEPDIR)/libns_dshttpd_la-error.Tpo" "lib/libadmin/$(DEPDIR)/libns_dshttpd_la-error.Plo"; else rm -f "lib/libadmin/$(DEPDIR)/libns_dshttpd_la-error.Tpo"; exit 1; fi @@ -8592,6 +8623,7 @@ -rm -rf ldap/servers/plugins/distrib/.libs ldap/servers/plugins/distrib/_libs -rm -rf ldap/servers/plugins/dna/.libs ldap/servers/plugins/dna/_libs -rm -rf ldap/servers/plugins/http/.libs ldap/servers/plugins/http/_libs + -rm -rf ldap/servers/plugins/memberof/.libs ldap/servers/plugins/memberof/_libs -rm -rf ldap/servers/plugins/pam_passthru/.libs ldap/servers/plugins/pam_passthru/_libs -rm -rf ldap/servers/plugins/passthru/.libs ldap/servers/plugins/passthru/_libs -rm -rf ldap/servers/plugins/presence/.libs ldap/servers/plugins/presence/_libs @@ -8961,6 +8993,8 @@ -rm -f ldap/servers/plugins/dna/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/http/$(am__dirstamp) + -rm -f ldap/servers/plugins/memberof/$(DEPDIR)/$(am__dirstamp) + -rm -f ldap/servers/plugins/memberof/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/pam_passthru/$(am__dirstamp) -rm -f ldap/servers/plugins/passthru/$(DEPDIR)/$(am__dirstamp) @@ -9027,7 +9061,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/memberof/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slap! d/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -9061,7 +9095,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd! /tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/bitwise/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/dna/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/memberof/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slap! d/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic From fedora-directory-commits at redhat.com Thu Feb 28 02:48:37 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 27 Feb 2008 21:48:37 -0500 Subject: [Fedora-directory-commits] dsgw/tests/org - New directory Message-ID: <200802280248.m1S2mbCs021604@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/org In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21589/org Log Message: Directory /cvs/dirsec/dsgw/tests/org added to the repository From fedora-directory-commits at redhat.com Thu Feb 28 02:49:23 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 27 Feb 2008 21:49:23 -0500 Subject: [Fedora-directory-commits] dsgw/orgbin org.in,1.3,1.4 Message-ID: <200802280249.m1S2nNxD021674@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/orgbin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21628/dsgw/orgbin Modified Files: org.in Log Message: clean up org chart code - added tests for org chart Index: org.in =================================================================== RCS file: /cvs/dirsec/dsgw/orgbin/org.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- org.in 30 Jan 2008 02:22:46 -0000 1.3 +++ org.in 28 Feb 2008 02:49:20 -0000 1.4 @@ -76,10 +76,7 @@ # Comm478 : ---Mozilla/4.78 [en] (Windows NT 5.0; U)--- # Nscp622 : ---Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:0.9.4.1) Gecko/20020314 Netscape6/6.2.2--- -$browser_is_msie = "MSIE" if $agentstring =~ /MSIE/; - -# is this Windows? -$isWindows = -d '\\'; +$browser_is_msie = "MSIE" if ($agentstring and ($agentstring =~ /MSIE/)); ########################################## # @@ -132,7 +129,7 @@ $uid = $cg->param("$config_tokens{'attrib-farleft-rdn'}") } -if ($uid eq "") +if (!$uid or ($uid eq "")) { &output_html_header("no-javascript"); print "No username selected..."; @@ -444,7 +441,7 @@ $people[$total-1][1] = $entry->{$config_tokens{'attrib-farleft-rdn'}}[0]; $people[$total-1][2] = url_encode($entry->{dn}); $people[$total-1][3] = $entry->{mail}[0]; - $people[$total-1][4] = $entry->{$config_tokens{"attrib-job-title"}}[0]; + $people[$total-1][4] = $entry->{$config_tokens{"attrib-job-title"}}[0] || ""; # AIM $people[$total-1][5] = "(none)"; @@ -522,9 +519,8 @@ { my ($entry) = @_; - @manager= split (/,/ , $entry->{$config_tokens{'attrib-manager'}}[0]); - @splitagain = split (/=/, @manager[0] ); - $manageruid = @splitagain[1]; + my @rdns = ldap_explode_dn($entry->getValue($config_tokens{'attrib-manager'}), 1); + my $manageruid = $rdns[0]; if ( $entry->{$config_tokens{'attrib-farleft-rdn'}}[0] eq $manageruid) { @@ -728,9 +724,9 @@ my ($returnvalue) = "(none)"; - if ( $status eq "discover" ) + if ( $status and ( $status eq "discover" ) ) { - if ( ($screenname eq "(none)") || ($screenname eq "OFFLINE") ) + if ( $screenname and ( ($screenname eq "(none)") || ($screenname eq "OFFLINE") ) ) { $status = "OFFLINE"; } @@ -980,12 +976,6 @@ sub read_config_file() { -my $curdir; -if ($isWindows) { - $curdir = `cd`; chop($curdir); -} else { - $curdir = `pwd`; chop($curdir); -} if (!open (FILE, "@contextdir@/orgchart.conf") ) { &output_html_header("no-javascript"); @@ -1173,9 +1163,9 @@ # below code right after the MyOrgChart overrides above, to make sure the # below has the final say, for the icon-related settings. # -if ( $config_tokens{"icons-aim-visible"} eq "disabled" ) { $config_tokens{"icons-aim-visible"} eq "no"; } -if ( $config_tokens{"icons-email-visible"} eq "disabled" ) { $config_tokens{"icons-email-visible"} eq "no"; } -if ( $config_tokens{"icons-phonebook-visible"} eq "disabled" ) { $config_tokens{"icons-phonebook-visible"} eq "no"; } +if ( $config_tokens{"icons-aim-visible"} eq "disabled" ) { $config_tokens{"icons-aim-visible"} = "no"; } +if ( $config_tokens{"icons-email-visible"} eq "disabled" ) { $config_tokens{"icons-email-visible"} = "no"; } +if ( $config_tokens{"icons-phonebook-visible"} eq "disabled" ) { $config_tokens{"icons-phonebook-visible"} = "no"; } if ( $config_tokens{"icons-locator-visible"} eq "disabled" ) { $config_tokens{"icons-locator-visible"} = "no"; } } @@ -1496,7 +1486,7 @@ # the boxes that people are in are not printed, so by making # border=1, at least you can see the box on the hardcopy version # - if ( ( "$browser_is_msie" ) && ( $print_mode ) ) + if ( ( $browser_is_msie ) && ( $print_mode ) ) { print " \n"; } @@ -1520,10 +1510,11 @@ $emailstr = is_email_in_layer ( $config_tokens{"icons-email-visible"}, $entry->{mail}[0] ); $pbstr = is_pb_in_layer ( $config_tokens{"icons-phonebook-visible"}, $tempstr ); $locatorstr = is_locator_in_layer ( $config_tokens{"icons-locator-visible"}, $tempstr2 ); + my $title = $entry->getValue($config_tokens{"attrib-job-title"}) || ""; if ( !($print_mode) ) { - print "\n\n {$config_tokens{\"attrib-job-title\"}}[0]','$emailstr','$pbstr','$locatorstr','$aimid');\" onMouseOut=\"OutLayer();\">"; + print "\n\n "; print ""; print " \n"; } @@ -1536,17 +1527,20 @@ print_locator_icon_if_outside_layer( $config_tokens{"icons-locator-visible"}, $tempstr2 ); print "
\n"; - print "$entry->{$config_tokens{\"attrib-job-title\"}}[0]
\n"; + print "$title
\n"; # # Get the full name of the manager of the uid entered by the end-user # - @manager= split (/,/ , $entry->{$config_tokens{'attrib-manager'}}[0]); - @splitagain = split (/=/, @manager[0] ); - $manager = @splitagain[1]; - $managerSearch = $config_tokens{'attrib-farleft-rdn'} . "=" . $manager; - $managerEntry = $conn->search($config_tokens{"ldap-search-base"},"subtree", $managerSearch, 0, @return_attribs); + my $mgrdn = $entry->getValue($config_tokens{'attrib-manager'}); + my $managerEntry; + if ($mgrdn) { + my @rdns = ldap_explode_dn($entry->getValue($mgrdn), 1); + my $manager = $rdns[0]; + my $managerSearch = $config_tokens{'attrib-farleft-rdn'} . "=" . $manager; + $managerEntry = $conn->search($config_tokens{"ldap-search-base"},"subtree", $managerSearch, 0, @return_attribs); + } print "$fontstring"; print "Manager: "; @@ -1555,7 +1549,7 @@ { $tempstr = url_encode($managerEntry->{dn}); $tempstr2 = url_encode($managerEntry->{cn}[0]); - $managertitle = $managerEntry->{$config_tokens{"attrib-job-title"}}[0]; + $managertitle = $managerEntry->{$config_tokens{"attrib-job-title"}}[0] || ""; $aimid = is_aimid_in_layer ( $config_tokens{"icons-aim-visible"} , $managerEntry->{nsAIMStatusText}[0] , $managerEntry->{nsaimid}[0] ); $emailstr = is_email_in_layer ( $config_tokens{"icons-email-visible"}, $managerEntry->{mail}[0] ); @@ -1633,7 +1627,7 @@ { $info = $sortedPeople[$tempnum+1][0]; @tempdata = split(/\//, $info); - $nextentry = @tempdata[1]; + $nextentry = $tempdata[1]; } if ( "$entry" ne "$nextentry" ) @@ -1655,7 +1649,7 @@ print "\n $entry "; - if ( $sortedPeople[$tempnum][7] =~ /nonleaf/ ) + if ( $sortedPeople[$tempnum][7] and ( $sortedPeople[$tempnum][7] =~ /nonleaf/ ) ) { # # If we are only supposed to draw one level for the org chart, @@ -1850,7 +1844,7 @@ # the boxes that people are in are not printed, so by making # border=1, at least you can see the box on the hardcopy version # - if ( ( "$browser_is_msie" ) && ( $print_mode ) ) + if ( ( $browser_is_msie ) && ( $print_mode ) ) { print "
\n"; } @@ -1931,7 +1925,8 @@ # # then print the org chart icon # - if ( ( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]/ ) || ( $sortedPeople[$tempnum][7] =~ /nonleaf/ ) ) + if ( ( $sortedPeople[$tempnum+1][0] and ( $sortedPeople[$tempnum+1][0] =~ /$tempdata[@tempdata-1]/ ) ) || + ( $sortedPeople[$tempnum][7] and ( $sortedPeople[$tempnum][7] =~ /nonleaf/ ) ) ) { if ( ($print_mode) && ($current_indent == 1 ) ) { From fedora-directory-commits at redhat.com Thu Feb 28 02:49:23 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 27 Feb 2008 21:49:23 -0500 Subject: [Fedora-directory-commits] dsgw/tests setup.sh,1.5,1.6 Message-ID: <200802280249.m1S2nNXX021680@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21628/dsgw/tests Modified Files: setup.sh Log Message: clean up org chart code - added tests for org chart Index: setup.sh =================================================================== RCS file: /cvs/dirsec/dsgw/tests/setup.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- setup.sh 27 Feb 2008 03:36:51 -0000 1.5 +++ setup.sh 28 Feb 2008 02:49:21 -0000 1.6 @@ -73,6 +73,11 @@ -e "s#@pbconfigdir@#$sroot/share/dirsrv/dsgw/pbconfig#g" \ pbconfig/pb.tmpl > testtmp/pb.conf +sed -e "s#@ldapurl@#$ldapurl#g" \ + -e "s#@suffix@#$suffix#g" \ + -e "s#@httpurl@#$SERVER_URL#g" \ + orghtml/orgchart.tmpl > testtmp/orgchart.conf + dir=`pwd` # CGI env. vars @@ -100,10 +105,10 @@ DEBUGCMD=VALGRIND #DEBUGCMD="$GDB" -PROGS="lang" +#PROGS="lang tutor edit search dosearch domodify auth doauth newentry dnedit csearch" # use scripts for orgchart perl scripts -SCRIPTS="" +SCRIPTS="org" #ClientLanguage=en_US ; export ClientLanguage HTTP_ACCEPT_LANGUAGE=en_US ; export HTTP_ACCEPT_LANGUAGE @@ -234,14 +239,10 @@ echo "Running test $test" REQUEST_METHOD=GET ; export REQUEST_METHOD QUERY_STRING="`cat $test`" ; export QUERY_STRING - SCRIPT_NAME=slapd/Tasks/Operation/$prog ; export SCRIPT_NAME - # open pwpfile for reading as file desc 4 - CGIs have to use stdin (0) for POST - exec 4<$pwpfile - PASSWORD_PIPE=4 ; export PASSWORD_PIPE if [ -n "$DEBUGCMD" -a "$DEBUGCMD" = "$GDB" ] ; then perl -d orgchart/$prog else - perl -w orgchart/$prog + perl -w -T -t orgbin/$prog > results/$prog/$basetest.html 2> results/$prog/$basetest.errs fi done rm -f $getlist From fedora-directory-commits at redhat.com Thu Feb 28 02:49:23 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 27 Feb 2008 21:49:23 -0500 Subject: [Fedora-directory-commits] dsgw/tests/org testget.1, NONE, 1.1 testget.2, NONE, 1.1 testget.3, NONE, 1.1 testget.4, NONE, 1.1 Message-ID: <200802280249.m1S2nN7o021685@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/tests/org In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21628/dsgw/tests/org Added Files: testget.1 testget.2 testget.3 testget.4 Log Message: clean up org chart code - added tests for org chart --- NEW FILE testget.1 --- --- NEW FILE testget.2 --- data=&context=&uid= --- NEW FILE testget.3 --- data=scarter&context=dsgw&uid=scarter --- NEW FILE testget.4 --- data=bparker&context=dsgw&uid=bparker From fedora-directory-commits at redhat.com Thu Feb 28 22:17:28 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 28 Feb 2008 17:17:28 -0500 Subject: [Fedora-directory-commits] dsgw entrydisplay.c,1.7,1.8 Message-ID: <200802282217.m1SMHSdY015768@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15744/dsgw Modified Files: entrydisplay.c Log Message: Resolves: bug 171353 Bug Description: Unable to download a certificate from Gateway/Phonebook Reviewed by: nkinder (Thanks!) Fix Description: The code expects the attribute to be encoded like this - attrname&mimetype&index. However, the code was outputtting the & as literal "&" chars. We need to output them encoded as %26 instead. With this fix, if I click on the Download Certificate link, and the certificate is a real email certificate (i.e. not a CA cert or a server cert or some other type of cert), Firefox 2 will silently install it under Other People's certificates in the certificate window. An attempt to use any other type of cert will silently fail. NOTE: If you actually want to use this cert in an email program, you should right click on the link and select Save Link As... to save the cert in a local file, then import that into your email program. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no Index: entrydisplay.c =================================================================== RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- entrydisplay.c 27 Feb 2008 03:36:50 -0000 1.7 +++ entrydisplay.c 28 Feb 2008 22:17:26 -0000 1.8 @@ -1042,9 +1042,9 @@ * always reference first value for now ( "&0" ) unless returning * link to a vCard (in which case we leave the &0 off) */ - dsgw_emitf("%s\"%s%s&ldq=%s&%s%s\"%s\n", prefix, urlprefix, escapeddn, attr, + dsgw_emitf("%s\"%s%s&ldq=%s%%26%s%s\"%s\n", prefix, urlprefix, escapeddn, attr, ( mimetype == NULL ) ? "" : mimetype, - ( strcasecmp( "_vcard", attr ) == 0 ) ? "" : "&0", suffix ); + ( strcasecmp( "_vcard", attr ) == 0 ) ? "" : "%260", suffix ); free( urlprefix ); free( escapeddn ); return; From fedora-directory-commits at redhat.com Fri Feb 29 19:04:46 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 29 Feb 2008 14:04:46 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.20, 1.30.2.21 Message-ID: <200802291904.m1TJ4kj4020123@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20084 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: Resolves: #435501 Summary: RHDS7.1 SP4: java/jars has the mode 0777 Fix description: chmod the directory to 0755 in the packaging process. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/Makefile,v retrieving revision 1.30.2.20 retrieving revision 1.30.2.21 diff -u -r1.30.2.20 -r1.30.2.21 --- Makefile 7 Jun 2006 20:29:21 -0000 1.30.2.20 +++ Makefile 29 Feb 2008 19:04:43 -0000 1.30.2.21 @@ -389,6 +389,9 @@ then $(INSTALL) -m 755 $$file $(RELDIR)/$(DS_JAR_DEST_PATH) ; \ fi ; \ done + if [ "$(RELDIR)/$(DS_JAR_DEST_PATH)" -a -d "$(RELDIR)/$(DS_JAR_DEST_PATH)" ] ; then \ + chmod 755 $(RELDIR)/$(DS_JAR_DEST_PATH); \ + fi endif $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/ldif/*.ldif $(RELDIR)/bin/slapd/install/ldif @@ -492,6 +495,9 @@ $(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH) $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH) $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) + if [ "$(RELDIR)/$(DS_JAR_DEST_PATH)" -a -d "$(RELDIR)/$(DS_JAR_DEST_PATH)" ] ; then \ + chmod 755 $(RELDIR)/$(DS_JAR_DEST_PATH); \ + fi endif # Images for IM Presence plugin From fedora-directory-commits at redhat.com Fri Feb 29 19:28:46 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 29 Feb 2008 14:28:46 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.10, 1.10.2.11 Message-ID: <200802291928.m1TJSkLk021347@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21272 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: Resolves: #435501 Description: Increased the release number to 7 for the bug fix 435501 "RHDS7.1 SP4: java/jars has the mode 0777". Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/ldapserver.spec.tmpl,v retrieving revision 1.10.2.10 retrieving revision 1.10.2.11 diff -u -r1.10.2.10 -r1.10.2.11 --- ldapserver.spec.tmpl 8 Jan 2008 00:52:20 -0000 1.10.2.10 +++ ldapserver.spec.tmpl 29 Feb 2008 19:28:44 -0000 1.10.2.11 @@ -45,7 +45,7 @@ Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP at -ds Version: @GEN-VERSION@ -Release: 6. at PLATFORM@ +Release: 7. at PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ @@ -135,7 +135,10 @@ fi %changelog -* Mon Jan 07 2008 Noriko Hosoi 7.1-4 +* Fri Feb 29 2008 Noriko Hosoi 7.1-4-7 +- fixed the mode of java/jars + +* Mon Jan 07 2008 Noriko Hosoi 7.1-4-6 - apply patches defined in DS7.1 SP4 PRD * Tue Sep 13 2005 Nathan Kinder 7.1-3 From fedora-directory-commits at redhat.com Fri Feb 29 20:38:16 2008 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 29 Feb 2008 15:38:16 -0500 Subject: [Fedora-directory-commits] dsgw/html/es auth.html.in, 1.1, 1.2 authroot.html.in, 1.1, 1.2 authtitle.html.in, 1.1, 1.2 csearchtitle.html.in, 1.1, 1.2 greeting.html.in, 1.1, 1.2 index.html.in, 1.1, 1.2 maintitle.html.in, 1.1, 1.2 newentrytitle.html.in, 1.1, 1.2 searchtitle.html.in, 1.1, 1.2 Message-ID: <200802292038.m1TKcGak030231@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsgw/html/es In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29984/dsgw/html/es Modified Files: auth.html.in authroot.html.in authtitle.html.in csearchtitle.html.in greeting.html.in index.html.in maintitle.html.in newentrytitle.html.in searchtitle.html.in Log Message: Resolves: Bug 146294 Description: DSGW needs to be brand agnostic Fix Description: I removed all of the places in the code that referred to Fedora, Red Hat, or Netscape Directory Servers and other related products. I also updated one file that contained the "N" graphic logo. There are still several references to Netscape. The main one is where the dsgw references the browser. The other references are in the attributes and objectclasses that still have the word "netscape" in them. We cannot remove these. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no Index: auth.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/html/es/auth.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- auth.html.in 14 Jan 2008 22:31:22 -0000 1.1 +++ auth.html.in 29 Feb 2008 20:38:12 -0000 1.2 @@ -38,7 +38,7 @@ -Pasarela de Netscape Directory Server: Autenticar +Pasarela de Directory Server: Autenticar @@ -49,6 +49,6 @@ <H3>Es necesario un navegador que admita marcos</H3> -Lo siento, pero para poder usar la Pasarela de Netscape Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Netscape Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://home.es.netscape.com/es/">P&aacute;gina principal de Netscape</A>. +Lo siento, pero para poder usar la Pasarela de Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Netscape Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://home.es.netscape.com/es/">P&aacute;gina principal de Netscape</A>. Index: authroot.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/html/es/authroot.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- authroot.html.in 14 Jan 2008 22:31:22 -0000 1.1 +++ authroot.html.in 29 Feb 2008 20:38:12 -0000 1.2 @@ -38,7 +38,7 @@ -Pasarela de Netscape Directory Server: Autenticar +Pasarela de Directory Server: Autenticar @@ -48,6 +48,6 @@ <H3>Es necesario un navegador que admita marcos</H3> -Lo siento, pero para poder usar la Pasarela de Netscape Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Netscape Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://home.es.netscape.com/es/">P&aacute;gina principal de Netscape</A>. +Lo siento, pero para poder usar la Pasarela de Directory Server, debe emplear un navegador que admita formularios HTML y JavaScript, como Netscape Navigator versi&oacute;n 3 o posterior. Para conseguir Navigator, visite la <A HREF="http://home.es.netscape.com/es/">P&aacute;gina principal de Netscape</A>. Index: authtitle.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/html/es/authtitle.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- authtitle.html.in 14 Jan 2008 22:31:22 -0000 1.1 +++ authtitle.html.in 29 Feb 2008 20:38:12 -0000 1.2 @@ -37,13 +37,13 @@ --- END COPYRIGHT BLOCK --- --> -Netscape Directory Server +Directory Server Netscape Directory Server
+ ALT="Directory Server">
Index: csearchtitle.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/html/es/csearchtitle.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- csearchtitle.html.in 14 Jan 2008 22:31:22 -0000 1.1 +++ csearchtitle.html.in 29 Feb 2008 20:38:12 -0000 1.2 @@ -37,13 +37,13 @@ --- END COPYRIGHT BLOCK --- --> -Netscape Directory Server +Directory Server Netscape Directory Server
+ ALT="Directory Server">
Index: greeting.html.in =================================================================== RCS file: /cvs/dirsec/dsgw/html/es/greeting.html.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- greeting.html.in 14 Jan 2008 22:31:22 -0000 1.1 +++ greeting.html.in 29 Feb 2008 20:38:12 -0000 1.2 @@ -37,7 +37,7 @@ --- END COPYRIGHT BLOCK --- --> -Netscape Directory Server +Directory Server From fedora-directory-commits at redhat.com Fri Feb 29 22:27:08 2008 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 29 Feb 2008 17:27:08 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.11, 1.10.2.12 Message-ID: <200802292227.m1TMR8Qh015531@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15468 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: Resolves: #435501 Summary: RHDS7.1 SP4: java/jars has the mode 0777 Description: Service Pack rpm is generated based on the original 7.1 files with overriding them with the updated files. The java/jar directory is untouched since it does not need to be updated. Therefore, in addition to the Makefile change for HP-UX and Solaris, spec file should set the mode. Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/ldapserver.spec.tmpl,v retrieving revision 1.10.2.11 retrieving revision 1.10.2.12 diff -u -r1.10.2.11 -r1.10.2.12 --- ldapserver.spec.tmpl 29 Feb 2008 19:28:44 -0000 1.10.2.11 +++ ldapserver.spec.tmpl 29 Feb 2008 22:27:06 -0000 1.10.2.12 @@ -89,6 +89,7 @@ # the entire ldapserver directory - if we change this to put # files in different places, we won't be able to do this anymore %defattr(-,root,root,-) +%attr(0755,root,root) %dir %{prefix}/java/jars %{prefix} # don't update admin server configuration files. # note: if there's somes change b/w 2 versions, on-disk file is put w/ .rpmsave