[Fedora-directory-commits] adminserver Makefile.am, 1.26, 1.27 configure.ac, 1.15, 1.16 aclocal.m4, 1.23, 1.24 configure, 1.26, 1.27 missing, 1.15, 1.16 install-sh, 1.15, 1.16 compile, 1.14, 1.15 Makefile.in, 1.29, 1.30 depcomp, 1.15, 1.16 config.sub, 1.15, 1.16 config.guess, 1.15, 1.16
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517/adminserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh compile Makefile.in depcomp config.sub config.guess
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH. However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms. Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am 1 Aug 2007 18:14:53 -0000 1.26
+++ Makefile.am 2 Aug 2007 14:44:09 -0000 1.27
@@ -363,6 +363,7 @@
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
@@ -374,6 +375,7 @@
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;
@@ -463,7 +465,8 @@
-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'
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure.ac 1 Aug 2007 18:14:53 -0000 1.15
+++ configure.ac 2 Aug 2007 14:44:09 -0000 1.16
@@ -137,6 +137,14 @@
# 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])
@@ -156,6 +164,8 @@
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"
@@ -172,6 +182,8 @@
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*)
@@ -197,12 +209,15 @@
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")
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure 1 Aug 2007 18:14:53 -0000 1.26
+++ configure 2 Aug 2007 14:44:09 -0000 1.27
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23188,6 +23188,14 @@
# 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*)
@@ -23255,6 +23263,8 @@
#define _HPUX_SOURCE 1
_ACEOF
+ # assume 64 bit
+ perlexec='/opt/perl_64/bin/perl'
CXXLINK_REQUIRED=1
httpdgroup=nogroup
platform="hpux"
@@ -23307,6 +23317,8 @@
CXXLINK_REQUIRED=1
httpdgroup=nogroup
+ # assume 64 bit
+ perlexec='/opt/perl_64/bin/perl'
platform="hpux"
;;
sparc-sun-solaris*)
@@ -23374,6 +23386,8 @@
CXXLINK_REQUIRED=1
platform="solaris"
+ # assume 64 bit
+ perlexec='/opt/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
@@ -23382,6 +23396,7 @@
+
if test "$CXXLINK_REQUIRED" = 1; then
CXXLINK_REQUIRED_TRUE=
CXXLINK_REQUIRED_FALSE='#'
@@ -25875,6 +25890,7 @@
s,@LIBCSTD@,$LIBCSTD,;t t
s,@LIBCRUN@,$LIBCRUN,;t t
s,@initdir@,$initdir,;t t
+s,@perlexec@,$perlexec,;t t
s,@CXXLINK_REQUIRED_TRUE@,$CXXLINK_REQUIRED_TRUE,;t t
s,@CXXLINK_REQUIRED_FALSE@,$CXXLINK_REQUIRED_FALSE,;t t
s,@HPUX_TRUE@,$HPUX_TRUE,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.in 1 Aug 2007 18:14:53 -0000 1.29
+++ Makefile.in 2 Aug 2007 14:44:09 -0000 1.30
@@ -489,6 +489,7 @@
nsspcache = @nsspcache@
oldincludedir = @oldincludedir@
perldir = $(libdir)@perldir@
+perlexec = @perlexec@
piddir = $(localstatedir)@piddir@
pidfile = @pidfile@
prefix = @prefix@
@@ -776,6 +777,12 @@
# nssmoddir is the same
@BUNDLE_FALSE@runtime_nssmoddir = $(nssmoddir)
@BUNDLE_TRUE@runtime_nssmoddir = $(admmoddir)
+@BUNDLE_FALSE@runtime_nss_libdir = $(nss_libdir)
+@BUNDLE_TRUE@runtime_nss_libdir = $(libdir)
+@BUNDLE_FALSE@runtime_ldapsdk_libdir = $(ldapsdk_libdir)
+@BUNDLE_TRUE@runtime_ldapsdk_libdir = $(libdir)
+@BUNDLE_FALSE@perlpath = $(perldir)
+@BUNDLE_TRUE@perlpath = $(perldir) $(libdir)/perl/arch $(libdir)/perl
# need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
# sort also strips out duplicates
@BUNDLE_FALSE@LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(icu_libdir) $(libdir)
@@ -810,8 +817,6 @@
# 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' \
@@ -837,8 +842,8 @@
-e 's,@pidfile\@,$(pidfile),g' \
-e 's,@admservport\@,$(admservport),g' \
-e 's,@LIBPATH\@,$(LIBPATH),g' \
- -e 's,@nss_libdir\@,$(nss_libdir),g' \
- -e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
+ -e 's,@nss_libdir\@,$(runtime_nss_libdir),g' \
+ -e 's,@ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
-e 's,@admmoddir\@,$(admmoddir),g' \
-e 's,@nssmoddir\@,$(runtime_nssmoddir),g' \
-e 's,@instconfigdir\@,$(instconfigdir),g' \
@@ -855,7 +860,8 @@
-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'
16 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.3, 1.4 migrate-ds.pl.in, 1.3, 1.4 setup-ds.pl.in, 1.7, 1.8 template-ns-newpwpolicy.pl.in, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9035/ldapserver/ldap/admin/src/scripts
Modified Files:
DSCreate.pm.in migrate-ds.pl.in setup-ds.pl.in
template-ns-newpwpolicy.pl.in
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH. However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms. Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no
Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSCreate.pm.in 26 Jul 2007 20:40:11 -0000 1.3
+++ DSCreate.pm.in 2 Aug 2007 14:39:01 -0000 1.4
@@ -201,7 +201,8 @@
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},
Index: migrate-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- migrate-ds.pl.in 18 Jul 2007 20:37:11 -0000 1.3
+++ migrate-ds.pl.in 2 Aug 2007 14:39:01 -0000 1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@@ -47,7 +47,7 @@
#
##########################
-use lib '@perldir@';
+use lib qw(@perlpath@);
use strict;
Index: setup-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup-ds.pl.in 18 Jul 2007 20:37:11 -0000 1.7
+++ setup-ds.pl.in 2 Aug 2007 14:39:01 -0000 1.8
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@@ -37,7 +37,7 @@
# END COPYRIGHT BLOCK
#
-use lib '@perldir@';
+use lib qw(@perlpath@);
use strict;
Index: template-ns-newpwpolicy.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-ns-newpwpolicy.pl.in 12 Feb 2007 19:55:10 -0000 1.4
+++ template-ns-newpwpolicy.pl.in 2 Aug 2007 14:39:01 -0000 1.5
@@ -39,6 +39,8 @@
# 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)
16 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/admin/src ns-newpwpolicy.pl, 1.6, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9035/ldapserver/ldap/admin/src
Removed Files:
ns-newpwpolicy.pl
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH. However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms. Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no
--- ns-newpwpolicy.pl DELETED ---
16 years, 9 months
[Fedora-directory-commits] ldapserver Makefile.am, 1.52, 1.53 configure.ac, 1.34, 1.35 aclocal.m4, 1.44, 1.45 configure, 1.55, 1.56 missing, 1.34, 1.35 install-sh, 1.34, 1.35 depcomp, 1.34, 1.35 compile, 1.34, 1.35 config.guess, 1.33, 1.34 Makefile.in, 1.61, 1.62 config.sub, 1.33, 1.34
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9035/ldapserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile config.guess Makefile.in config.sub
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH. However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms. Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Makefile.am 24 Jul 2007 20:06:39 -0000 1.52
+++ Makefile.am 2 Aug 2007 14:39:00 -0000 1.53
@@ -989,6 +989,9 @@
# 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' \
@@ -1029,10 +1032,11 @@
-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' \
@@ -1074,10 +1078,11 @@
-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
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- configure.ac 13 Jul 2007 18:35:32 -0000 1.34
+++ configure.ac 2 Aug 2007 14:39:00 -0000 1.35
@@ -238,6 +238,14 @@
# 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])
@@ -260,6 +268,8 @@
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*)
@@ -272,6 +282,8 @@
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*)
@@ -299,6 +311,8 @@
LIBCRUN=-lCrun
AC_SUBST([LIBCRUN], [$LIBCRUN])
platform="solaris"
+ # assume 64 bit
+ perlexec='/opt/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
@@ -307,6 +321,7 @@
;;
esac
AC_SUBST(initdir)
+AC_SUBST(perlexec)
AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- configure 24 Jul 2007 20:06:40 -0000 1.55
+++ configure 2 Aug 2007 14:39:00 -0000 1.56
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-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 debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor 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 debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23245,6 +23245,14 @@
# 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*)
@@ -23327,6 +23335,8 @@
#define _HPUX_SOURCE 1
_ACEOF
+ # assume 64 bit
+ perlexec='/opt/perl_64/bin/perl'
platform="hpux"
;;
hppa*-hp-hpux*)
@@ -23375,6 +23385,8 @@
#define _HPUX_SOURCE 1
_ACEOF
+ # assume 64 bit
+ perlexec='/opt/perl_64/bin/perl'
platform="hpux"
;;
sparc-sun-solaris*)
@@ -23449,6 +23461,8 @@
LIBCRUN=$LIBCRUN
platform="solaris"
+ # assume 64 bit
+ perlexec='/opt/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
@@ -23460,6 +23474,7 @@
+
if test "$platform" = "hpux"; then
HPUX_TRUE=
HPUX_FALSE='#'
@@ -26044,6 +26059,7 @@
s,@LIBCSTD@,$LIBCSTD,;t t
s,@LIBCRUN@,$LIBCRUN,;t t
s,@initdir@,$initdir,;t t
+s,@perlexec@,$perlexec,;t t
s,@HPUX_TRUE@,$HPUX_TRUE,;t t
s,@HPUX_FALSE@,$HPUX_FALSE,;t t
s,@SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Makefile.in 24 Jul 2007 20:06:40 -0000 1.61
+++ Makefile.in 2 Aug 2007 14:39:00 -0000 1.62
@@ -938,6 +938,7 @@
nss_libdir = @nss_libdir@
oldincludedir = @oldincludedir@
perldir = $(libdir)@perldir@
+perlexec = @perlexec@
prefix = @prefix@
program_transform_name = @program_transform_name@
propertydir = $(datadir)@propertydir@
@@ -1898,10 +1899,11 @@
@BUNDLE_FALSE@ -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
@BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
@BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-@BUNDLE_FALSE@ -e 's,@perldir\@,$(perldir),g' \
+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \
@BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \
@BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
-@BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g'
+@BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
+@BUNDLE_FALSE@ -e 's,@perlexec\@,@perlexec@,g'
# these are for the config files and scripts that we need to generate and replace
@@ -1910,6 +1912,9 @@
# 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
+# 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
@BUNDLE_TRUE@fixupcmd = sed \
@BUNDLE_TRUE@ -e 's,@bindir\@,$(bindir),g' \
@BUNDLE_TRUE@ -e 's,@sbindir\@,$(sbindir),g' \
@@ -1950,10 +1955,11 @@
@BUNDLE_TRUE@ -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
@BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
@BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-@BUNDLE_TRUE@ -e 's,@perldir\@,$(perldir),g' \
+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
@BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \
@BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
-@BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g'
+@BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
+@BUNDLE_TRUE@ -e 's,@perlexec\@,@perlexec@,g'
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
16 years, 9 months
[Fedora-directory-commits] adminutil Makefile.am, 1.7, 1.8 configure.ac, 1.7, 1.8 aclocal.m4, 1.10, 1.11 configure, 1.10, 1.11 missing, 1.9, 1.10 install-sh, 1.9, 1.10 compile, 1.9, 1.10 depcomp, 1.9, 1.10 config.sub, 1.9, 1.10 config.guess, 1.9, 1.10 Makefile.in, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30550/adminutil
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh compile depcomp config.sub config.guess Makefile.in
Log Message:
Resolves: bug 250526
Bug Description: adminutil: should not link against libplds or libsoftokn
Reviewed by: nhosoi (Thanks!)
Fix Description: This causes problems for apps that link against adminutil. adminutil does not need these libraries.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 22 Jun 2007 21:06:44 -0000 1.7
+++ Makefile.am 2 Aug 2007 03:18:03 -0000 1.8
@@ -17,8 +17,8 @@
#------------------------
# Linker Flags
#------------------------
-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4
+NSS_LINK = @nss_lib@ -lssl3 -lnss3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
if enable_tests
SASL_LINK = @sasl_lib@ -lsasl2
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac 24 Jul 2007 18:40:44 -0000 1.7
+++ configure.ac 2 Aug 2007 03:18:03 -0000 1.8
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.3], [http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.4], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure 24 Jul 2007 18:40:44 -0000 1.10
+++ configure 2 Aug 2007 03:18:03 -0000 1.11
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.3.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.4.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='adminutil'
PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='adminutil 1.1.3'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='adminutil 1.1.4'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures adminutil 1.1.3 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of adminutil 1.1.3:";;
+ short | recursive ) echo "Configuration of adminutil 1.1.4:";;
esac
cat <<\_ACEOF
@@ -1180,7 +1180,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-adminutil configure 1.1.3
+adminutil configure 1.1.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1194,7 +1194,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by adminutil $as_me 1.1.3, which was
+It was created by adminutil $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1837,7 +1837,7 @@
# Define the identity of the package.
PACKAGE='adminutil'
- VERSION='1.1.3'
+ VERSION='1.1.4'
cat >>confdefs.h <<_ACEOF
@@ -24367,7 +24367,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by adminutil $as_me 1.1.3, which was
+This file was extended by adminutil $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24425,7 +24425,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-adminutil config.status 1.1.3
+adminutil config.status 1.1.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 24 Jul 2007 18:40:44 -0000 1.10
+++ Makefile.in 2 Aug 2007 03:18:03 -0000 1.11
@@ -325,8 +325,8 @@
#------------------------
# Linker Flags
#------------------------
-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4
+NSS_LINK = @nss_lib@ -lssl3 -lnss3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
@enable_tests_TRUE@SASL_LINK = @sasl_lib@ -lsasl2
ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata $(LIBCSTD) $(LIBCRUN)
16 years, 9 months
[Fedora-directory-commits] fedora-idm-console - Imported sources
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/fedora-idm-console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8100
Log Message:
Initial import of fedora-idm-console
Status:
Vendor Tag: fedora
Release Tags: start
N fedora-idm-console/build.xml
N fedora-idm-console/fedora-idm-console.spec
N fedora-idm-console/build.properties
N fedora-idm-console/fedora-idm-console
N fedora-idm-console/com/netscape/management/client/theme/theme.properties
N fedora-idm-console/com/netscape/management/client/theme/images/logo32.gif
N fedora-idm-console/com/netscape/management/client/theme/images/ConsoleBanner.gif
N fedora-idm-console/com/netscape/management/client/theme/images/logo16.gif
N fedora-idm-console/com/netscape/management/client/theme/images/login.gif
No conflicts created by this import
16 years, 9 months
[Fedora-directory-commits] console idm-console-framework.spec, NONE, 1.1 build.properties, 1.13, 1.14 build.xml, 1.16, 1.17 fedora-idm-console, 1.1, NONE fedora-idm-console.spec, 1.2, NONE
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16097
Modified Files:
build.properties build.xml
Added Files:
idm-console-framework.spec
Removed Files:
fedora-idm-console fedora-idm-console.spec
Log Message:
Resolves: 250481
Summary: Make console framework brand agnostic. Remove theme.
--- NEW FILE idm-console-framework.spec ---
%define major_version 1.1
%define minor_version 0
Name: idm-console-framework
Version: %{major_version}.%{minor_version}
Release: 1
Summary: Identity Management Console Framework
Group: System Environment/Libraries
License: LGPL
URL: http://directory.fedoraproject.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source: %{name}-%{version}.tar.bz2
Requires: ldapjdk
Requires: jss >= 4.2
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: jss >= 4.2
%description
A Java Management Console framework used for remote server management.
%prep
%setup -q
%build
%{ant} \
-Dlib.dir=%{_libdir} \
-Dbuilt.dir=`pwd`/built \
-Dclassdest=%{_javadir}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
install -m777 built/release/jars/idm-console-* $RPM_BUILD_ROOT%{_javadir}
# create symlinks
pushd $RPM_BUILD_ROOT%{_javadir}
ln -s idm-console-base-%{version}.jar idm-console-base-%{major_version}.jar
ln -s idm-console-base-%{version}.jar idm-console-base.jar
ln -s idm-console-mcc-%{version}.jar idm-console-mcc-%{major_version}.jar
ln -s idm-console-mcc-%{version}.jar idm-console-mcc.jar
ln -s idm-console-mcc-%{version}_en.jar idm-console-mcc-%{major_version}_en.jar
ln -s idm-console-mcc-%{version}_en.jar idm-console-mcc_en.jar
ln -s idm-console-nmclf-%{version}.jar idm-console-nmclf-%{major_version}.jar
ln -s idm-console-nmclf-%{version}.jar idm-console-nmclf.jar
ln -s idm-console-nmclf-%{version}_en.jar idm-console-nmclf-%{major_version}_en.jar
ln -s idm-console-nmclf-%{version}_en.jar idm-console-nmclf_en.jar
popd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_javadir}/idm-console-base-%{version}.jar
%{_javadir}/idm-console-base-%{major_version}.jar
%{_javadir}/idm-console-base.jar
%{_javadir}/idm-console-mcc-%{version}.jar
%{_javadir}/idm-console-mcc-%{major_version}.jar
%{_javadir}/idm-console-mcc.jar
%{_javadir}/idm-console-mcc-%{version}_en.jar
%{_javadir}/idm-console-mcc-%{major_version}_en.jar
%{_javadir}/idm-console-mcc_en.jar
%{_javadir}/idm-console-nmclf-%{version}.jar
%{_javadir}/idm-console-nmclf-%{major_version}.jar
%{_javadir}/idm-console-nmclf.jar
%{_javadir}/idm-console-nmclf-%{version}_en.jar
%{_javadir}/idm-console-nmclf-%{major_version}_en.jar
%{_javadir}/idm-console-nmclf_en.jar
%changelog
* Wed Aug 1 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1
- Initial creation (based on old fedora-idm-console package).
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.properties 27 Jul 2007 20:29:59 -0000 1.13
+++ build.properties 1 Aug 2007 21:29:55 -0000 1.14
@@ -21,28 +21,22 @@
lang=en
-console.brand=fedora
-
console.root=.
console.version=11
console.dotversion=1.1.0
console.dotgenversion=1.1
-mcc.core=${console.brand}-mcc
+mcc.core=idm-console-mcc
mcc.name=${mcc.core}-${console.dotversion}
mcc.gen.name=${mcc.core}-${console.dotgenversion}
-nmclf.core=${console.brand}-nmclf
+nmclf.core=idm-console-nmclf
nmclf.name=${nmclf.core}-${console.dotversion}
nmclf.gen.name=${nmclf.core}-${console.dotgenversion}
-base.core=${console.brand}-idm-console-base
+base.core=idm-console-base
base.name=${base.core}-${console.dotversion}
base.gen.name=${base.core}-${console.dotgenversion}
-theme.core=${console.brand}-idm-console
-theme.name=${theme.core}-${console.dotversion}
-theme.gen.name=${theme.core}-${console.dotgenversion}
-
jss.jar.name=jss4.jar
ldapjdk.jar.name=ldapjdk.jar
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 27 Jul 2007 20:29:59 -0000 1.16
+++ build.xml 1 Aug 2007 21:29:55 -0000 1.17
@@ -183,22 +183,6 @@
excludes="**/CVS/**">
<classpath refid="console.classpath" />
</javac>
-
- <!-- create fedora-idm-console script -->
- <copy file="fedora-idm-console" todir="${release.dir}"/>
- <replace file="${release.dir}/fedora-idm-console">
- <replacefilter token="@classdest@" value="${classdest}"/>
- <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/>
- <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
- <replacefilter token="@basejar@" value="${base.name}.jar"/>
- <replacefilter token="@mccjar@" value="${mcc.name}.jar"/>
- <replacefilter token="@mcclangjar@" value="${mcc.name}_${lang}.jar"/>
- <replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/>
- <replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/>
- <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
- <replacefilter token="@prefsdir@" value="${theme.core}"/>
- <replacefilter token="@libdir@" value="${lib.dir}"/>
- </replace>
</target>
<!-- Package -->
@@ -232,12 +216,6 @@
<include name="com/netscape/management/client/**/*.properties" />
<include name="com/netscape/management/client/**/*.gif" />
<include name="com/netscape/management/client/**/*.jpg" />
- <exclude name="com/netscape/management/client/theme/**" />
- </fileset>
- </jar>
- <jar jarfile="${built.jardir}/${theme.name}_${lang}.jar" >
- <fileset dir="${java.src.dir}">
- <include name="com/netscape/management/client/theme/**" />
</fileset>
</jar>
<jar jarfile="${built.jardir}/${nmclf.name}.jar" >
@@ -280,7 +258,6 @@
<!-- Copy built jars to packaging area -->
<copy file="${built.jardir}/${mcc.name}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${mcc.name}_${lang}.jar" todir="${java.dir}"/>
- <copy file="${built.jardir}/${theme.name}_${lang}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${nmclf.name}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${nmclf.name}_${lang}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${base.name}.jar" todir="${java.dir}"/>
@@ -292,9 +269,6 @@
<arg line="-s ${mcc.name}_${lang}.jar ${mcc.gen.name}_${lang}.jar"/>
</exec>
<exec executable="ln" dir="${java.dir}" vmlauncher="true">
- <arg line="-s ${theme.name}_${lang}.jar ${theme.gen.name}_${lang}.jar"/>
- </exec>
- <exec executable="ln" dir="${java.dir}" vmlauncher="true">
<arg line="-s ${nmclf.name}.jar ${nmclf.gen.name}.jar"/>
</exec>
<exec executable="ln" dir="${java.dir}" vmlauncher="true">
--- fedora-idm-console DELETED ---
--- fedora-idm-console.spec DELETED ---
16 years, 9 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.5, 1.6 httpd-2.2.conf.in, 1.5, 1.6 httpd.conf.in, 1.6, 1.7 start-ds-admin.in, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259/adminserver/admserv/cfgstuff
Modified Files:
admserv.conf.in httpd-2.2.conf.in httpd.conf.in
start-ds-admin.in
Log Message:
Resolves: bug 250324
Bug Description: adminserver: port to HP-UX
Reviewed by: nkinder, nhosoi (Thanks!)
Fix Description: 1) We need the same --enable-bundle option as ldapserver, so that adminserver knows where to find the shared libraries at runtime. 2) The adminserver Makefile constructs the LIBPATH for scripts to use. Use this consistently
3) Need to use -lpthread before -lc
4) Use same --enable-debug as ldapserver
5) HP-UX has group "nogroup" instead of "nobody"
6) Use same libtool gcc hack as ldapserver uses
7) mod_deflate is not supported on HP-UX
Doing a DEBUG build caused breakage due to missing ereport. Instead, just use PR_ASSERT for NS_ASSERT.
HAVE_STRFTIME is now defined in config.h.
Platforms tested: HP-UX 11.23 IPF 64bit, RHEL4
Flag Day: Yes - autotool file changes
Doc impact: no
Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admserv.conf.in 15 Jun 2007 22:35:24 -0000 1.5
+++ admserv.conf.in 1 Aug 2007 18:14:53 -0000 1.6
@@ -29,7 +29,7 @@
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
Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd-2.2.conf.in 21 May 2007 15:52:26 -0000 1.5
+++ httpd-2.2.conf.in 1 Aug 2007 18:14:53 -0000 1.6
@@ -124,7 +124,9 @@
LoadModule env_module @moddir(a)/mod_env.so
LoadModule mime_magic_module @moddir(a)/mod_mime_magic.so
LoadModule expires_module @moddir(a)/mod_expires.so
+<IfDefine !OmitDeflate>
LoadModule deflate_module @moddir(a)/mod_deflate.so
+</IfDefine>
LoadModule headers_module @moddir(a)/mod_headers.so
LoadModule unique_id_module @moddir(a)/mod_unique_id.so
LoadModule setenvif_module @moddir(a)/mod_setenvif.so
Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- httpd.conf.in 31 Jul 2007 00:19:22 -0000 1.6
+++ httpd.conf.in 1 Aug 2007 18:14:53 -0000 1.7
@@ -123,7 +123,9 @@
LoadModule env_module @moddir(a)/mod_env.so
LoadModule mime_magic_module @moddir(a)/mod_mime_magic.so
LoadModule expires_module @moddir(a)/mod_expires.so
+<IfDefine !OmitDeflate>
LoadModule deflate_module @moddir(a)/mod_deflate.so
+</IfDefine>
LoadModule headers_module @moddir(a)/mod_headers.so
LoadModule unique_id_module @moddir(a)/mod_unique_id.so
LoadModule setenvif_module @moddir(a)/mod_setenvif.so
Index: start-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- start-ds-admin.in 21 May 2007 15:52:26 -0000 1.2
+++ start-ds-admin.in 1 Aug 2007 18:14:53 -0000 1.3
@@ -51,4 +51,9 @@
fi
fi
-$HTTPD -k start -f @configdir(a)/httpd.conf "$@"
+# mod_deflate is not supported on HP-UX using the /opt/hpws apache
+if [ $OS = "HP-UX" ] ; then
+ OMIT_DEFLATE="-DOmitDeflate"
+fi
+
+$HTTPD $OMIT_DEFLATE -k start -f @configdir(a)/httpd.conf "$@"
16 years, 9 months