[Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.6.2.2, 1.6.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11704/cm/newinst
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[168402] patch info file for 64-bit system gets broken
ldap/cm/Makefile uses the full OBJDIR name including "_64" for the patch inf location.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- Makefile 10 Sep 2005 00:41:48 -0000 1.6.2.2
+++ Makefile 16 Sep 2005 00:35:30 -0000 1.6.2.3
@@ -96,6 +96,7 @@
BINS=$(addprefix $(BINDEST)/, $(PROGS))
endif
INFO= $(OBJDIR)/$(DIR)
+PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR)
# Source for staged installation utilities
INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
@@ -182,7 +183,7 @@
$(INFO):
$(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
ifdef BUILD_PATCH
- $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(a)-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
+ $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(PATCHINFO)-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a"
endif
endif
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap Makefile,1.9,1.9.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11704
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[168402] patch info file for 64-bit system gets broken
ldap/cm/Makefile uses the full OBJDIR name including "_64" for the patch inf location.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- Makefile 9 May 2005 22:11:21 -0000 1.9
+++ Makefile 16 Sep 2005 00:35:30 -0000 1.9.2.1
@@ -62,7 +62,9 @@
cd systools; $(MAKE) $(MFLAGS) all
# new unix installer
ifeq ($(USE_SETUPSDK), 1)
- cd cm/newinst; $(MAKE) $(MFLAGS) all
+ # passing $(OBJDIR) as ORIGINAL_OBJDIR since USE_64 info is cleaned up
+ # and lost in cm/newinst
+ cd cm/newinst; $(MAKE) $(MFLAGS) ORIGINAL_OBJDIR=$(ABS_OBJDIR) all
ifeq ($(USE_64),1)
# In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts
# get copied into the 32-bit output directory by the makefile above. However, we later want to package them and expect
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.5, 1.30.2.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11659
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
[168400] Solaris and HP-UX 7.1 SP1 packages should only contain the fixes not the full install
BUILD_PATCH & BUILD_SHIP being set, SP1 packages contain just patch files.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.5
retrieving revision 1.30.2.6
diff -u -r1.30.2.5 -r1.30.2.6
--- Makefile 14 Sep 2005 21:34:39 -0000 1.30.2.5
+++ Makefile 16 Sep 2005 00:31:45 -0000 1.30.2.6
@@ -232,11 +232,9 @@
ABS_INSTDIR = $(shell cd $(INSTDIR); pwd)
ifdef BUILD_PATCH
-ifndef BUILD_RPM
PATCHINSTDIR = $(ABS_INSTDIR)-SP
SLAPDSP = slapd-71sp1
endif
-endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
INST_TARGET_INTL=./$(PRODUCT_MARKET)dir
@@ -774,8 +772,10 @@
| gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz
# build the combined packages tar file; use h flag to follow symlinks
ifdef BUILD_SHIP
+ifndef BUILD_PATCH
cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \
perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
@@ -809,7 +809,6 @@
endif # BUILD_RPM
ifdef BUILD_PATCH
-ifndef BUILD_RPM
mkdir -p $(PATCHINSTDIR)/$(SLAPDSP)
cp $(INSTDIR)/dssetup $(PATCHINSTDIR)
cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR)
@@ -821,12 +820,16 @@
echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
# create a zip file based upon the $(PATCHINF) file
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
-# create patch inf file: $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPD).inf
+# create patch inf file: $(SLAPD).inf
+ cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
- cd $(PATCHINSTDIR); $(TAR) cvf - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz
+ifdef BUILD_SHIP
+ cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+else
+ cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz
endif
endif
@@ -1008,11 +1011,6 @@
_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
-ifdef BUILD_PATCH
-ifndef BUILD_RPM
- $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \
-endif
-endif
$(INSTDIR)/admin $(INSTDIR)/base \
$(INSTDIR)/svrcore $(INSTDIR)/tools
# see components.mk for a description of PACKAGE_SETUP_LIBS
@@ -1028,13 +1026,6 @@
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf
cp $< $@
-ifdef BUILD_PATCH
-ifndef BUILD_RPM
-$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf
- cp $< $@
-endif
-endif
-
$(INSTDIR)/admin: $(ADMSERV_DIR)/admin
cp -R $< $@
18 years, 7 months
[Fedora-directory-commits] console/src/com/netscape/management/client/console genverinfo.sh, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8427/src/com/netscape/management/client/console
Modified Files:
genverinfo.sh
Log Message:
168418 - Dynamically generate versioninfo.properties at build time
Index: genverinfo.sh
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/genverinfo.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- genverinfo.sh 18 Jul 2005 00:34:15 -0000 1.1.1.1
+++ genverinfo.sh 15 Sep 2005 22:06:49 -0000 1.2
@@ -1,3 +1,4 @@
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
18 years, 7 months
[Fedora-directory-commits] console buildnum.pl, NONE, 1.1 build.properties, 1.3, 1.4 build.xml, 1.4, 1.5
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8427
Modified Files:
build.properties build.xml
Added Files:
buildnum.pl
Log Message:
168418 - Dynamically generate versioninfo.properties at build time
--- NEW FILE buildnum.pl ---
#!/usr/bin/perl
# --- 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.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# --- END COPYRIGHT BLOCK ---
#--------------------------------------------
# buildnum.pl
#
# Generates a dated build number and writes
# out a buildnum.dat file in a user specified
# subdirectory.
#
# Usage: buildnum.pl -p <platform dir>
#--------------------------------------------
use Getopt::Std;
use FileHandle;
autoflush STDERR 1;
getopts('p:H');
if ($opt_H) {exitHelp();}
# Load arguments
$platdir = $opt_p || exitHelp();
$buildnum_file = "./$platdir/buildnum.dat";
# Get current time
@now = gmtime;
# Format buildnum as YYYY.DDD.HHMM
$year = $now[5] + 1900;
$doy = $now[7] + 1;
if ($doy < 100) { $doy = 0 . $doy; }
$tod = $now[2] . $now[1];
$buildnum = "$year.$doy.$tod";
# Write buildnum.dat
open(BUILDNUM,">$buildnum_file") || die "Error: Can't create $buildnum_file: $!\n";
print BUILDNUM "\\\"$buildnum\\\"";
close(BUILDNUM);
#---------- exitHelp subroutine ----------
sub exitHelp {
print(STDERR "$0: Generates a dated build number.
\tUsage: $0 -p <platform>
\t-p <platform> Platform subdirectory.
\t-H Print this help message\n");
exit(0);
}
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 31 Aug 2005 17:04:59 -0000 1.3
+++ build.properties 15 Sep 2005 22:06:32 -0000 1.4
@@ -23,6 +23,7 @@
console.root=..
console.version=71
+console.dotversion=7.1
mcc.core=mcc
mcc.name=${mcc.core}${console.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 9 Sep 2005 20:29:08 -0000 1.4
+++ build.xml 15 Sep 2005 22:06:33 -0000 1.5
@@ -68,6 +68,16 @@
<pathelement location="${imports.dir}/ldapjdk/${ldapjdk.import}"/>
<pathelement location="${imports.dir}/jss/${jss.jar.import}"/>
</path>
+
+ <!-- Generate version property file -->
+ <exec dir="${console.root}/console" executable="./buildnum.pl">
+ <arg line="-p ${built.dir}"/>
+ </exec>
+ <exec executable="${console.root}/console/src/com/netscape/management/client/console/genverinfo.sh">
+ <arg value="${console.root}/console/src/com/netscape/management/client/console/versioninfo.properties"/>
+ <arg value="${console.dotversion}"/>
+ <arg value="${built.dir}/buildnum.dat"/>
+ </exec>
</target>
<target name="prepare_dist">
@@ -271,6 +281,7 @@
<target name="clean">
<delete dir="${built.dir}"/>
+ <delete file="${console.root}/console/src/com/netscape/management/client/console/versioninfo.properties"/>
</target>
<target name="clean_imports">
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage ssha_pwd.c, 1.6, 1.7
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32566
Modified Files:
ssha_pwd.c
Log Message:
168322 - Check size of hash needed before base64 encoding password hashes
Index: ssha_pwd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ssha_pwd.c 6 Sep 2005 21:15:15 -0000 1.6
+++ ssha_pwd.c 14 Sep 2005 23:37:37 -0000 1.7
@@ -175,14 +175,14 @@
}
if (( enc = slapi_ch_malloc( 3 + schemeNameLen +
- LDIF_BASE64_LEN(sizeof(hash)))) == NULL ) {
+ LDIF_BASE64_LEN(shaLen + SHA_SALT_LENGTH))) == NULL ) {
return( NULL );
}
sprintf( enc, "%c%s%c", PWD_HASH_PREFIX_START, schemeName,
PWD_HASH_PREFIX_END );
(void)ldif_base64_encode( hash, enc + 2 + schemeNameLen,
- sizeof(hash), -1 );
+ (shaLen + SHA_SALT_LENGTH), -1 );
return( enc );
}
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.31,1.32
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28974/ldap/cm
Modified Files:
Makefile
Log Message:
168309 - Removed setup wrappers used for Java packaging and added RPM dependency for java-1.4.2-ibm package.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile 2 Sep 2005 20:40:53 -0000 1.31
+++ Makefile 14 Sep 2005 21:39:42 -0000 1.32
@@ -696,25 +696,6 @@
# base.inf file
$(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
-# Move setup binary to dssetup
- mv $(INSTDIR)/setup $(INSTDIR)/dssetup
-# Move the new setup wrappers into place
- cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR)/setup.pl
- cp $(BUILD_ROOT)/ldap/cm/newinst/setup.sh $(INSTDIR)/setup
-
-# We need to package perl for the new setup wrapper to run
- mkdir $(INSTDIR)/tmp
- $(UNZIP) $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \
- lib/nsPerl5.6.1/\* -d $(INSTDIR)/tmp
- cp -R $(INSTDIR)/tmp/lib/nsPerl5.6.1 \
- $(INSTDIR)/tools
- rm -rf $(INSTDIR)/tmp
-
-# We also need to package the infozip utilities
- $(UNZIP) -j $(INSTDIR)/tools/infozip.zip \
- -d $(INSTDIR)/tools
- rm -f $(INSTDIR)/tools/infozip.zip
-
# Install LDAP Readme and License files at root of Installation (dated pre-packaging) directory.
# And, replace the License.txt file that is packaged in nssvrcore.zip.
if [ -d $(LDAPDIR)/docs ] ; then \
@@ -731,13 +712,13 @@
| gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz
# build the combined packages tar file; use h flag to follow symlinks
ifdef BUILD_SHIP
- cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \
+ cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
- cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \
+ cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \
perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
@@ -892,11 +873,6 @@
mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR)
# make sure our packages are in the setup.inf file
$(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf
-# move setup.exe to dssetup.exe
- mv $(INSTDIR)/setup.exe $(INSTDIR)/dssetup.exe
-# copy in the new setup wrapper script
- cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR)
- cp $(BUILD_ROOT)/ldap/cm/newinstnt/setup.bat $(INSTDIR)
#---------------------------- slapd rules --------------------------------------------------
18 years, 7 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.11, 1.12
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28974
Modified Files:
ldapserver.spec.tmpl
Log Message:
168309 - Removed setup wrappers used for Java packaging and added RPM dependency for java-1.4.2-ibm package.
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ldapserver.spec.tmpl 7 Sep 2005 16:14:16 -0000 1.11
+++ ldapserver.spec.tmpl 14 Sep 2005 21:39:42 -0000 1.12
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl
+Requires: perl,java-1.4.2-ibm
Prefix: /opt/%{name}
%description
@@ -109,6 +109,9 @@
fi
%changelog
+* Wed Sep 14 2005 Nathan Kinder <nkinder(a)redhat.com> 7.1-2
+- Added a dependency on the java-1.4.2-ibm package
+
* Tue May 10 2005 Richard Megginson <rmeggins(a)redhat.com> 7.1-2
- Change release to 2
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.4, 1.30.2.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28895
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
Fix the patch build on Solaris/HP: Removed an obsolete copy line
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.5
diff -u -r1.30.2.4 -r1.30.2.5
--- Makefile 14 Sep 2005 18:25:51 -0000 1.30.2.4
+++ Makefile 14 Sep 2005 21:34:39 -0000 1.30.2.5
@@ -821,8 +821,7 @@
echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
# create a zip file based upon the $(PATCHINF) file
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
-# create patch inf file: $(SLAPD).inf
- cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
+# create patch inf file: $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPD).inf
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
@@ -1010,8 +1009,10 @@
_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
ifdef BUILD_PATCH
+ifndef BUILD_RPM
$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \
endif
+endif
$(INSTDIR)/admin $(INSTDIR)/base \
$(INSTDIR)/svrcore $(INSTDIR)/tools
# see components.mk for a description of PACKAGE_SETUP_LIBS
@@ -1028,9 +1029,11 @@
cp $< $@
ifdef BUILD_PATCH
+ifndef BUILD_RPM
$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf
cp $< $@
endif
+endif
$(INSTDIR)/admin: $(ADMSERV_DIR)/admin
cp -R $< $@
18 years, 7 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.3, 1.30.2.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22719
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
Fixed the 64-bit patch build; when building the installer USE_64 flag is
cleared. The patch info file had to be explicitly copied as the slapd info
file being done.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -u -r1.30.2.3 -r1.30.2.4
--- Makefile 13 Sep 2005 17:22:04 -0000 1.30.2.3
+++ Makefile 14 Sep 2005 18:25:51 -0000 1.30.2.4
@@ -1009,6 +1009,9 @@
_setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf \
+ifdef BUILD_PATCH
+ $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \
+endif
$(INSTDIR)/admin $(INSTDIR)/base \
$(INSTDIR)/svrcore $(INSTDIR)/tools
# see components.mk for a description of PACKAGE_SETUP_LIBS
@@ -1024,6 +1027,11 @@
$(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf
cp $< $@
+ifdef BUILD_PATCH
+$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf
+ cp $< $@
+endif
+
$(INSTDIR)/admin: $(ADMSERV_DIR)/admin
cp -R $< $@
18 years, 7 months