[Fedora-directory-commits] adminserver components.mk,1.45,1.46
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22444
Modified Files:
components.mk
Log Message:
Picking up new console.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- components.mk 24 Mar 2006 04:19:49 -0000 1.45
+++ components.mk 24 Mar 2006 20:15:51 -0000 1.46
@@ -358,7 +358,7 @@
NMCJDK_SUF = 1.0.2
NMCJDK_GEN_SUF = 1.0
-NMCJDK_RELDATE = 20060323
+NMCJDK_RELDATE = 20060324
NMCJDK_COMP = console/$(NMCJDK_GEN_SUF)
@@ -384,12 +384,14 @@
mkdir -p $(CLASS_DEST)
# grab the jar files
$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR)/java -files $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar,$(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar
+ifneq ($(ARCH), WINNT)
# make symlinks; cannot FTP symlinked files
-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-base-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-base-$(NMCJDK_GEN_SUF).jar)
-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF).jar)
-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-mcc-$(NMCJDK_SUF)_en.jar $(ADMIN_BRAND)-mcc-$(NMCJDK_GEN_SUF)_en.jar)
-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF).jar $(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF).jar)
-(cd $(CLASS_DEST); ln -s $(ADMIN_BRAND)-nmclf-$(NMCJDK_SUF)_en.jar $(ADMIN_BRAND)-nmclf-$(NMCJDK_GEN_SUF)_en.jar)
+endif
# grab the startconsole program
$(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files startconsole && chmod +x $(CLASS_DEST)/startconsole
else # INTERNAL_BUILD
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf, 1.14, 1.15
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013/cfgstuff
Modified Files:
admserv.conf
Log Message:
[186105] Admin Server Makefile updates for Internal build
Allow FollowSymLinks in java dir
Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- admserv.conf 28 Feb 2006 22:29:39 -0000 1.14
+++ admserv.conf 24 Mar 2006 19:13:32 -0000 1.15
@@ -38,7 +38,7 @@
# directories
<Directory "%%%sroot%%%/java/">
AllowOverride None
- Options None
+ Options FollowSymLinks
Order allow,deny
Allow from all
</Directory>
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.45, 1.46
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013
Modified Files:
pkgadmin.mk
Log Message:
[186105] Admin Server Makefile updates for Internal build
Allow FollowSymLinks in java dir
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pkgadmin.mk 24 Mar 2006 01:12:27 -0000 1.45
+++ pkgadmin.mk 24 Mar 2006 19:13:11 -0000 1.46
@@ -153,9 +153,15 @@
-$(MKDIR) $(CLIENT_DIR)/java/jars
# grab the jar files
+ifeq ($(ARCH), WINNT)
+# no symlink on Windows
+ cd $(ADMIN_JARS) ; \
+ cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+else
cd $(ADMIN_JARS) ; \
cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars; \
(cd $(CLIENT_DIR)/java/jars; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF).jar; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF)_en.jar)
+endif
#
# Cleanup before making distributable zip
18 years, 1 month
[Fedora-directory-commits] console/src/com/netscape/management/client/console VersionInfo.java, 1.2, 1.3 genverinfo.sh, 1.2, 1.3
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-serv19921/src/com/netscape/management/client/console
Modified Files:
VersionInfo.java genverinfo.sh
Log Message:
186612 - Console.getVersionNumber method needs to return version as major.minor
Index: VersionInfo.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/VersionInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VersionInfo.java 26 Oct 2005 23:16:23 -0000 1.2
+++ VersionInfo.java 24 Mar 2006 19:05:37 -0000 1.3
@@ -37,7 +37,7 @@
* @return Console Version Number
*/
public static String getVersionNumber() {
- return _resource.getString("console","versionNumber");
+ return _resource.getString("console","majorVersionNumber");
}
/**
Index: genverinfo.sh
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/genverinfo.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- genverinfo.sh 15 Sep 2005 22:06:49 -0000 1.2
+++ genverinfo.sh 24 Mar 2006 19:05:38 -0000 1.3
@@ -28,11 +28,12 @@
#
#
-if [ $# -ne 3 ]; then
- echo Usage: $0 outputFile versionNumber buildNumberFile
+if [ $# -ne 4 ]; then
+ echo Usage: $0 outputFile versionNumber majorVersionNumber buildNumberFile
exit 1
fi
echo console-versionNumber=$2 > $1
-bld=`cat $3`
+echo console-majorVersionNumber=$3 > $1
+bld=`cat $4`
echo console-buildNumber=`eval eval echo $bld` >> $1
18 years, 1 month
[Fedora-directory-commits] console build.xml, 1.11, 1.12 startconsole-sandbox, 1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19921
Modified Files:
build.xml startconsole-sandbox
Log Message:
186612 - Console.getVersionNumber method needs to return version as major.minor
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 24 Mar 2006 01:04:00 -0000 1.11
+++ build.xml 24 Mar 2006 19:05:16 -0000 1.12
@@ -63,6 +63,7 @@
<exec executable="${console.root}/src/com/netscape/management/client/console/genverinfo.sh">
<arg value="${console.root}/src/com/netscape/management/client/console/versioninfo.properties"/>
<arg value="${console.dotversion}"/>
+ <arg value="${console.dotgenversion}"/>
<arg value="${built.dir}/buildnum.dat"/>
</exec>
</target>
Index: startconsole-sandbox
===================================================================
RCS file: /cvs/dirsec/console/startconsole-sandbox,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- startconsole-sandbox 29 Nov 2005 18:36:50 -0000 1.1
+++ startconsole-sandbox 24 Mar 2006 19:05:16 -0000 1.2
@@ -27,6 +27,13 @@
fi
#
+# Set library path to ensure we pick up our local libraries
+#
+export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH}
+export SHLIB_PATH=./lib:${SHLIB_PATH}
+export DYLD_LIBRARY_PATH=./lib:${DYLD_LIBRARY_PATH}
+
+#
# Launch the Console
#
java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
18 years, 1 month
[Fedora-directory-commits] adminutil/lib/libadmsslutil admsslutil.c, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil/lib/libadmsslutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683
Modified Files:
admsslutil.c
Log Message:
Replaced PL_Free with PR_Free.
Index: admsslutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/admsslutil.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admsslutil.c 22 Mar 2006 23:47:20 -0000 1.3
+++ admsslutil.c 24 Mar 2006 04:48:38 -0000 1.4
@@ -269,8 +269,8 @@
if((!certdbFile) || (!keydbFile) || (!admroot)) return -1;
errCode = initNSS(certdbFile, keydbFile);
- PL_Free(certdbFile);
- PL_Free(keydbFile);
+ PR_Free(certdbFile);
+ PR_Free(keydbFile);
return errCode;
}
18 years, 1 month
[Fedora-directory-commits] adminserver components.mk,1.44,1.45
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14490
Modified Files:
components.mk
Log Message:
Picking up new AdminUtil, SetupUtil, and Console.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- components.mk 24 Mar 2006 01:12:20 -0000 1.44
+++ components.mk 24 Mar 2006 04:19:49 -0000 1.45
@@ -137,7 +137,7 @@
# SETUPUTIL
##############################################################
-SETUPUTIL_RELDATE = 20060307
+SETUPUTIL_RELDATE = 20060323
SETUPUTIL_FILE = setuputil.tar.gz
SETUPUTIL_COMPNAME = setuputil/1.0
@@ -171,7 +171,7 @@
###############################################################
ADMINUTIL_SUF = 10
-ADMINUTIL_RELDATE = 20060307
+ADMINUTIL_RELDATE = 20060323
ADMINUTIL_VERSION = $(ADMINUTIL_RELDATE)
ADMINUTIL_ROOT = $(NSCP_COMPDIR)/adminutil
ADMINUTIL_COMPNAME = adminutil/1.0
@@ -358,7 +358,7 @@
NMCJDK_SUF = 1.0.2
NMCJDK_GEN_SUF = 1.0
-NMCJDK_RELDATE = 20060320
+NMCJDK_RELDATE = 20060323
NMCJDK_COMP = console/$(NMCJDK_GEN_SUF)
18 years, 1 month
[Fedora-directory-commits] setuputil nsconfig.mk,1.9,1.10
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253
Modified Files:
nsconfig.mk
Log Message:
Don't set "-AA" for HP-UX PA_RISC
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsconfig.mk 23 Mar 2006 20:45:31 -0000 1.9
+++ nsconfig.mk 24 Mar 2006 02:50:43 -0000 1.10
@@ -220,14 +220,16 @@
ifdef MODERNHP
CC=cc -Ae +ESlit
CXX=aCC
-ARCH_CFLAGS=-AA # the default on ipf, but also use it elsewhere
+# ARCH_CFLAGS=-AA # if set on PA_RISC, build fails by <iostream> not found
ifeq ($(NSOS_RELEASE), B.11.23)
+ ARCH_CFLAGS=-AA # the default on ipf, but also use it elsewhere
ifeq ($(USE_64), 1)
BIT_SWITCH=+DD64
else
BIT_SWITCH=+DD32
endif
else # 11.11 or earlier
+ ARCH_CFLAGS=
ifeq ($(USE_64), 1)
BIT_SWITCH=+DA2.0W +DS2.0
else
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/schema/ldif tasks.ldif, 1.6, 1.7 unixtasks.ldif, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771/admserv/schema/ldif
Modified Files:
tasks.ldif unixtasks.ldif
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: tasks.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/tasks.ldif,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tasks.ldif 28 Oct 2005 22:44:23 -0000 1.6
+++ tasks.ldif 24 Mar 2006 01:13:30 -0000 1.7
@@ -39,7 +39,7 @@
objectclass: nsAdminObject
nshelpref: admin/stopadm.html
nsexecref: stopsrv
-nsclassname: com.netscape.management.admserv.task.Stop(a)admserv10.jar
+nsclassname: com.netscape.management.admserv.task.Stop(a)fedora-admserv-1.0.jar
dn: cn=Restart, cn=Operation, cn=Tasks
objectclass: top
@@ -47,7 +47,7 @@
objectclass: nsAdminObject
nshelpref: admin/restartadm.html
nsexecref: restartsrv
-nsclassname: com.netscape.management.admserv.task.Restart(a)admserv10.jar
+nsclassname: com.netscape.management.admserv.task.Restart(a)fedora-admserv-1.0.jar
dn: cn=Authenticate, cn=Operation, cn=Tasks
objectclass: top
@@ -104,7 +104,7 @@
objectclass: nsAdminObject
nshelpref:
nsexecref: config
-nsclassname: com.netscape.management.admserv.task.ServerSetup(a)admserv10.jar
+nsclassname: com.netscape.management.admserv.task.ServerSetup(a)fedora-admserv-1.0.jar
dn: cn=DirectorySetup, cn=configuration, cn=Tasks
objectclass: top
@@ -133,7 +133,7 @@
objectclass: nsAdminObject
nshelpref: admin/logging.html
nsexecref: config
-nsclassname: com.netscape.management.admserv.task.Logging(a)admserv10.jar
+nsclassname: com.netscape.management.admserv.task.Logging(a)fedora-admserv-1.0.jar
dn: cn=SecurityOp, cn=configuration, cn=Tasks
objectclass: top
@@ -148,7 +148,7 @@
objectclass: nsAdminObject
nshelpref: admin/certrequest.html
nsexecref:
-nsclassname: com.netscape.management.admserv.task.CertSetup(a)admserv10.jar
+nsclassname: com.netscape.management.admserv.task.CertSetup(a)fedora-admserv-1.0.jar
dn: cn=SSLActivate, cn=configuration, cn=Tasks
objectclass: top
Index: unixtasks.ldif
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/unixtasks.ldif,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unixtasks.ldif 28 Oct 2005 22:44:23 -0000 1.5
+++ unixtasks.ldif 24 Mar 2006 01:13:30 -0000 1.6
@@ -35,5 +35,5 @@
objectclass: nsAdminObject
nshelpref:
nsexecref: snmpconf
-nsclassname: com.netscape.management.admserv.task.SNMPSetup(a)admserv10.jar
+nsclassname: com.netscape.management.admserv.task.SNMPSetup(a)fedora-admserv-1.0.jar
18 years, 1 month
[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.19, 1.20
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7771/admserv/newinst/src
Modified Files:
ux-update.cc
Log Message:
[186105] Admin Server Makefile updates for Internal build
Comment #11
. fixed jss jar file name to jss3.jar; mistakenly put minor version number in
the previous checkin (jss37.jar)
. changed to include the patch number in the jar file name
. fixed admin console package name in the Global Preferences: admserv72.jar ->
redhat-admserv-7.2.jar
. changed to create a symlink: redhat-admserv-7.2.jar pointing redhat-admserv-7.2.0.jar
. introduced CONSOLE-GEN-VERSION and CONSOLE-MAJOR-VERSION in the branding data
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ux-update.cc 22 Feb 2006 02:28:51 -0000 1.19
+++ ux-update.cc 24 Mar 2006 01:13:15 -0000 1.20
@@ -950,7 +950,7 @@
appEntry->addAttribute("installationTimeStamp", adminInfo->timeStamp());
appEntry->addAttribute("nsExpirationDate", adminInfo->get(PKG_EXPIRY));
appEntry->addAttribute("nsBuildSecurity", adminInfo->get(PKG_SECURITY));
- appEntry->addAttribute("nsServerMigrationClassName", "com.netscape.management.admserv.AdminServerProduct(a)admserv10.jar");
+ appEntry->addAttribute("nsServerMigrationClassName", "com.netscape.management.admserv.AdminServerProduct(a)fedora-admserv-1.0.jar");
sieEntry->clear();
@@ -1061,7 +1061,7 @@
configEntry->addAttribute ("nsDefaultAcceptLanguage", adminInfo->get(PKG_DEFAULT_LANGUAGE));
- sprintf(tstr, "com.netscape.management.admserv.AdminServer@admserv10.jar(a)%s", sieDN.data());
+ sprintf(tstr, "com.netscape.management.admserv.AdminServer@fedora-admserv-1.0.jar(a)%s", sieDN.data());
configEntry->addAttribute ("nsClassname", tstr);
// Set the appropriate ACI on for this branch
@@ -1072,7 +1072,7 @@
else
{
const char *s;
- sprintf(tstr, "com.netscape.management.admserv.AdminServer@admserv10.jar(a)%s", sieDN.data());
+ sprintf(tstr, "com.netscape.management.admserv.AdminServer@fedora-admserv-1.0.jar(a)%s", sieDN.data());
configEntry->setAttribute ("nsClassname", tstr);
configEntry->setAttribute ("nsServerPort", dir);
configEntry->setAttribute ("nsSuiteSpotUser", adminUser);
18 years, 1 month