Attachment 160494 Details for Bug 250535 – diffs for ldapserver

[patch] diffs for ldapserver

cvsdiffs (text/plain), 10.84 KB, created by Rich Megginson on 2007-08-02 03:44:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-08-02 03:44:16 UTC

Size: 10.84 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.52
>diff -u -8 -r1.52 Makefile.am
>--- ldapserver/Makefile.am	24 Jul 2007 20:06:39 -0000	1.52
>+++ ldapserver/Makefile.am	1 Aug 2007 22:08:02 -0000
>@@ -984,16 +984,19 @@
> 
> # 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:
> # LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds
> # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
> # LD_LIBRARY_PATH = /usr/lib/fedora-ds
> if BUNDLE
>+# on the systems on which we bundle, perldap will be in libdir/perl, so we need to point
>+# the perlpath there - on other systems, perldap will be installed as a site module into
>+# the system perl
> fixupcmd = sed \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@libdir\@,$(libdir),g' \
> 	-e 's,@nspr_libdir\@,$(libdir),g' \
> 	-e 's,@nss_libdir\@,$(libdir),g' \
> 	-e 's,@ldapsdk_libdir\@,$(libdir),g' \
> 	-e 's,@ldapsdk_bindir\@,$(bindir),g' \
>@@ -1024,20 +1027,21 @@
> 	-e 's,@brand\@,$(brand),g' \
> 	-e 's,@capbrand\@,$(capbrand),g' \
> 	-e 's,@vendor\@,$(vendor),g' \
> 	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
> 	-e 's,@BUILDNUM\@,$(BUILDNUM),g' \
> 	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
>-	-e 's,@perldir\@,$(perldir),g' \
>+	-e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
> 	-e 's,@defaultuser\@,$(defaultuser),g' \
> 	-e 's,@defaultgroup\@,$(defaultgroup),g' \
>-	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g'
>+	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
>+	-e 's,@perlexec\@,@perlexec@,g'
> else
> fixupcmd = sed \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@libdir\@,$(libdir),g' \
> 	-e 's,@nspr_libdir\@,$(nspr_libdir),g' \
> 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
> 	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
>@@ -1069,20 +1073,21 @@
> 	-e 's,@brand\@,$(brand),g' \
> 	-e 's,@capbrand\@,$(capbrand),g' \
> 	-e 's,@vendor\@,$(vendor),g' \
> 	-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
> 	-e 's,@BUILDNUM\@,$(BUILDNUM),g' \
> 	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
>-	-e 's,@perldir\@,$(perldir),g' \
>+	-e 's,@perlpath\@,$(perldir),g' \
> 	-e 's,@defaultuser\@,$(defaultuser),g' \
> 	-e 's,@defaultgroup\@,$(defaultgroup),g' \
>-	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g'
>+	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
>+	-e 's,@perlexec\@,@perlexec@,g'
> endif
> 
> %: %.in
> 	mkdir -p $(dir $@)
> 	$(fixupcmd) $^ > $@
> 
> %/$(PACKAGE_NAME): %/initscript.in
> 	$(fixupcmd) $^ > $@
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.34
>diff -u -8 -r1.34 configure.ac
>--- ldapserver/configure.ac	13 Jul 2007 18:35:32 -0000	1.34
>+++ ldapserver/configure.ac	1 Aug 2007 22:08:02 -0000
>@@ -233,16 +233,24 @@
> 
> # 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)
> 
> # Deal with platform dependent defines
> # relative to sysconfdir
> initdir=/rc.d
>+# 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])
>     AC_DEFINE([LINUX2_0], [1], [Linux 2.0])
>     AC_DEFINE([LINUX2_2], [1], [Linux 2.2])
>     AC_DEFINE([LINUX2_4], [1], [Linux 2.4])
>@@ -255,28 +263,32 @@
>     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'
>     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])
>+    # 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])
>@@ -294,24 +306,27 @@
>     LIBDL=-ldl
>     AC_SUBST([LIBDL], [$LIBDL])
> dnl Cstd and Crun are required to link any C++ related code
>     LIBCSTD=-lCstd
>     AC_SUBST([LIBCSTD], [$LIBCSTD])
>     LIBCRUN=-lCrun
>     AC_SUBST([LIBCRUN], [$LIBCRUN])
>     platform="solaris"
>+    # assume 64 bit
>+    perlexec='/opt/perl5x/bin/perl'
>     # relative to sysconfdir
>     initdir=/init.d
>     ;;
>   *)
>     platform=""
>     ;;
> esac
> AC_SUBST(initdir)
>+AC_SUBST(perlexec)
> 
> AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
> AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
> 
> # Check for library dependencies
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
>Index: ldapserver/ldap/admin/src/scripts/DSCreate.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
>retrieving revision 1.3
>diff -u -8 -r1.3 DSCreate.pm.in
>--- ldapserver/ldap/admin/src/scripts/DSCreate.pm.in	26 Jul 2007 20:40:11 -0000	1.3
>+++ ldapserver/ldap/admin/src/scripts/DSCreate.pm.in	1 Aug 2007 22:08:02 -0000
>@@ -196,17 +196,18 @@
>         }
>     }
> 
>     return @errs;
> }
> 
> sub createInstanceScripts {
>     my $inf = shift;
>-    my $myperl = "!/usr/bin/env perl";
>+    my $perlexec = "@perlexec@" || "/usr/bin/env perl";
>+    my $myperl = "!$perlexec";
>     my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
>     my %maptable = (
>         "DS-ROOT" => $inf->{General}->{prefix},
>         "SEP" => "/", # works on all platforms
>         "SERVER-NAME" => $inf->{General}->{FullMachineName},
>         "SERVER-PORT" => $inf->{slapd}->{ServerPort},
>         "PERL-EXEC" => $myperl,
>         "DEV-NULL" => $mydevnull,
>Index: ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v
>retrieving revision 1.3
>diff -u -8 -r1.3 migrate-ds.pl.in
>--- ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in	18 Jul 2007 20:37:11 -0000	1.3
>+++ ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in	1 Aug 2007 22:08:02 -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.
>@@ -42,17 +42,17 @@
> # This perl module provides a way to set up a new installation after
> # the binaries have already been extracted.  This is typically after
> # using native packaging support to install the package e.g. RPM,
> # pkgadd, depot, etc.  This script will show the license, readme,
> # dsktune, then run the usual setup pre and post installers.
> #
> ##########################
> 
>-use lib '@perldir@';
>+use lib qw(@perlpath@);
> 
> use strict;
> 
> use DSMigration;
> use Migration;
> use Resource;
> 
> my $res = new Resource("@propertydir@/migrate-ds.res",
>Index: ldapserver/ldap/admin/src/scripts/setup-ds.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
>retrieving revision 1.7
>diff -u -8 -r1.7 setup-ds.pl.in
>--- ldapserver/ldap/admin/src/scripts/setup-ds.pl.in	18 Jul 2007 20:37:11 -0000	1.7
>+++ ldapserver/ldap/admin/src/scripts/setup-ds.pl.in	1 Aug 2007 22:08:03 -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 strict;
> 
> use Setup;
> use SetupLog;
> use Inf;
> use Resource;
> use DialogManager;
>Index: ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in,v
>retrieving revision 1.4
>diff -u -8 -r1.4 template-ns-newpwpolicy.pl.in
>--- ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in	12 Feb 2007 19:55:10 -0000	1.4
>+++ ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in	1 Aug 2007 22:08:03 -0000
>@@ -34,16 +34,18 @@
> # 
> # 
> # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
> # Copyright (C) 2005 Red Hat, Inc.
> # All rights reserved.
> # END COPYRIGHT BLOCK
> #
> 
>+use lib qw(@perlpath@);
>+
> # enable the use of our bundled perldap with our bundled ldapsdk libraries
> # all of this nonsense can be omitted if the mozldapsdk and perldap are
> # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)
> $prefix = "{{DS-ROOT}}";
> 
> $ENV{'PATH'} = "$prefix@ldapsdk_bindir@:$prefix/usr/bin:@ldapsdk_bindir@:/usr/bin";
> $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
> $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";

Actions: View | Diff

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