[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.4, 1.4.4.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22202
Modified Files:
Tag: DS71SP1_AOL_HF_Branch
filterindex.c
Log Message:
[175897] filter'd search not returning matches after index added
Index: filterindex.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- filterindex.c 19 Apr 2005 22:07:38 -0000 1.4
+++ filterindex.c 22 Dec 2005 20:59:28 -0000 1.4.4.1
@@ -640,7 +640,8 @@
{
is_bounded_range = 0;
}
- if (NULL == fpairs[0] || NULL == fpairs[1])
+ if (NULL == fpairs[0] || NULL == fpairs[1] ||
+ 0 != strcmp(tpairs[0], tpairs[1]) /* avoid "&(cn<=A)(sn>=B)" type */ )
{
fpairs[0] = fpairs[1] = NULL;
slapi_ch_free_string(&tpairs[0]);
17 years, 11 months
[Fedora-directory-commits] setuputil/installer/unix uxres.cc, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/setuputil/installer/unix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer/unix
Modified Files:
uxres.cc
Log Message:
176156 - Allow all installer strings to be overridden by resource file settings
Index: uxres.cc
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/uxres.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- uxres.cc 29 Jul 2005 22:16:32 -0000 1.1.1.1
+++ uxres.cc 20 Dec 2005 00:08:09 -0000 1.2
@@ -72,11 +72,27 @@
for (i = 0, j = 0; i < len; i++, j++)
{
- // Take care of backslash n for now.
- if (value[i] == ' ' && value[i+1] == '\\' && value[i+2] == 'n')
+ // Surrounding quotes should be dropped
+ if ( value[i] == '"' )
{
- new_value[j] = '\n';
- i += 2;
+ // Decrement j so we don't get an extra space
+ j--;
+ continue;
+ }
+
+ // Take care of newlines and escaped quotes
+ if ( value[i] == '\\' )
+ {
+ if ( value[i+1] == 'n' )
+ {
+ new_value[j] = '\n';
+ i++;
+ }
+ else if ( value[i+1] == '"' )
+ {
+ new_value[j] = value[i+1];
+ i++;
+ }
}
else
{
17 years, 11 months
[Fedora-directory-commits] setuputil/installer/inf setup.res, NONE, 1.1 setup.inf, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/setuputil/installer/inf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer/inf
Modified Files:
setup.inf
Added Files:
setup.res
Log Message:
176156 - Allow all installer strings to be overridden by resource file settings
--- NEW FILE setup.res ---
# ------------ Global Resources -----------
brand = "Fedora"
console = "Fedora Management Console"
# ------------ Welcome Dialog Resource ------------
dialog_welcome_text = "Welcome to the %s Server Products installation program\n"
# %s -> brand
dialog_welcome_text0 = "This program will install %s Server Products and the\n"
# %s -> brand
dialog_welcome_text1 = "%s on your computer.\n\nIt is recommended that you have \"root\" privilege to install the\nsoftware."
# %s -> console
dialog_welcome_text2 = "Tips for using the installation program:\n - Press \"Enter\" to choose the default and go to the next screen\n - Type \"Control-B\" to go back to the previous screen\n - Type \"Control-C\" to cancel the installation program\n - You can enter multiple items using commas to separate them.\n For example: 1, 2, 3 \n"
dialog_welcome_prompt = "Would you like to continue with installation?"
dialog_ask_options = "Please select the type of installation you would like to perform:\n\n 1. Download Only\n Download %s Server Products and run the installation at\n a later time, or copy the files to another computer and\n run the installation.\n\n"
# %s -> brand
dialog_ask_options0 = " 2. Download and install\n Download %s Server Products and install them on this\n computer.\n\n\nTo accept the default shown in brackets, press the Return key."
# %s -> brand
dialog_ask_sourceoptions = "In order to proceed with download, you need to specify the location\nfrom which it is obtained. You may download from the %s\nFTP server, or from an FTP server running on your intranet.\n\n"
# %s -> brand
dialog_ask_sourceoptions0 = "Please choose your desired options below:\n\n 1. Download from %s FTP server\n 2. Download from your Intranet\n\nTo accept the default shown in brackets, press the Return key."
# %s -> vendor
dialog_ask_vsourceoptions = "Please choose which %s FTP server you\nwish to download from:\n\nTo accept the default shown in brackets, press the Return key.\n"
# %s -> vendor
dialog_ask_destination = "This program will download %s Server Products into the\nfollowing directory.\nTo accept the default shown in brackets, press the Return key."
# %s -> brand
# ----------- License Dialog Resource -----------
dialog_license_text = "BY INSTALLING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY\nAND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE\nLICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS\nOF THIS AGREEMENT, PLEASE DO NOT INSTALL OR USE THIS SOFTWARE."
dialog_license_prompt = "Do you agree to the license terms?"
# ----------- Selection Dialog Resource -----------
dialog_selection_text = "%s components:"
# %s -> brand
dialog_selection_text0 = "The following are the %s\ncomponents currently installed on your machine:"
# %s -> brand
/* ----------- Client/Server Dialog Resource ---------------- */
dialog_clientorserver_text = "Select the items you would like to install:\n\n 1. %s Servers\n"
# %s -> brand
dialog_clientorserver_text0 = " Installs %s Servers with the integrated "
# %s -> brand
dialog_clientorserver_text1 = "%s Management Console\n onto your computer.\n\n"
# %s -> brand
dialog_clientorserver_text2 = " 2. %s Management Console\n"
# %s -> brand
dialog_clientorserver_text3 = " Installs %s Management Console\n as a stand-alone Java application on your computer.\n\nTo accept the default shown in brackets, press the Enter key."
# %s -> brand
dialog_clientorserver_prompt = "Select the component you want to install"
# ----------- InstallType Dialog Resource ----------------
dialog_installtype_text = "Choose an installation type:\n\n 1. Express installation\n Allows you to quickly install the servers using the most\n common options and pre-defined defaults. Useful for quick\n evaluation of the products.\n\n 2. Typical installation\n Allows you to specify common defaults and options.\n\n 3. Custom installation\n Allows you to specify more advanced options. This is \n recommended for experienced server administrators only.\n\nTo accept the default shown in brackets, press the Enter key."
dialog_installtype_prompt = "Choose an installation type"
# ----------- ServerRoot Dialog Resource ----------------
dialog_serverroot_text = "This program will extract the server files and install them\ninto a directory you specify. That directory is called the \nserver root in the product documentation and will contain \nthe server programs, the Administration Server, and the server\nconfiguration files.\n\nTo accept the default shown in brackets, press the Enter key."
dialog_serverroot_prompt = "Install location"
# ----------- ClientRoot Dialog Resource ----------------
dialog_clientroot_text = "This program will extract the %s Management Console files and\n"
# %s -> brand
dialog_clientroot_text0 = "install them in a directory you specify. %s Management Console\nincludes the Java Runtime Environment and the Management \nConsole applications.\n\nTo accept the default shown in brackets, press the Enter key."
# %s -> brand
dialog_clientroot_prompt = "Install location"
# ----------- HostName Dialog Resource ----------------
dialog_hostname_text = "Enter the fully qualified domain name of the computer\non which you're installing server software. Using the form\n<hostname>.<domainname>\nExample: eros.example.com.\n\nTo accept the default shown in brackets, press the Enter key."
dialog_hostname_prompt = "Computer name"
# ----------- SSUser Dialog Resource ----------------
dialog_ssuser_text = "Choose a Unix user and group to represent the %s server\nin the user directory. The server will run as this user.\nIt is recommended that this user should have no privileges \nin the computer network system. The Administration Server \nwill give this group some permissions in the server root\nto perform server-specific operations.\n\nIf you have not yet created a user and group for the server,\ncreate this user and group using your native UNIX\nsystem utilities.\n\n\nTo accept the default shown in brackets, press the Return key."
# %s -> brand
dialog_ssuser_prompt = "System User"
# ----------- removeInstallInfo Dialog Resource ----------------
dialog_removeinstallinfo_text = "The installation cache \"install.inf\" generated by the setup\nprogram which is located in the directory server root/setup. This\nfile can be used as a silent installation script for installing\nsimilar servers on other computers. However, it may contain\nsensitive information such as user IDs and passwords you have\nentered.\n"
dialog_removeinstallinfo_prompt = "Would you like to remove it the installation cache file?"
# ----------- LdapInfo Dialog Resource ----------------
dialog_ldapinfo_text = "%s Server Products require an LDAP-based Directory\nServer for the administration of server configuration. This\nserver contains the Configuration Directory.\n\nEnter the non-secured LDAP URL of the server that contains the\nConfiguration Directory using the form:\n\n ldap://<hostname>:<port>"
# %s -> brand
dialog_ldapinfo_prompt = "URL of Directory Server"
/* ----------- InstallDN Dialog Resource ---------------- */
dialog_installdn_text = "Please specify the name of the Administration Domain in \nthe Configuration Directory where your server configuration \ninformation is to be stored\n\nYou must have already been granted write access to this \nAdministration Domain in order to install the software.\n\nTo accept the default shown in brackets, press the Enter key."
dialog_installdn_prompt = "Administration Domain name"
# ----------- LdapUser Dialog Resource ----------------
dialog_ldapuser_text = "Enter the User ID or Distinguished Name of the administrator who is\nauthorized to access the Configuration Directory at"
dialog_ldapuser_prompt = "Configuration Admin ID or DN:"
# ----------- UserDirectoryInfo Dialog Resource ----------------
dialog_userdirectoryinfo_text = "At least one of the components to be installed requires write \naccess to the User Directory Server.\n\nEnter the non-secured LDAP URL of the User Directory in the format\nbelow:\n\n ldap://<hostname>:<port>/<base distinguished name>"
dialog_userdirectoryinfo_prompt = "URL of User Directory";
# ----------- UserDirectoryAdmin Dialog Resource ----------------
dialog_userdirectoryadmin_text = "Enter the User ID or Distinguished Name of the administrator who\nhas write access the User Directory at"
dialog_userdirectoryadmin_prompt = "User Directory Admin ID or DN:"
# ----------- Error, warning messages ----------------
message_verifyldapinfo1 = "Enter an unsecured LDAP URL in the form\n ldap://<host>:<unsecured ldap port>//<base DN>"
message_askinstalldnnext1 = "ERROR: Enter just the name of the entry, but not\n a Distinguished Name.\n Acceptable: mcom.com\n Not Acceptable: cm=mcom.com\n"
message_verifyldapuser1 = "Invalid input.\n"
message_verifyldapuser2 = "Invalid URL \"%s\".\n"
message_verifyldapuser3 = "Insufficient authorization.\n"
message_verifyldapuser4 = "Cannot connect to the specified directory server.\n The server may be down. Check the server \n to be sure it's running before proceeding \n with installation.\n"
message_verifyldapuser5 = "Invalid user and/or password.\n"
message_verifyldapuser6 = "Authentication failed. Either you have entered\n an invalid user ID or password, or the directory server\n is having some problem. Please check and re-enter.\n"
message_verifyinstallprivilege1 = "The Configuration Directory may not to be set up correctly for \ninstalling %s Server products. Please verify that the \no=NetscapeRoot base suffix is configured and that you have\nwrite access to that directory subtree.\n"
# %s -> brand
message_verifyinstallprivilege2 = "The Configuration Directory may not be set up correctly for \ninstalling %s Server products. Please contact your \n"
# %s -> brand
message_verifyinstallprivilege22 = "directory administrator to verify that the you have write \naccess to %s,%s\n"
message_verifyinstallprivilege3 = "The Configuration Directory may not be set up correctly for \nthe installing %s Server products. Please contact\n"
# %s -> brand
message_verifyinstallprivilege32 = "your directory administrator to verify that the you have write\naccess to %s\n"
message_verifyinstallprivilege4 = "The specified Configuration Administrator ID\n \"%s\"\n does not have sufficient write access to the Configuration\n directory. Select a user ID with write access to\n the Configuration Directory subtree.\n"
message_checkserverroot1 = "The directory %s already exists and might contain\n pre-4.0 Netscape servers. Installing into an existing\n pre-4.0 server root is not supported. Choose another\n server root.\n"
message_checkserverroot2 = "The server root %s already exists and contains a\n version of Netscape Server Products that is incompatible\n with this version. Choose another server root.\n"
message_checkcomponentdependency1 = "A previous version of %s needs to be\ninstalled before it can be updated.\n"
message_checkcomponentdependency2 = "%s depends on %s to be \n installed. Select %s.\n"
message_checkcomponentdependency3 = "A previous version of %s needs to be\ninstalled before it can be patched.\n"
message_checkcomponentdependency4 = "A newer version of %s is already installed.\n"
message_checkcomponentdependency5 = "Target product has different version.\n"
message_checkcomponentdependency6 = "Target product has different security.\n"
message_verifyssuser1 = "The user ID %s does not currently exist.\n Choose another user, or create this user and start again.\n"
message_verifyssuser2 = "The system will not allow you to run the\n %s servers "
# %s -> brand
message_verifyssuser3 = "as \"%s\". Choose another user.\n"
message_verifyssgroup1 = "The user \"%s\" does not currently exist.\n Choose another user, or create this user and start again.\n"
message_verifyssgroup2 = "The group \"%s\" does not currently exist.\n Choose another group, or create this group and start again.\n"
message_verifyssgroup3 = "The system user \"%s\" is not in the \"%s\" group.\n Choose another user, or create this user and start again.\n"
message_verifyssgroup4 = "The system will not allow you to run any %s\n"
# %s -> brand
message_verifyssgroup5 = " server as the user or group \"%s/%s\". Choose another user or group.\n"
message_uninst_verifyselection1 = "ERROR: %s is dependent on %s.\n Please also select %s or remove\n %s first."
Index: setup.inf
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/inf/setup.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.inf 26 Oct 2005 16:38:11 -0000 1.2
+++ setup.inf 20 Dec 2005 00:07:11 -0000 1.3
@@ -29,11 +29,15 @@
Vendor = Fedora Project
Description = Fedora Server Products Installation
# Version = 1.0
-Components = svrcore, base, admin, slapd, dssynch, msg, mesg-cntrl, cert, mcc, nda, cal, enterprise, nsperl, perldap
+Components = svrcore, base
Mode = ALLMODES
ProgramFolder = Fedora Server Products
+
#DefaultInstallDirectory works for NT and Unix, NT will set the drive letter to WINDISK
-# DefaultInstallDirectory = /opt/fedora
+DefaultInstallDirectory = /opt/fedora
+
+# All dialog strings can be defined in a resource file.
+#Resource = setup.res
# Package Contents
[svrcore]
@@ -42,38 +46,3 @@
[base]
ComponentInfoFile = base/base.inf
-[admin]
-ComponentInfoFile = admin/admin.inf
-
-[slapd]
-ComponentInfoFile = slapd/slapd.inf
-
-[dssynch]
-ComponentInfoFile= dssynch/dssynch.inf
-
-[msg]
-ComponentInfoFile = msg/msg.inf
-
-[mesg-cntrl]
-ComponentInfoFile = mesg-cntrl/mesg-cntrl.inf
-
-[cert]
-ComponentInfoFile = cert/cert.inf
-
-[mcc]
-ComponentInfoFile = mcc/mcc.inf
-
-[nda]
-ComponentInfoFile = nda/nda.inf
-
-[cal]
-ComponentInfoFile = cal/cal.inf
-
-[enterprise]
-ComponentInfoFile = enterprise/enterprise.inf
-
-[nsperl]
-ComponentInfoFile = nsperl/nsperl.inf
-
-[perldap]
-ComponentInfoFile = perldap/perldap.inf
17 years, 11 months
[Fedora-directory-commits] setuputil/installer Makefile,1.3,1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/setuputil/installer
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer
Modified Files:
Makefile
Log Message:
176156 - Allow all installer strings to be overridden by resource file settings
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 26 Oct 2005 16:38:10 -0000 1.3
+++ Makefile 20 Dec 2005 00:06:45 -0000 1.4
@@ -132,6 +132,7 @@
cp -p scripts/unzip_wrapper.pl $(PKGTOP)/bin
cp -p inf/setup.inf $(PKGDIR)/bin
cp -p inf/silent.inf $(PKGDIR)/bin
+ cp -p inf/setup.res $(PKGDIR)/bin
cp -p $(OBJDIR)/LICENSE.txt $(PKGDIR)/bin
cp -p $(OBJDIR)/README.txt $(PKGDIR)/bin
# Create svrcore package
17 years, 11 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.4, 1.4.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10398
Modified Files:
Tag: Directory71RtmBranch
filterindex.c
Log Message:
[175897] filter'd search not returning matches after index added
Index: filterindex.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- filterindex.c 19 Apr 2005 22:07:38 -0000 1.4
+++ filterindex.c 19 Dec 2005 21:37:07 -0000 1.4.2.1
@@ -640,7 +640,8 @@
{
is_bounded_range = 0;
}
- if (NULL == fpairs[0] || NULL == fpairs[1])
+ if (NULL == fpairs[0] || NULL == fpairs[1] ||
+ 0 != strcmp(tpairs[0], tpairs[1]) /* avoid "&(cn<=A)(sn>=B)" type */ )
{
fpairs[0] = fpairs[1] = NULL;
slapi_ch_free_string(&tpairs[0]);
17 years, 11 months
[Fedora-directory-commits] adminutil nsarch,1.2,1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21690
Modified Files:
nsarch
Log Message:
Fixed parsing of supported emulations in nsarch
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/adminutil/nsarch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsarch 15 Dec 2005 21:06:22 -0000 1.2
+++ nsarch 16 Dec 2005 18:15:59 -0000 1.3
@@ -570,7 +570,7 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then
#echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
GNU_NAME="${UNAME_MACHINE}-unknown-linux"
NS_NAME="${UNAME_SYSTEM}"
17 years, 11 months
[Fedora-directory-commits] setuputil nsarch,1.2,1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640
Modified Files:
nsarch
Log Message:
Fixed parsing of supported emulations in nsarch
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/setuputil/nsarch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsarch 16 Dec 2005 01:07:51 -0000 1.2
+++ nsarch 16 Dec 2005 18:14:26 -0000 1.3
@@ -570,7 +570,7 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then
#echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
GNU_NAME="${UNAME_MACHINE}-unknown-linux"
NS_NAME="${UNAME_SYSTEM}"
17 years, 11 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777
Modified Files:
filterindex.c
Log Message:
[175897] filter'd search not returning matches after index added
Index: filterindex.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- filterindex.c 19 Apr 2005 22:07:38 -0000 1.4
+++ filterindex.c 16 Dec 2005 17:40:03 -0000 1.5
@@ -640,7 +640,8 @@
{
is_bounded_range = 0;
}
- if (NULL == fpairs[0] || NULL == fpairs[1])
+ if (NULL == fpairs[0] || NULL == fpairs[1] ||
+ 0 != strcmp(tpairs[0], tpairs[1]) /* avoid "&(cn<=A)(sn>=B)" type */ )
{
fpairs[0] = fpairs[1] = NULL;
slapi_ch_free_string(&tpairs[0]);
17 years, 11 months
[Fedora-directory-commits] setuputil nsarch, 1.1.1.1, 1.2 nsconfig.mk, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150
Modified Files:
nsarch nsconfig.mk
Log Message:
[Bug 175900] SetupUtil build (64-bit)
1) nsarch supports 64-bit ld output. (copied from adminutil)
2) modified CPU_ARCH value to pick up the right mozilla components.
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/setuputil/nsarch,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsarch 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ nsarch 16 Dec 2005 01:07:51 -0000 1.2
@@ -1,20 +1,19 @@
#! /bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
-#
+#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
-#
+#
# This library 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
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -178,7 +177,7 @@
#--------------------------------------------------------------------------
# everything that follows is GNU's config.guess slightly modified
-# for internal use
+# for our use
# NT doesn't have /dev/null
#UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown
@@ -571,7 +570,7 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .* elf_i[345]86"; then
#echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
GNU_NAME="${UNAME_MACHINE}-unknown-linux"
NS_NAME="${UNAME_SYSTEM}"
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsconfig.mk 9 Nov 2005 01:56:12 -0000 1.2
+++ nsconfig.mk 16 Dec 2005 01:07:52 -0000 1.3
@@ -31,7 +31,11 @@
NSOS_TEST1 := $(shell uname -m)
ifeq (86, $(findstring 86, $(NSOS_TEST1)))
- CPU_ARCH := x86
+ ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
+ CPU_ARCH := $(NSOS_TEST1)
+ else
+ CPU_ARCH := x86
+ endif
else
CPU_ARCH := $(NSOS_TEST1)
endif
@@ -44,9 +48,13 @@
ifeq ($(NSOS_ARCH),Linux)
ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TMP := x86
+ ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
+ NSOS_TMP := $(NSOS_TEST1)
+ else
+ NSOS_TMP := x86
+ endif
else
- NSOS_TMP := $(NSOS_TEST1)
+ NSOS_TMP := $(NSOS_TEST1)
endif
ifeq ($(USE_LIBC),1)
LIBC_VERSION = _libc
@@ -56,12 +64,16 @@
PTHREAD_TAG = _PTH
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
NSCONFIG_NOTAG = $(NSCONFIG)
- NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
else
ifeq ($(NSOS_ARCH),RHEL)
NSOS_TMP = $(NSOS_TEST1)
ifeq (86,$(findstring 86,$(NSOS_TMP)))
- NSOS_TMP = x86
+ ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
+ NSOS_TMP := $(NSOS_TEST1)
+ else
+ NSOS_TMP := x86
+ endif
endif
PTHREAD_TAG =
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)_$(GCC_VERSION)
17 years, 11 months
[Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.4, 1.5 psetc.c, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019/lib/libadminutil
Modified Files:
Makefile psetc.c
Log Message:
[172166] Admin Util build (64-bit)
1) nsarch does not run well since the output of 'ld --help' did not match the
given regular expression.
2) added "_64" to the NSCONFIG macro to pick up the mozilla components.
3) added version number to the ident string
4) replaced 'perl <perlprogram>' with '/usr/bin/env perl <perlprogram>'
5) cleaned up warning message from gcc
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 6 Dec 2005 18:38:37 -0000 1.4
+++ Makefile 15 Dec 2005 21:07:44 -0000 1.5
@@ -77,7 +77,6 @@
all: $(OBJDEST) $(SO_LIB) resource_bundle
$(OBJDEST):
- echo $(SO_LIB)
mkdir -p $(OBJDEST)
# stop building static libraries
Index: psetc.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/psetc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- psetc.c 20 Jul 2005 22:51:32 -0000 1.1.1.1
+++ psetc.c 15 Dec 2005 21:07:44 -0000 1.2
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <ctype.h>
#include "psetc_pvt.h"
+#include "libadminutil/admutil.h"
#include "dbtadmutil.h"
#include <ldap_ssl.h>
17 years, 11 months