[Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru ptpreop.c, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778
Modified Files:
ptpreop.c
Log Message:
Bug(s) fixed: 176302
Bug Description: crash in PTA plugin when bind returned controls
Reviewed by: Pete (Thanks!)
Fix Description: Fix by Ulf. We are passing the ***LDAPControl when it
needs the **LDAPControl.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: ptpreop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptpreop.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ptpreop.c 19 Apr 2005 22:07:31 -0000 1.4
+++ ptpreop.c 8 Feb 2006 18:59:22 -0000 1.5
@@ -253,7 +253,7 @@
* Send a result to our client.
*/
if ( resctrls != NULL ) {
- (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, &resctrls );
+ (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, resctrls );
}
slapi_send_ldap_result( pb, rc, matcheddn, errmsg, 0, urls );
}
18 years, 2 months
[Fedora-directory-commits] adminserver/base Makefile,1.17,1.18
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/base
Modified Files:
Makefile
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: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/base/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile 18 Jan 2006 18:24:25 -0000 1.17
+++ Makefile 1 Feb 2006 23:04:57 -0000 1.18
@@ -131,10 +131,14 @@
cd $(CORE_DIR) ; \
$(IZIP) $(COREDIR)/ns$(CORE_MAIN).zip * ;
-ifeq ($(ARCH), Linux)
+ifdef INTERNAL_BUILD
+ ifeq ($(ARCH), Linux)
$(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf
-else
+ else
$(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf
+ endif
+else
+ $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf
endif
pkgSBC:
@@ -195,7 +199,11 @@
# Copy JSS lib
-$(MKDIR) $(CLIENT_DIR)/lib
ifeq ($(ARCH), HPUX)
+ ifeq ($(HPUX_ARCH), ia64)
+ cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib
+ else
cp -p $(JSSSDK_PATH)/libjss3.sl $(CLIENT_DIR)/lib
+ endif
else
cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib
endif
@@ -217,8 +225,12 @@
touch $(BASEDIR)/ns$(BASE_CLIENT).zip
endif # NOJAVA
-ifeq ($(ARCH), Linux)
+ifdef INTERNAL_BUILD
+ ifeq ($(ARCH), Linux)
$(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
-else
+ else
$(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
+ endif
+else
+ $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
endif
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/newinst/src Makefile, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/newinst/src
Modified Files:
Makefile
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: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 29 Sep 2005 22:12:00 -0000 1.7
+++ Makefile 1 Feb 2006 23:04:41 -0000 1.8
@@ -32,7 +32,7 @@
include $(BUILD_ROOT)/nsconfig.mk
-MODULE_CFLAGS = -DUSE_ADMSERV
+MODULE_CFLAGS += -DUSE_ADMSERV
OBJDEST=$(ADMSERV_OBJDIR)/install/obj
BINDEST=$(ADMSERV_OBJDIR)/install/bin
@@ -98,7 +98,7 @@
CURSES=-lHcurses
EXTRA_LIBS+= -ld4r
else
- CURSES=/usr/lib/libcurses.a
+ CURSES=-lcurses
endif
endif
endif
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/newinst/insadm config.c, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/insadm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/newinst/insadm
Modified Files:
config.c
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: config.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.c 28 Oct 2005 22:44:12 -0000 1.6
+++ config.c 1 Feb 2006 23:04:33 -0000 1.7
@@ -334,7 +334,7 @@
"nsInstalledLocation: %s\n"
"nsExpirationDate: %s\n"
"nsBuildSecurity: %s\n"
- "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct(a)admserv10.jar\n",
+ "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct(a)fedora-admserv-1.0.jar\n",
cd.szVendor,
cd.szDescription,
cd.szName,
@@ -378,7 +378,7 @@
"nsAdminAccessAddresses: *\n"
"nsAdminOneACLDir: adminacl\n"
"nsDefaultAcceptLanguage: %s\n"
- "nsClassName: com.netscape.management.admserv.AdminServer@admserv10.jar(a)%s\n"
+ "nsClassName: com.netscape.management.admserv.AdminServer@fedora-admserv-1.0.jar(a)%s\n"
"nsServerPort: %d\n"
"nsSuiteSpotUser: nobody\n"
"nsAdminUsers: admin-serv/config/admpw\n"
@@ -396,7 +396,7 @@
);
sprintf(szUpgrade,
- "nsClassName: com.netscape.management.admserv.AdminServer@admserv10.jar(a)%s\n"
+ "nsClassName: com.netscape.management.admserv.AdminServer@fedora-admserv-1.0.jar(a)%s\n"
"nsServerPort: %d\n"
"nsSuiteSpotUser: nobody\n",
szTemp,
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/console/smartupdate start-console.html, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/smartupdate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console/smartupdate
Modified Files:
start-console.html
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: start-console.html
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/start-console.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- start-console.html 18 Aug 2005 19:00:40 -0000 1.7
+++ start-console.html 1 Feb 2006 23:04:27 -0000 1.8
@@ -102,7 +102,7 @@
</tr>
<tr valign="TOP">
<td><img src="../java/html/goto.gif" width="10" height="15"> </td>
- <td><font face="Verdana, sans-serif"><a href='http://fedora.redhat.com/'>Fedora Project Home Page</a></font><font size="-1" face="Verdana, sans-serif"><br>
+ <td><font face="Verdana, sans-serif"><a href='http://fedora.redhat.com/'>Fedora Home Page</a></font><font size="-1" face="Verdana, sans-serif"><br>
Check for upgrades and information about Fedora server products.</font><font size="-1" face="Verdana, sans-serif">
</font></td>
</tr>
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/console/cmdln admconfig, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/cmdln
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console/cmdln
Modified Files:
admconfig
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: admconfig
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admconfig 28 Oct 2005 22:43:40 -0000 1.5
+++ admconfig 1 Feb 2006 23:04:21 -0000 1.6
@@ -35,7 +35,7 @@
SHLIB_PATH=$SRVROOT/lib/jss:$SRVROOT/lib
LIBPATH=$SRVROOT/lib/jss:$SRVROOT/lib
JAVAOPTIONS=-Djava.library.path=$LD_LIBRARY_PATH
-CLASSPATH=./java/nmclf10.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc10.jar:./java/jars/admserv10.jar
+CLASSPATH=./java/fedora-nmclf-1.0.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/fedora-mcc-1.0.jar:./java/jars/fedora-admserv-1.0.jar
MAINCLASS=com.netscape.management.admserv.cmdln.CommandLine
PLATFORM=`uname`
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console
Modified Files:
build.properties
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: build.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties 28 Oct 2005 22:43:34 -0000 1.8
+++ build.properties 1 Feb 2006 23:04:04 -0000 1.9
@@ -21,14 +21,14 @@
# END COPYRIGHT BLOCK
adminconsole.root=../..
-mcc.version=10
+mcc.version=1.0
admin.core=admserv
-admin.console=${admin.core}${mcc.version}
+admin.console=fedora-${admin.core}-${mcc.version}
-console.root=${adminconsole.root}/../dist/classes
-ldapjdk.jar=${adminconsole.root}/../dist/classes/ldapjdk.jar
-base.jar=${console.root}/base.jar
+console.root=${adminconsole.root}/../built/release/package/java
+ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar
+base.jar=${console.root}/fedora-base-${mcc.version}.jar
caplugin.jar=${console.root}/caplugin/default.jar
-mcc.core=${console.root}/mcc${mcc.version}
-nmclf.core=${console.root}/nmclf${mcc.version}
+mcc.core=${console.root}/fedora-mcc-${mcc.version}
+nmclf.core=${console.root}/fedora-nmclf-${mcc.version}
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.7, 1.8 security.c, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/cgi-src40
Modified Files:
Makefile security.c
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: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 21 Oct 2005 19:19:11 -0000 1.7
+++ Makefile 1 Feb 2006 23:03:57 -0000 1.8
@@ -382,30 +382,33 @@
$*.c /link /INCREMENTAL:no /SUBSYSTEM:console
else
+ADMINSERVERLINKS = $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+SETUPADMINSERVERLINKS = $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+
$(BINDIR)/security: security.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/security \
$(SRCDIR)/security.c -L$(NSCP_DISTDIR)/lib \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/sec-activate: sec-activate.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-activate \
$(SRCDIR)/sec-activate.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/sec-migrate: sec-migrate.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-migrate \
$(SRCDIR)/sec-migrate.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/admpw: admpw.c $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o admpw \
$(SRCDIR)/admpw.c \
$(OBJDIR)/lib/libadmin.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/config: config.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -415,7 +418,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/dsconfig: dsconfig.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -424,7 +427,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/ugdsconfig: ugdsconfig.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -432,13 +435,13 @@
$(SRCDIR)/ugdsconfig.c \
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
- $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/mergeConfig: mergeConfig.cpp $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o mergeConfig \
$(SRCDIR)/mergeConfig.cpp \
- $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/monreplication: monreplication.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -448,7 +451,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/viewlog: viewlog.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -458,7 +461,7 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
$(BINDIR)/viewdata: viewdata.c $(GLUEOBJS)
@@ -469,13 +472,13 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/statpingserv: statpingserv.c $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o statpingserv \
$(SRCDIR)/statpingserv.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/htmladmin: htmladmin.c $(GLUEOBJS)
cd $(BINDIR); \
@@ -485,12 +488,12 @@
$(OBJDIR)/lib/libbase.a \
$(OBJDIR)/lib/libsi18n.a \
$(OBJDIR)/lib/libldapu.a \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(SETUPADMINSERVERLINKS)
$(BINDIR)/%: %.c $(GLUEOBJS)
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $* $(SRCDIR)/$*.c \
- $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ $(ADMINSERVERLINKS)
endif
Index: security.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- security.c 22 Aug 2005 23:21:02 -0000 1.5
+++ security.c 1 Feb 2006 23:03:57 -0000 1.6
@@ -597,10 +597,10 @@
{
int version;
- switch ((int)(crl->crl.version.data)) {
+ switch ((int)DER_GetInteger(&(crl->crl.version))) {
case SEC_CRL_VERSION_1: version = 1; break;
case SEC_CRL_VERSION_2: version = 2; break;
- default: version = (int)((crl->crl.version.data)+1); break;
+ default: version = (int)(DER_GetInteger(&(crl->crl.version))+1); break;
}
fprintf(stdout, "\t<VERSION>%d</VERSION>\n", version);
}
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.35, 1.36
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv
Modified Files:
pkgadmin.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: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pkgadmin.mk 18 Jan 2006 18:24:20 -0000 1.35
+++ pkgadmin.mk 1 Feb 2006 23:03:49 -0000 1.36
@@ -168,7 +168,7 @@
# grab the jar files
cd $(ADMIN_JARS) ; \
- cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+ cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
#
# Cleanup before making distributable zip
@@ -245,6 +245,12 @@
# Copy LIB ICU
cd $(ICU_LIBPATH); cp -p $(ICU_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
+ for file in $(ICU_SOLIBS); do \
+ if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \
+ mytmpfile=`echo $$file | sed -e "s/\(.*\)\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \
+ (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \
+ fi ; \
+ done
# Cert System needs chk files [154431]
cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib
@@ -261,6 +267,12 @@
# Copy LIB ADMIN UTIL
cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
+ for file in $(ADMINUTIL_SOLIBS); do \
+ if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \
+ mytmpfile=`echo $$file | sed -e "s/\(.*\)\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \
+ (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \
+ fi ; \
+ done
if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \
$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \
cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \
@@ -379,6 +391,16 @@
cp -p $(SETUPUTIL_BIN)/setup $(PKGTOP)
cp -p $(SETUPUTIL_BIN)/setup.inf $(PKGTOP)
+ -if [ -z "`egrep "\[admin\]" $(SETUPUTIL_BIN)/setup.inf`" ]; then \
+ components=`grep "^Components.*=" $(SETUPUTIL_BIN)/setup.inf`; \
+ if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \
+ cat $(SETUPUTIL_BIN)/setup.inf | sed -e "s/^Components.*=.*/&, admin/" > $(PKGTOP)/setup.inf; \
+ fi; \
+ echo "" >> $(PKGTOP)/setup.inf; \
+ echo "# added in the adminserver package phase" >> $(PKGTOP)/setup.inf; \
+ echo "[admin]" >> $(PKGTOP)/setup.inf; \
+ echo "ComponentInfoFile = admin/admin.inf" >> $(PKGTOP)/setup.inf; \
+ fi
cp -p $(ADMSERV_OBJDIR)/LICENSE.txt $(PKGTOP)
cp -p $(ADMSERV_OBJDIR)/README.txt $(PKGTOP)
cp -p $(SETUPUTIL_BIN)/unzip_wrapper.pl $(PKGTOP)
18 years, 2 months
[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
by Doctor Conrad
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
18 years, 2 months