Attachment 160495 Details for Bug 250535 – diffs for adminserver

[patch] diffs for adminserver

cvsdiffs (text/plain), 13.29 KB, created by Rich Megginson on 2007-08-02 03:45:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-08-02 03:45:04 UTC

Size: 13.29 KB

patch

obsolete

>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.26
>diff -u -8 -r1.26 Makefile.am
>--- adminserver/Makefile.am	1 Aug 2007 18:14:53 -0000	1.26
>+++ adminserver/Makefile.am	2 Aug 2007 03:43:12 -0000
>@@ -358,27 +358,29 @@
> 
> # 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)
> runtime_nss_libdir=$(libdir)
> runtime_ldapsdk_libdir=$(libdir)
>+perlpath=$(perldir) $(libdir)/perl/arch $(libdir)/perl
> 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)
> runtime_nss_libdir=$(nss_libdir)
> runtime_ldapsdk_libdir=$(ldapsdk_libdir)
>+perlpath=$(perldir)
> 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 \
>@@ -458,17 +460,18 @@
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
> 	-e 's,@brand\@,$(brand),g' \
> 	-e 's,@capbrand\@,$(capbrand),g' \
> 	-e 's,@vendor\@,$(vendor),g' \
> 	-e 's,@helpdir\@,$(helpdir),g' \
> 	-e 's,@mimemagic\@,$(mimemagic),g' \
> 	-e 's,@initdir\@,$(initdir),g' \
>-	-e 's,@perldir\@,$(perldir),g' \
>+	-e 's,@perlpath\@,$(perlpath),g' \
>+	-e 's,@perlexec\@,@perlexec@,g' \
> 	-e 's,@infdir\@,$(infdir),g' \
> 	-e 's,@dslibdir\@,$(dslibdir),g' \
> 	-e 's,@ldifdir\@,$(ldifdir),g'
> 
> # because the source may be either httpd.conf.in or httpd-2.2.conf.in
> admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
> 	$(fixupcmd) $< > $@
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.15
>diff -u -8 -r1.15 configure.ac
>--- adminserver/configure.ac	1 Aug 2007 18:14:53 -0000	1.15
>+++ adminserver/configure.ac	2 Aug 2007 03:43:12 -0000
>@@ -132,16 +132,24 @@
> 
> # server userid, groupid
> httpduser=nobody
> httpdgroup=nobody
> admservport=9830
> # initdir
> initdir=/rc.d
> CXXLINK_REQUIRED=0
>+# on most platforms, we will just use perl from PATH
>+# On some platforms, we cannot.  Why not just use any old
>+# perl?  Because of perldap.  We use a perldap that is
>+# compiled to either 32bit or 64bit, so we must use a native
>+# perl binary compiled with the same bitsize.  On Solaris
>+# and HP-UX, /usr/bin/perl is 32 bit, so we cannot use
>+# those with our 64 bit compiled product.
>+perlexec='/usr/bin/env perl'
> 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
>@@ -151,32 +159,36 @@
>     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])
>+    # assume 64 bit
>+    perlexec='/opt/perl_64/bin/perl'
>     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
>+    # assume 64 bit
>+    perlexec='/opt/perl_64/bin/perl'
>     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])
>@@ -192,22 +204,25 @@
>     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"
>+    # assume 64 bit
>+    perlexec='/opt/perl5x/bin/perl'
>     # relative to sysconfdir
>     initdir=/init.d
> 	;;
>   *)
> esac
> AC_SUBST(initdir)
>+AC_SUBST(perlexec)
> 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)
>Index: adminserver/admserv/cgi-src40/ds_create.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_create.in,v
>retrieving revision 1.4
>diff -u -8 -r1.4 ds_create.in
>--- adminserver/admserv/cgi-src40/ds_create.in	24 Jul 2007 20:10:15 -0000	1.4
>+++ adminserver/admserv/cgi-src40/ds_create.in	2 Aug 2007 03:43:12 -0000
>@@ -1,9 +1,9 @@
>-#!/usr/bin/env perl
>+#!@perlexec@
> # BEGIN COPYRIGHT BLOCK
> # This Program is free software; you can redistribute it and/or modify it under
> # the terms of the GNU General Public License as published by the Free Software
> # 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.
>@@ -12,17 +12,17 @@
> # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
> # Place, Suite 330, Boston, MA 02111-1307 USA.
> # 
> # Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>-use lib '@perldir@';
>+use lib qw(@perlpath@);
> 
> use strict;
> 
> use CGI qw(:cgi :oldstyle_urls);
> use Inf;
> use AdminUtil;
> use Util;
> use Resource;
>Index: adminserver/admserv/cgi-src40/ds_remove.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ds_remove.in,v
>retrieving revision 1.4
>diff -u -8 -r1.4 ds_remove.in
>--- adminserver/admserv/cgi-src40/ds_remove.in	27 Jul 2007 01:35:29 -0000	1.4
>+++ adminserver/admserv/cgi-src40/ds_remove.in	2 Aug 2007 03:43:12 -0000
>@@ -1,9 +1,9 @@
>-#!/usr/bin/env perl
>+#!@perlexec@
> # BEGIN COPYRIGHT BLOCK
> # This Program is free software; you can redistribute it and/or modify it under
> # the terms of the GNU General Public License as published by the Free Software
> # 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.
>@@ -12,17 +12,17 @@
> # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
> # Place, Suite 330, Boston, MA 02111-1307 USA.
> # 
> # Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>-use lib '@perldir@';
>+use lib qw(@perlpath@)
> 
> use strict;
> 
> use File::Basename;
> use File::Path;
> use CGI qw(:cgi :oldstyle_urls);
> use Inf;
> use AdminUtil;
>Index: adminserver/admserv/newinst/src/migrate-ds-admin.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/migrate-ds-admin.pl.in,v
>retrieving revision 1.6
>diff -u -8 -r1.6 migrate-ds-admin.pl.in
>--- adminserver/admserv/newinst/src/migrate-ds-admin.pl.in	24 Jul 2007 20:10:16 -0000	1.6
>+++ adminserver/admserv/newinst/src/migrate-ds-admin.pl.in	2 Aug 2007 03:43:12 -0000
>@@ -1,9 +1,9 @@
>-#!/usr/bin/env perl
>+#!@perlexec@
> # BEGIN COPYRIGHT BLOCK
> # This Program is free software; you can redistribute it and/or modify it under
> # the terms of the GNU General Public License as published by the Free Software
> # 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.
>@@ -12,17 +12,17 @@
> # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
> # Place, Suite 330, Boston, MA 02111-1307 USA.
> # 
> # Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>-use lib '@perldir@';
>+use lib qw(@perlpath@);
> 
> use strict;
> 
> use AdminMigration;
> use AdminUtil;
> use AdminServer;
> use Migration;
> use Resource;
>Index: adminserver/admserv/newinst/src/register-ds-admin.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register-ds-admin.pl.in,v
>retrieving revision 1.1
>diff -u -8 -r1.1 register-ds-admin.pl.in
>--- adminserver/admserv/newinst/src/register-ds-admin.pl.in	27 Jul 2007 01:42:46 -0000	1.1
>+++ adminserver/admserv/newinst/src/register-ds-admin.pl.in	2 Aug 2007 03:43:12 -0000
>@@ -1,9 +1,9 @@
>-#!/usr/bin/env perl
>+#!@perlexec@
> # BEGIN COPYRIGHT BLOCK
> # This Program is free software; you can redistribute it and/or modify it under
> # the terms of the GNU General Public License as published by the Free Software
> # 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.
>@@ -32,17 +32,17 @@
> # exception.
> #
> #
> # Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>-use lib "@perldir@";
>+use lib qw(@perlpath@);
> 
> use File::Basename;
> use Net::Domain qw(hostfqdn);
> 
> # Admin Setup modules
> use AdminUtil;
> use AdminServer;
> 
>Index: adminserver/admserv/newinst/src/register_server.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_server.pl.in,v
>retrieving revision 1.5
>diff -u -8 -r1.5 register_server.pl.in
>--- adminserver/admserv/newinst/src/register_server.pl.in	24 Jul 2007 20:10:16 -0000	1.5
>+++ adminserver/admserv/newinst/src/register_server.pl.in	2 Aug 2007 03:43:12 -0000
>@@ -1,9 +1,9 @@
>-#!/usr/bin/env perl
>+#!@perlexec@
> # BEGIN COPYRIGHT BLOCK
> # This Program is free software; you can redistribute it and/or modify it under
> # the terms of the GNU General Public License as published by the Free Software
> # 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.
>@@ -30,17 +30,17 @@
> # -w <rootdnpw>: configuration server's rootdn password
> # -d <default_infdir>: the directory where static .inf files are located 
> #                      ("/usr/share/fedora-ds/inf")
> # -i <inffile(s)>: dynamic .inf file(s)
> # -m <mapfile>: map file name
> # <ldiffile> ...: ldif file(s) or template ldif file(s) to be stored in 
> #                 the Configuration Directory Server
> 
>-use lib "@perldir@";
>+use lib qw(@perlpath@);
> 
> use Getopt::Std;
> use Net::Domain qw(hostname hostfqdn);
> # PERLDAP modules
> use Mozilla::LDAP::Conn;
> # Setup Inf module
> use Inf;
> use Util;
>Index: adminserver/admserv/newinst/src/setup-ds-admin.pl.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup-ds-admin.pl.in,v
>retrieving revision 1.10
>diff -u -8 -r1.10 setup-ds-admin.pl.in
>--- adminserver/admserv/newinst/src/setup-ds-admin.pl.in	24 Jul 2007 20:10:16 -0000	1.10
>+++ adminserver/admserv/newinst/src/setup-ds-admin.pl.in	2 Aug 2007 03:43:12 -0000
>@@ -1,9 +1,9 @@
>-#!/usr/bin/env perl
>+#!@perlexec@
> # BEGIN COPYRIGHT BLOCK
> # This Program is free software; you can redistribute it and/or modify it under
> # the terms of the GNU General Public License as published by the Free Software
> # 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.
>@@ -12,17 +12,17 @@
> # this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
> # Place, Suite 330, Boston, MA 02111-1307 USA.
> # 
> # Copyright (C) 2007 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>-use lib '@perldir@';
>+use lib qw(@perlpath@);
> 
> use strict;
> 
> use Setup;
> use SetupLog;
> use Inf;
> use Resource;
> use DialogManager;

Actions: View | Diff

Attachments on bug 250535: 160494 | 160495 | 160525 | 160526