Attachment 160354 Details for Bug 250324 – diffs

[patch] diffs

cvsdiffs (text/plain), 12.83 KB, created by Rich Megginson on 2007-07-31 20:22:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-07-31 20:22:05 UTC

Size: 12.83 KB

patch

obsolete

>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.25
>diff -u -8 -r1.25 Makefile.am
>--- adminserver/Makefile.am	31 Jul 2007 00:19:21 -0000	1.25
>+++ adminserver/Makefile.am	31 Jul 2007 20:21:38 -0000
>@@ -23,16 +23,17 @@
> QUOTE := $(NULLSTRING)"# a double quote"
> define NL
> \\n
> endef
> 
> BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
> NQBUILDNUM := $(subst \,,$(subst $(QUOTE),,$(BUILDNUM)))
> 
>+DEBUG_DEFINES = @debug_defs@
> # look for included m4 files in the ./m4/ directory
> ACLOCAL_AMFLAGS = -I m4
> 
> # passed to the mod subdirs - so they know they are being
> # built as part of admin server and not standalone
> AM_MAKEFLAGS = ADMINSERVER=1
> 
> if MOD_ADMSERV
>@@ -89,33 +90,38 @@
> 
> libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
> 	lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
> 
> libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
> 	lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
> 	lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
> 
>-AM_CPPFLAGS = @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -DUSE_ADMSERV=1 \
>+AM_CPPFLAGS = $(DEBUG_DEFINES) @adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -DUSE_ADMSERV=1 \
> 	-I$(srcdir)/include -I$(srcdir)/include/base
> if WINNT
> AM_CPPFLAGS += -DXP_WINNT
> else
> AM_CPPFLAGS += -DXP_UNIX
> endif
> 
> AM_CPPFLAGS +=-DPROPERTYDIR=\"$(propertydir)\" -DLIBDIR=\"$(libdir)\" \
> 	-DPIDDIR=\"$(piddir)\" -DHTMLDIR=\"$(htmldir)\" -DICONDIR=\"$(icondir)\" \
> 	-DCMDBINDIR=\"$(cmdbindir)\" -DMANUALDIR=\"$(manualdir)\" \
> 	-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
> 	-DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \
> 	-DPIDFILE=\"$(pidfile)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" \
> 	-DBUILD_NUM=$(BUILDNUM) -DINFDIR=\"$(infdir)\" -DCGIBINDIR=\"$(cgibindir)\" \
> 	-DINSTCONFIGDIR=\"$(instconfigdir)\" -DDSLIBDIR=\"$(dslibdir)\"
> 
>+# We need to make sure that libpthread is linked before libc on HP-UX.
>+if HPUX
>+AM_LDFLAGS = -lpthread
>+endif
>+
> lib_LTLIBRARIES = libds-admin-serv.la
> 
> noinst_LIBRARIES = libdsa.a
> 
> LIBSOCKET=@LIBSOCKET@
> LIBNSL=@LIBNSL@
> LIBCSTD=@LIBCSTD@
> LIBCRUN=@LIBCRUN@
>@@ -341,24 +347,35 @@
> # Resource Bundle Compiler 
> if WINNT
> ICU_GENRB = @icu_bin@/genrb.exe
> else
> ICU_GENRB = sh $(srcdir)/admserv/genrb_wrapper.sh @icu_bin@ @icu_libdir@
> endif
> 
> # need a reverse sort
>-mysort = $(shell echo -e $(subst $(SPACE),$(NL),$2) | sort $1 -k1,1)
>-
>+# on some systems, -e is not used - escape sequences just work
>+# so we have to remove the -e from the stream
>+mysort = $(shell echo -e $(subst $(SPACE),$(NL),$2) | grep -v -- -e | sort $1 -k1,1)
>+
>+# for a bundle, all of the components will be under libdir (e.g. prefix/lib)
>+# and mod_nss will be in the admin server module directory
>+if BUNDLE
>+LIBPATH = $(subst $(SPACE),$(COLON),$(dslibdir) $(libdir))
>+runtime_nssmoddir=$(admmoddir)
>+else
> # need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
> # sort also strips out duplicates
> LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
> LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST))
> # now put it in the canonical form
> LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS))
>+# nssmoddir is the same
>+runtime_nssmoddir=$(nssmoddir)
>+endif
> 
> # The root resource bundle is based on English (en) locale;
> # This bundle must be always distributed and there is no need to have
> # *_en.properties resource bundle source files.
> RESOURCE_BUNDLES_ROOT = \
> 	admserv/cgi-src40/admpw_root.res \
> 	admserv/cgi-src40/security_root.res admserv/cgi-src40/config_root.res \
> 	admserv/cgi-src40/stopsrv_root.res \
>@@ -394,16 +411,18 @@
> 	$(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+
> 
> # these are for the config files and scripts that we need to generate and replace
> # the paths and other tokens with the real values set during configure/make
> # note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this:
> # ADMConfigDir = ${prefix}/etc/packagename
> # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
> # ADMConfigDir = /etc/packagename
>+# NOTE: nss_libdir and ldapsdk_libdir are only needed for those platforms which link Apache
>+# directly to the openldap libs, for the LD_PRELOAD hack in start-ds-admin
> fixupcmd = sed \
> 	-e 's,@ECHO_C\@,$(ECHO_C),g' \
> 	-e 's,@ECHO_N\@,$(ECHO_N),g' \
> 	-e 's,@HTTPD\@,$(HTTPD),g' \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@localstatedir\@,$(localstatedir),g' \
> 	-e 's,@cgibindir\@,$(cgibindir),g' \
>@@ -419,24 +438,20 @@
> 	-e 's,@securitydir\@,$(securitydir),g' \
> 	-e 's,@httpduser\@,$(httpduser),g' \
> 	-e 's,@httpdgroup\@,$(httpdgroup),g' \
> 	-e 's,@httpdconfdir\@,$(httpdconfdir),g' \
> 	-e 's,@piddir\@,$(piddir),g' \
> 	-e 's,@pidfile\@,$(pidfile),g' \
> 	-e 's,@admservport\@,$(admservport),g' \
> 	-e 's,@LIBPATH\@,$(LIBPATH),g' \
>-	-e 's,@nspr_libdir\@,$(nspr_libdir),g' \
> 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
> 	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
>-	-e 's,@adminutil_libdir\@,$(adminutil_libdir),g' \
>-	-e 's,@setuputil_libdir\@,$(setuputil_libdir),g' \
>-	-e 's,@icu_libdir\@,$(icu_libdir),g' \
> 	-e 's,@admmoddir\@,$(admmoddir),g' \
>-	-e 's,@nssmoddir\@,$(nssmoddir),g' \
>+	-e 's,@nssmoddir\@,$(runtime_nssmoddir),g' \
> 	-e 's,@instconfigdir\@,$(instconfigdir),g' \
> 	-e 's,@instancename\@,$(instancename),g' \
> 	-e 's,@BUILD_NUM\@,$(BUILDNUM),g' \
> 	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
> 	-e 's,@package_name\@,$(PACKAGE_NAME),g' \
> 	-e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.14
>diff -u -8 -r1.14 configure.ac
>--- adminserver/configure.ac	31 Jul 2007 00:19:22 -0000	1.14
>+++ adminserver/configure.ac	31 Jul 2007 20:21:38 -0000
>@@ -63,16 +63,41 @@
> 
> PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
> AC_SUBST(PACKAGE_BASE_VERSION)
> 
> brand=fedora
> capbrand=Fedora
> vendor="Fedora Project"
> 
>+AC_MSG_CHECKING(for --enable-debug)
>+AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug features (default: no)]),
>+[
>+  AC_MSG_RESULT(yes)
>+  debug_defs="-DDEBUG"
>+],
>+[
>+  AC_MSG_RESULT(no)
>+  debug_defs=""
>+])
>+AC_SUBST([debug_defs])
>+
>+# Used for legacy style packaging where we bundle all of the dependencies.
>+AC_MSG_CHECKING(for --enable-bundle)
>+AC_ARG_ENABLE(bundle, AS_HELP_STRING([--enable-bundle], [Enable bundled dependencies (default: no)]),
>+[
>+  AC_MSG_RESULT(yes)
>+  bundle="1";
>+],
>+[
>+  AC_MSG_RESULT(no)
>+  bundle="";
>+])
>+AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
>+
> m4_include(m4/fhs.m4)
> 
> # installation paths - by default, configure will just
> # use /usr as the prefix for everything, which means
> # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
> # The with-fhs-opt option will use the
> # prefix, but it's sysconfdir and localstatedir will be
> # /etc/opt, and /var/opt.
>@@ -100,48 +125,59 @@
> # relative to datadir
>   infdir=/$PACKAGE_BASE_NAME/inf
>   htmldir=/$PACKAGE_BASE_NAME/html
>   icondir=/$PACKAGE_BASE_NAME/icons
>   manualdir=/$PACKAGE_BASE_NAME/manual
>   ldifdir=/$PACKAGE_BASE_NAME/data
> fi
> 
>+# server userid, groupid
>+httpduser=nobody
>+httpdgroup=nobody
>+admservport=9830
>+# initdir
> initdir=/rc.d
> CXXLINK_REQUIRED=0
> case $host in
>   *-*-linux*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([Linux], [1], [Linux])
>     AC_DEFINE([LINUX], [1], [Linux])
>+    platform="linux"
>+    # relative to sysconfdir
>     initdir=/rc.d/init.d
> 	;;
>   ia64-hp-hpux*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([hpux], [1], [HP-UX])
>     AC_DEFINE([HPUX], [1], [HP-UX])
>     AC_DEFINE([HPUX11], [1], [HP-UX 11])
>     AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23])
>     AC_DEFINE([CPU_ia64], [], [cpu type ia64])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>     AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>     AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     CXXLINK_REQUIRED=1
>+    httpdgroup=nogroup
>+    platform="hpux"
> 	;;
>   hppa*-hp-hpux*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([hpux], [1], [HP-UX])
>     AC_DEFINE([HPUX], [1], [HP-UX])
>     AC_DEFINE([HPUX11], [1], [HP-UX 11])
>     AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11])
>     AC_DEFINE([CPU_hppa], [], [cpu type pa-risc])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>     AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>     AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     CXXLINK_REQUIRED=1
>+    httpdgroup=nogroup
>+    platform="hpux"
> 	;;
>   sparc-sun-solaris*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([SVR4], [1], [SVR4])
>     AC_DEFINE([__svr4], [1], [SVR4])
>     AC_DEFINE([__svr4__], [1], [SVR4])
>     AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
>     AC_DEFINE([CPU_sparc], [], [cpu type sparc])
>@@ -155,40 +191,40 @@
>     LIBNSL=-lnsl
>     AC_SUBST([LIBNSL], [$LIBNSL])
> dnl Cstd and Crun are required to link any C++ related code (ICU)
>     LIBCSTD=-lCstd
>     AC_SUBST([LIBCSTD], [$LIBCSTD])
>     LIBCRUN=-lCrun
>     AC_SUBST([LIBCRUN], [$LIBCRUN])
>     CXXLINK_REQUIRED=1
>+    platform="solaris"
>+    # relative to sysconfdir
>     initdir=/init.d
> 	;;
>   *)
> esac
> AC_SUBST(initdir)
> AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1)
>+AM_CONDITIONAL([HPUX],test "$platform" = "hpux")
>+AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris")
> 
> # Check for fortitude
> m4_include(m4/fortitude.m4)
> # Check for web server
> m4_include(m4/httpd.m4)
> 
> # Check for library dependencies
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
> m4_include(m4/icu.m4)
> m4_include(m4/adminutil.m4)
> m4_include(m4/mod_nss.m4)
> 
>-# server userid, groupid
>-httpduser=nobody
>-httpdgroup=nobody
>-admservport=9830
> # this is the subdir under $PACKAGE_BASE_NAME where admin server
> # specific configs, logs, etc. are found
> instancename=admin-serv
> 
> # check for --with-instconfigdir
> AC_MSG_CHECKING(for --with-instconfigdir)
> AC_ARG_WITH(instconfigdir,
>         AS_HELP_STRING([--with-instconfigdir=/path],
>@@ -295,16 +331,37 @@
> AC_SUBST(capbrand)
> AC_SUBST(vendor)
> 
> # WINNT should be true if building on Windows system not using
> # cygnus, mingw, or the like and using cmd.exe as the shell
> AM_CONDITIONAL([WINNT], false)
> AM_CONDITIONAL([APACHE22], test $APACHE22)
> 
>+# libtool on fedora/rhel contains some gcc-isms which cause problems
>+# if not using gcc (e.g. Forte on Solaris, aCC on HP-UX)
>+# we remove them here
>+if test "$GCC" != yes ; then
>+   AC_MSG_NOTICE([Not using gcc - fixing libtool to remove gcc-isms . . .])
>+   cp -p libtool libtool.orig
>+   cp -p libtool libtool.tmp
>+   # dnl note the special chars @<:@ and @:>@ - since m4 treats [ and ] specially,
>+   # we have to use the quadrigraph @<:@ for [ and @:>@ for ] - and you thought
>+   # perl produced write-only code . . .
>+   sed -e '/^gcc_dir/ d' \
>+       -e '/^gcc_ver/ d' \
>+       -e 's/^predep_objects=.*echo $"@<:@^"@:>@*"$.*$/predep_objects=\1/' \
>+       -e 's/^postdep_objects=.*echo $"@<:@^"@:>@*"$.*$/postdep_objects=\1/' \
>+       -e 's/^compiler_lib_search_path=.*echo $"@<:@^"@:>@*"$.*$/compiler_lib_search_path=\1/' \
>+       -e 's/^sys_lib_search_path_spec=.*echo $"@<:@^"@:>@*"$.*$/sys_lib_search_path_spec=\1/' \
>+       libtool > libtool.tmp
>+   cp -p libtool.tmp libtool
>+   rm -f libtool.tmp
>+fi
>+
> AC_CONFIG_FILES([Makefile])
> 
> # if doing a recursive configure, add --with-adminserver
> # to the list of args for the modules
> ac_configure_args="$ac_configure_args --with-adminserver --with-apxs=$APXS --with-apr-config=$APR_CONFIG --with-moddir=$admmoddir"
> 
> if test -d $srcdir/mod_admserv ; then
>    AC_CONFIG_SUBDIRS([mod_admserv])
>Index: adminserver/admserv/cfgstuff/admserv.conf.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
>retrieving revision 1.5
>diff -u -8 -r1.5 admserv.conf.in
>--- adminserver/admserv/cfgstuff/admserv.conf.in	15 Jun 2007 22:35:24 -0000	1.5
>+++ adminserver/admserv/cfgstuff/admserv.conf.in	31 Jul 2007 20:21:38 -0000
>@@ -24,17 +24,17 @@
> ADMCacheLifeTime 600
> ADMServerVersionString "@capbrand@-Administrator/@PACKAGE_VERSION@"
> ADMConfigDir "@configdir@"
> 
> ScriptAlias /bin/admin/admin/bin/ "@cgibindir@/"
> ScriptAlias /dist/ "@cgibindir@/"
> ScriptAlias /manual/help/ "@cgibindir@/"
> 
>-SetEnv LD_LIBRARY_PATH @nss_libdir@:@nspr_libdir@
>+SetEnv LD_LIBRARY_PATH @LIBPATH@
> 
> # all access is explicitly denied by default in httpd.conf
> # the following Directory directives turn on access for specific
> # directories
> <Directory "@htmldir@/">
>     AllowOverride None
>     Options None
>     Order allow,deny

Actions: View | Diff

Attachments on bug 250324: 160354 | 160376 | 160446 | 160765 | 160767