Attachment 157508 Details for Bug 244749 – cvs diffs

[patch] cvs diffs

244749.diffs (text/plain), 9.87 KB, created by Noriko Hosoi on 2007-06-21 01:51:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-21 01:51:06 UTC

Size: 9.87 KB

patch

obsolete

>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.13
>diff -t -w -U4 -r1.13 Makefile.am
>--- Makefile.am	20 Jun 2007 22:33:15 -0000	1.13
>+++ Makefile.am	21 Jun 2007 01:40:15 -0000
>@@ -381,8 +381,9 @@
>         -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' \
>         -e 's,@brand\@,$(brand),g' \
>         -e 's,@capbrand\@,$(capbrand),g' \
>         -e 's,@vendor\@,$(vendor),g' \
>         -e 's,@helpdir\@,$(helpdir),g' \
>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.9
>diff -t -w -U4 -r1.9 configure.ac
>--- configure.ac	20 Jun 2007 22:33:15 -0000	1.9
>+++ configure.ac	21 Jun 2007 01:40:15 -0000
>@@ -61,8 +61,11 @@
> AC_SUBST(PACKAGE_BASE_NAME)
> # the default prefix - override with --prefix or --with-fhs or --with-fhs-opt
> AC_PREFIX_DEFAULT([/opt/@PACKAGE_BASE_NAME@])
> 
>+PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
>+AC_SUBST(PACKAGE_BASE_VERSION)
>+
> brand=fedora
> capbrand=Fedora
> vendor="Fedora Project"
> 
>Index: admserv/newinst/src/admin.inf.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/admin.inf.in,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 admin.inf.in
>--- admserv/newinst/src/admin.inf.in	15 Jun 2007 22:16:28 -0000	1.2
>+++ admserv/newinst/src/admin.inf.in	21 Jun 2007 01:40:15 -0000
>@@ -28,8 +28,9 @@
> Brand= @capbrand@
> NormBrand = @brand@
> Vendor=@vendor@
> Version= @PACKAGE_VERSION@
>+BaseVersion= @PACKAGE_BASE_VERSION@
> NickName= admin
> BuildNumber= @NQBUILD_NUM@
> # the rest of these are obsolete, but left here for
> # compatability with the old setuputil
>Index: admserv/newinst/src/adminserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 adminserver.map.in
>--- admserv/newinst/src/adminserver.map.in	19 Jun 2007 18:32:28 -0000	1.1
>+++ admserv/newinst/src/adminserver.map.in	21 Jun 2007 01:40:15 -0000
>@@ -65,12 +65,13 @@
> admpw =                 "@configdir@/admpw"
> as_error =              "@logdir@/errors"
> as_access =             "@logdir@/access"
> as_pid =                "@pidfile@"
>-as_console_jar =        "%normbrand%-admserv-%as_version%.jar"
>+as_console_jar =        "%normbrand%-admserv-%as_baseversion%.jar"
> as_help_path =  "@helpdir@"
> as_user =               SysUser
> as_version =    Version
>+as_baseversion =        BaseVersion
> as_buildnum =   BuildNumber
> as_installedlocation =  "AS INSTALLED LOCATION -- replace me"
> as_serverroot = "AS SERVER ROOT-- replace me"
> as_sie =                "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: admserv/newinst/src/configdsroot.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 configdsroot.map.in
>--- admserv/newinst/src/configdsroot.map.in	15 Jun 2007 22:16:28 -0000	1.1
>+++ admserv/newinst/src/configdsroot.map.in	21 Jun 2007 01:40:15 -0000
>@@ -61,11 +61,13 @@
> as_uid =                ServerAdminID
> as_passwd =             ServerAdminPwd
> asid =          `use Net::Domain qw(hostname); $returnvalue = hostname();`
> as_version =    Version
>+as_baseversion =        BaseVersion
> 
> ds_version =    Version
>+ds_baseversion =        BaseVersion
> ds_port =               ServerPort
> ds_secure_port ="636"
> ds_suffix =             Suffix
> 
>-ds_console_jar ="%normbrand%-ds-%ds_version%.jar"
>+ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
>Index: admserv/newinst/src/dirserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 dirserver.map.in
>--- admserv/newinst/src/dirserver.map.in	19 Jun 2007 18:32:28 -0000	1.1
>+++ admserv/newinst/src/dirserver.map.in	21 Jun 2007 01:40:15 -0000
>@@ -62,15 +62,16 @@
> 
> asid =          `use Net::Domain qw(hostname); $returnvalue = hostname();`
> as_sie =                "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
> ds_version =    Version
>+ds_baseversion =        BaseVersion
> dsid =                  ServerIdentifier
> ds_user =               SuiteSpotUserID
> ds_port =               ServerPort
> ds_secure_port ="636"
> rootdn =                RootDN
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
>-ds_console_jar ="%normbrand%-ds-%ds_version%.jar"
>+ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
> ds_installedlocation =  "DS INSTALLED LOCATION -- replace me"
> ds_serverroot = "DS SERVER ROOT-- replace me"
> ds_sie =                "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: admserv/newinst/src/register_param.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 register_param.map.in
>--- admserv/newinst/src/register_param.map.in	13 Jun 2007 17:48:35 -0000	1.1
>+++ admserv/newinst/src/register_param.map.in	21 Jun 2007 01:40:15 -0000
>@@ -70,26 +70,28 @@
> admpw =                 "@configdir@/admpw"
> as_error =              "@logdir@/errors"
> as_access =             "@logdir@/access"
> as_pid =                "@pidfile@"
>-as_console_jar =        "%normbrand%-admserv-%as_version%.jar"
>+as_console_jar =        "%normbrand%-admserv-%as_baseversion%.jar"
> as_help_path =  "@helpdir@"
> as_user =               SysUser
> as_version =    Version
>+as_baseversion =        BaseVersion
> as_buildnum =   BuildNumber
> as_installedlocation =  "AS INSTALLED LOCATION -- replace me"
> as_serverroot = "AS SERVER ROOT-- replace me"
> as_sie =                "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
> 
> ds_version =    Version
>+ds_baseversion =        BaseVersion
> dsid =                  ServerIdentifier
> ds_user =               SuiteSpotUserID
> ds_port =               ServerPort
> ds_secure_port ="636"
> rootdn =                RootDN
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
> ds_passwd =             RootDNPwd
>-ds_console_jar ="%normbrand%-ds-%ds_version%.jar"
>+ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
> ds_installedlocation =  "DS INSTALLED LOCATION -- replace me"
> ds_serverroot = "DS SERVER ROOT-- replace me"
> ds_sie =                "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: admserv/newinst/src/setup.inf.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/setup.inf.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 setup.inf.in
>--- admserv/newinst/src/setup.inf.in	20 Jun 2007 22:33:19 -0000	1.1
>+++ admserv/newinst/src/setup.inf.in	21 Jun 2007 01:40:15 -0000
>@@ -30,6 +30,7 @@
> Name         =      @capbrand@ Server Products
> Vendor       =      @capbrand@ Project
> Description  =      @capbrand@ Server Products Installation
> Version      =      @PACKAGE_VERSION@
>+BaseVersion  =      @PACKAGE_BASE_VERSION@
> Brand      =      @capbrand@
> NormBrand      =      @brand@
>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.45
>diff -t -w -U4 -r1.45 Makefile.am
>--- Makefile.am	20 Jun 2007 22:08:38 -0000	1.45
>+++ Makefile.am	21 Jun 2007 01:41:49 -0000
>@@ -1036,8 +1036,9 @@
>         -e 's,@brand\@,$(brand),g' \
>         -e 's,@capbrand\@,$(capbrand),g' \
>         -e 's,@vendor\@,$(vendor),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,@defaultuser\@,$(defaultuser),g' \
>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.32
>diff -t -w -U4 -r1.32 configure.ac
>--- configure.ac	19 Jun 2007 18:24:57 -0000	1.32
>+++ configure.ac	21 Jun 2007 01:41:49 -0000
>@@ -320,8 +320,11 @@
> m4_include(m4/svrcore.m4)
> m4_include(m4/icu.m4)
> m4_include(m4/netsnmp.m4)
> 
>+PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'`
>+AC_SUBST(PACKAGE_BASE_VERSION)
>+
> # write out paths for binary components
> AC_SUBST(nspr_inc)
> AC_SUBST(nspr_lib)
> AC_SUBST(nspr_libdir)
>@@ -357,9 +360,8 @@
> 
> AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
> AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
> 
>-
> # 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
>Index: ldap/admin/src/slapd.inf.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/slapd.inf.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 slapd.inf.in
>--- ldap/admin/src/slapd.inf.in	20 Jun 2007 22:08:39 -0000	1.1
>+++ ldap/admin/src/slapd.inf.in	21 Jun 2007 01:41:49 -0000
>@@ -45,8 +45,9 @@
> Name= @capbrand@ Directory Server
> InstanceNamePrefix= Directory Server
> NickName= slapd
> Version= @PACKAGE_VERSION@
>+BaseVersion= @PACKAGE_BASE_VERSION@
> Compatible= 1.0
> BuildNumber= @NQBUILD_NUM@
> Description= @capbrand@ Directory Server
> ProductName=Directory Server

Actions: View | Diff

Attachments on bug 244749: 157336 | 157497 | 157506 | 157508 | 157554 | 157578 | 157579 | 157588 | 157662 | 157664 | 157671 | 157769 | 157772 | 157779 | 157978 | 158034 | 158070 | 158071 | 158140 | 158148