[Fedora-directory-commits] adminserver components.mk, 1.40, 1.41 nsarch, 1.4, 1.5 nsconfig.mk, 1.20, 1.21 nsdefs.mk, 1.8, 1.9 nsperl.mk, 1.5, 1.6
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Wed Feb 1 23:03:50 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006
Modified Files:
components.mk nsarch nsconfig.mk nsdefs.mk nsperl.mk
Log Message:
[179394] HP-UX IPF support (adminserver)
0) support HP-UX 11.23 ia64
1) adjusted to the components' path name change (suffix, version number)
2) added [admin] section to setup.inf (in pkgadmin.mk)
3) fixed type mismatch for the cert version
4) adjusted the admin jar names
5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34)
6) added "admin" to the component list: "Components = ..." in setup.inf
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- components.mk 9 Nov 2005 23:22:50 -0000 1.40
+++ components.mk 1 Feb 2006 23:03:41 -0000 1.41
@@ -313,10 +313,10 @@
# Console java classes
#############################################################
-NMCJDK_SUF = 10
+NMCJDK_SUF = 1.0
NMCJDK_RELDATE = 20051027
-NMCJDK_COMP = console/1.0
+NMCJDK_COMP = console/$(NMCJDK_SUF)
NMCJDK_VERSION = $(NMCJDK_RELDATE)
@@ -339,11 +339,11 @@
ifdef INTERNAL_BUILD
mkdir -p $(CLASS_DEST)
# grab the jar files
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files base.jar,mcc$(NMCJDK_SUF).jar,mcc$(NMCJDK_SUF)_en.jar,nmclf$(NMCJDK_SUF).jar,nmclf$(NMCJDK_SUF)_en.jar,caplugin
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files fedora-base-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF)_en.jar,fedora-nmclf-$(NMCJDK_SUF).jar,fedora-nmclf-$(NMCJDK_SUF)_en.jar,caplugin
# grab the startconsole program
$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(BASE_NMCSDK) -files startconsole && chmod +x $(CLASS_DEST)/startconsole
else # INTERNAL_BUILD
- @if [ ! -f $(CONSOLE_JAR_DIR)/base.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi
+ @if [ ! -f $(CONSOLE_JAR_DIR)/fedora-base-1.0.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi
endif
#############################################################
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/adminserver/nsarch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsarch 18 Aug 2005 18:57:33 -0000 1.4
+++ nsarch 1 Feb 2006 23:03:41 -0000 1.5
@@ -1,35 +1,33 @@
#! /bin/sh
+#
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
-#
-# 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; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
+#
+# 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
+# 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
# END COPYRIGHT BLOCK
#
# Name: nsarch
#
# Description: this file determines the system name and outputs the
-# platform information in a format used by Fedora build
+# platform information in a format used by build
# scripts and utilities; this file is based on the GNU
# "config.guess" utility; the GNU copyleft is provided
# somewhere below...
#
-# For each platform supported by Fedora, we need to provide the
+# For each platform supported, we need to provide the
# following definitions:
#
# Variable Description
@@ -95,7 +93,7 @@
echo "Usage: $0 [ [-full {-under | -dash | -none} {-pretty} ] | -gnu ]"
echo
echo " <no args> Default to output OS name only; suitable for use"
- echo " in Fedora's makefiles and compiler defines"
+ echo " in makefiles and compiler defines"
echo " -f, -full, --full) Full output includes OS name and release number"
echo " -d, -dash, --dash) use with -f to specify a dash separator"
echo " -u, -under, --under) use with -f to specify a underscore separator"
@@ -179,7 +177,7 @@
#--------------------------------------------------------------------------
# everything that follows is GNU's config.guess slightly modified
-# for Fedora's use
+# for our use
# NT doesn't have /dev/null
#UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown
@@ -453,6 +451,14 @@
NS_RELEASE="${HPUX_REV}"
ns_printf
exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ GNU_NAME="${UNAME_MACHINE}-hp-hpux${HPUX_REV}"
+ NS_NAME="HPUX"
+ NS_PRETTY_NAME="HP-UX"
+ NS_RELEASE="${HPUX_REV}"
+ ns_printf
+ exit 0 ;;
3050*:HI-UX:*:*)
sed 's/^ //' << EOF >dummy.c
#include <unistd.h>
@@ -572,7 +578,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/adminserver/nsconfig.mk,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nsconfig.mk 23 Nov 2005 01:25:45 -0000 1.20
+++ nsconfig.mk 1 Feb 2006 23:03:41 -0000 1.21
@@ -208,7 +208,12 @@
#-------------------
ifeq ($(ARCH), HPUX)
#-------------------
-DLL_SUFFIX=sl
+HPUX_ARCH = $(shell uname -m)
+ifeq ($(HPUX_ARCH), ia64)
+ DLL_SUFFIX=so
+else
+ DLL_SUFFIX=sl
+endif
LDAP_DLL_SUFFIX=$(DLL_SUFFIX)
ifeq ($(NSOS_RELEASE), B.11.00)
@@ -217,17 +222,33 @@
ifeq ($(NSOS_RELEASE), B.11.11)
MODERNHP=1
endif
-
-ifdef MODERNHP
-CC=cc -Ae +ESlit
-CXX=aCC
-ifeq ($(USE_64), 1)
-BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s
-else
-BIT_SWITCH=+DAportable +DS1.1 -Wl,+s
+ifeq ($(NSOS_RELEASE), B.11.23)
+ MODERNHP=1
endif
-ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11
-EXTRA_LIBS= -ldld -lm -lpthread
+
+ifeq ($(MODERNHP), 1)
+CXX=/opt/aCC/bin/aCC
+CC=cc -Ae
+ifeq ($(NSOS_RELEASE), B.11.23)
+ CC+=+Olit=all
+ ifeq ($(USE_64), 1)
+ BIT_SWITCH=+DD64
+ else
+ BIT_SWITCH=+DD32
+ endif
+ IPF_CFLAGS=-DPIC
+ EXTRA_LIBS= -ldld -lm -lpthread
+else # 11.11 or earlier
+ CC+=+ESlit
+ ifeq ($(USE_64), 1)
+ BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s
+ else
+ BIT_SWITCH=+DAportable +DS1.1 -Wl,+s
+ endif
+ IPF_CFLAGS=
+ EXTRA_LIBS= -ldld -lm -lpthread
+endif # B.11.23
+ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 $(IPF_CFLAGS)
else
CC=cc
ARCH_CFLAGS=-D_HPUX_SOURCE -Aa +DA1.0 +z
@@ -505,7 +526,7 @@
endif
endif
-ADM_SUF=10
+ADM_SUF=1.0
# CLEAN THIS UP
@@ -700,10 +721,10 @@
SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi
ifeq ($(ARCH), HPUX)
-SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_hybrid_3 freebl_pure32_3
+SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl3
endif
ifeq ($(ARCH), SOLARIS)
-SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_hybrid_3 freebl_pure32_3
+SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_32fpu_3 freebl_32int_3 freebl_32int64_3
endif
ifeq ($(ARCH), WINNT)
@@ -725,7 +746,7 @@
# ICU
##########################################
-ICU_LIB_VERSION = 24
+ICU_LIB_VERSION = 34
ifdef ICU_SOURCE_ROOT
ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
@@ -790,25 +811,25 @@
# ADMINUTIL
########################################
-ADMINUTIL_LIB_VERSION=10
+ADMINUTIL_LIB_VERSION=1.0
ifdef ADMINUTIL_SOURCE_ROOT
ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib
- ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-1.0
+ ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-$(ADMINUTIL_LIB_VERSION)
else
ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include
endif
ifeq ($(ARCH), WINNT)
- ADMINUTIL_LIBNAMES = libadmsslutil_s$(ADMINUTIL_LIB_VERSION) libadminutil$(ADMINUTIL_LIB_VERSION)
+ ADMINUTIL_LIBNAMES = libadmsslutil_s libadminutil
ADMINUTIL_LIBS = $(addsuffix .lib, $(ADMINUTIL_LIBNAMES))
LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_LIBS))
ADMINUTILOBJNAME = $(ADMINUTIL_LIBNAMES)
else
- ADMINUTIL_LIBNAMES = admsslutil$(ADMINUTIL_LIB_VERSION) adminutil$(ADMINUTIL_LIB_VERSION)
- ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF)$(ADMINUTIL_LIB_VERSION), $(addprefix lib, adminutil admsslutil))
+ ADMINUTIL_LIBNAMES = admsslutil adminutil
+ ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF), $(addprefix lib, adminutil admsslutil))
ADMINUTIL_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMINUTIL_LIBNAMES)))
- ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(ADMINUTIL_SOLIB_NAMES))
+ ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX).$(MAJOR_VERSION), $(ADMINUTIL_SOLIB_NAMES))
ADMINUTILOBJNAME = $(ADMINUTIL_SOLIBS)
LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_SOLIBS))
ADMINUTILLINK = -L$(ADMINUTIL_LIBPATH) $(addprefix -l, $(ADMINUTIL_LIBNAMES))
@@ -886,7 +907,7 @@
endif
ifdef CONSOLE_SOURCE_DIR
- CONSOLE_BASE_DIR = $(CONSOLE_SOURCE_DIR)/built/package
+ CONSOLE_BASE_DIR = $(CONSOLE_SOURCE_DIR)/built/release/package
CONSOLE_JAR_DIR = $(CONSOLE_BASE_DIR)/java
else
CONSOLE_BASE_DIR = $(CLASS_DEST)
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nsdefs.mk 29 Sep 2005 22:11:57 -0000 1.8
+++ nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9
@@ -73,6 +73,7 @@
NSOS_ARCH := $(subst /,_,$(shell uname -s))
+ARCHTYPE=
ifeq ($(TMP_ARCH), SunOS)
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_TEST1), i86pc)
@@ -80,8 +81,13 @@
else
ARCHTYPE=
endif
-else
- ARCHTYPE=
+endif
+
+ifeq ($(TMP_ARCH), HP-UX)
+ NSOS_TEST1 := $(shell uname -m)
+ ifeq ($(NSOS_TEST1), ia64)
+ ARCHTYPE=_ia64
+ endif
endif
ifeq ($(NSOS_ARCH),WINNT)
@@ -274,8 +280,10 @@
DO_SEARCH=
NODE_FLAG=-DNO_NODELOCK
-MAJOR_VERSION:="6"
-MINOR_VERSION:="2"
+MAJOR_VERSION_NUM:=1
+MINOR_VERSION_NUM:=0
+MAJOR_VERSION:="$(MAJOR_VERSION_NUM)"
+MINOR_VERSION:="$(MINOR_VERSION_NUM)"
DIRVERDIR=$(COMMON_OBJDIR)/include
DIRVER_H=$(DIRVERDIR)/dirver.h
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsperl.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsperl.mk 10 Nov 2005 01:12:54 -0000 1.5
+++ nsperl.mk 1 Feb 2006 23:03:41 -0000 1.6
@@ -71,6 +71,9 @@
ifeq ($(OSVER),SunOS5.5.1)
PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5
endif
+ifeq ($(OSVER), HP-UXB.11.23)
+PERL5=perl
+endif
ifeq ($(OSVER), HP-UXB.11.11)
PERL5=/u/robobld/nsperl/hpux/nsperl
endif
More information about the Fedora-directory-commits
mailing list