[Fedora-directory-commits] mod_nss mod_nss.c, 1.11, 1.12 mod_nss.h, 1.11, 1.12 nss_engine_config.c, 1.10, 1.11 nss_engine_init.c, 1.18, 1.19 nss_engine_pphrase.c, 1.5, 1.6
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10135
Modified Files:
mod_nss.c mod_nss.h nss_engine_config.c nss_engine_init.c
nss_engine_pphrase.c
Log Message:
196070
Fix compilation warnings
Index: mod_nss.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_nss.c 2 Mar 2006 19:21:54 -0000 1.11
+++ mod_nss.c 20 Jun 2006 20:25:20 -0000 1.12
@@ -224,7 +224,7 @@
if (rv != SECSuccess) {
char *remote = CERT_GetCommonName(&peerCert->subject);
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "SSL Proxy: Possible man-in-the-middle attack. The remove server is %s, we expected %s", remote, c->remote_host, rv);
+ "SSL Proxy: Possible man-in-the-middle attack. The remove server is %s, we expected %s", remote, c->remote_host);
PORT_Free(remote);
}
} else {
@@ -234,7 +234,7 @@
break;
default:
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "Bad remote server certificate.", err);
+ "Bad remote server certificate: %d", err);
nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL);
break;
}
Index: mod_nss.h
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_nss.h 7 Apr 2006 20:17:12 -0000 1.11
+++ mod_nss.h 20 Jun 2006 20:25:20 -0000 1.12
@@ -439,6 +439,7 @@
void nss_util_ppclose(server_rec *, apr_pool_t *, apr_file_t *);
char *nss_util_readfilter(server_rec *, apr_pool_t *, const char *,
const char * const *);
+int nss_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix);
/* Pass Phrase Handling */
SECStatus nss_Init_Tokens(server_rec *s);
Index: nss_engine_config.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nss_engine_config.c 2 Mar 2006 19:21:54 -0000 1.10
+++ nss_engine_config.c 20 Jun 2006 20:25:20 -0000 1.11
@@ -383,7 +383,7 @@
{
SSLDirConfigRec *dc = (SSLDirConfigRec *)dcfg;
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
- nss_verify_t mode;
+ nss_verify_t mode = SSL_CVERIFY_UNSET;
const char *err;
if ((err = nss_cmd_verify_parse(cmd, arg, &mode))) {
@@ -451,6 +451,8 @@
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
sc->proxy->auth.protocols = arg;
+
+ return NULL;
}
const char *nss_cmd_NSSProxyCipherSuite(cmd_parms *cmd,
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nss_engine_init.c 7 Apr 2006 20:17:12 -0000 1.18
+++ nss_engine_init.c 20 Jun 2006 20:25:20 -0000 1.19
@@ -19,6 +19,8 @@
#include "secmod.h"
#include "sslerr.h"
#include "pk11func.h"
+#include "ocsp.h"
+#include "keyhi.h"
static SECStatus ownBadCertHandler(void *arg, PRFileDesc * socket);
static SECStatus ownHandshakeCallback(PRFileDesc * socket, void *arg);
@@ -902,11 +904,8 @@
apr_pool_t *ptemp,
modnss_ctx_t *mctx)
{
- SECCertTimeValidity certtimestatus;
SECStatus secstatus;
- PK11SlotInfo* slot = NULL;
-
/*
* Get own certificate and private key.
*/
@@ -1066,7 +1065,7 @@
switch (err) {
default:
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
- "Bad remote server certificate.", err);
+ "Bad remote server certificate: %d", err);
nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL);
return SECFailure;
break;
Index: nss_engine_pphrase.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_pphrase.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nss_engine_pphrase.c 7 Apr 2006 20:17:12 -0000 1.5
+++ nss_engine_pphrase.c 20 Jun 2006 20:25:20 -0000 1.6
@@ -24,7 +24,7 @@
static char * nss_password_prompt(PK11SlotInfo *slot, PRBool retry, void *arg);
static char * nss_no_password(PK11SlotInfo *slot, PRBool retry, void *arg);
-static unsigned char * nss_get_password(FILE *input, FILE *output, PK11SlotInfo *slot, PRBool (*ok)(unsigned char *), pphrase_arg_t * parg);
+static char * nss_get_password(FILE *input, FILE *output, PK11SlotInfo *slot, PRBool (*ok)(unsigned char *), pphrase_arg_t * parg);
static PRBool nss_check_password(unsigned char *cp);
static void echoOff(int fd);
static void echoOn(int fd);
@@ -139,8 +139,8 @@
memset(buf, 0, sizeof(buf));
rv = apr_file_read(parg->mc->proc.out, buf, &nBytes);
- if (rv = APR_SUCCESS)
- res = atoi(buf);
+ if (rv == APR_SUCCESS)
+ res = atoi(buf);
if (rv != APR_SUCCESS ||
(res != PIN_SUCCESS && res != PIN_INCORRECTPW)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
@@ -192,7 +192,7 @@
* twiddling with the tty. Alternatively, if the file password.conf
* exists then it may be used to store the token password(s).
*/
-static unsigned char *nss_get_password(FILE *input, FILE *output,
+static char *nss_get_password(FILE *input, FILE *output,
PK11SlotInfo *slot,
PRBool (*ok)(unsigned char *),
pphrase_arg_t *parg)
@@ -298,7 +298,7 @@
fprintf(output, "non-alphabetic characters\n");
continue;
}
- return (unsigned char*) PORT_Strdup((char*)phrase);
+ return (char*) PORT_Strdup((char*)phrase);
}
}
17 years, 10 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.48, 1.49
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945
Modified Files:
pkgadmin.mk
Log Message:
[195258] Changes for the internal build; comment#14
fixed typo introduced in 1.47.
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pkgadmin.mk 16 Jun 2006 16:48:47 -0000 1.48
+++ pkgadmin.mk 19 Jun 2006 18:59:44 -0000 1.49
@@ -273,7 +273,7 @@
cd $(JAVA_PACKAGE_DIR) ; \
find . -name "*.html" -o -name "*.gif" -o -name "*.jpg" | $(CPIO) $(ADMIN_DIR)/java/html
- cd $(JAVA_PACKAGE_DIR)/.. ; \
+ cd $(JAVA_PACKAGE_DIR) ; \
find . -name "*.html" | $(CPIO) $(ADMIN_DIR)/java/html/en
endif # NOJAVA
17 years, 10 months
[Fedora-directory-commits] ldapserver Makefile, 1.31, 1.32 component_versions.mk, 1.43, 1.44 components.mk, 1.44, 1.45 internal_buildpaths.mk, 1.8, 1.9 internal_comp_deps.mk, 1.38, 1.39 nsconfig.mk, 1.19, 1.20 nsperl.mk, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597
Modified Files:
Makefile component_versions.mk components.mk
internal_buildpaths.mk internal_comp_deps.mk nsconfig.mk
nsperl.mk
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile 29 Mar 2006 19:42:39 -0000 1.31
+++ Makefile 7 Apr 2006 01:33:30 -0000 1.32
@@ -199,17 +199,17 @@
brandDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Branding LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
@echo ==== Finished Branding LDAP Server ==========
versionDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Debranding LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
@echo ==== Finished Debranding LDAP Server ==========
normalizeDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Normalizing LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
@echo ==== Normalizing Branding LDAP Server ==========
buildAndPkgDirectory: buildDirectory pkgDirectory
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- component_versions.mk 29 Mar 2006 19:42:39 -0000 1.43
+++ component_versions.mk 7 Apr 2006 01:33:30 -0000 1.44
@@ -63,10 +63,10 @@
# LIBDB
DBDEFS:=
ifndef DB_MAJOR_MINOR
-DB_MAJOR_MINOR:=db42
+DB_MAJOR_MINOR:=db-4.2
endif
ifndef DB_VERSION
- DB_VERSION:=20040813
+ DB_VERSION:=20060308
endif
# SMARTHEAP
@@ -109,7 +109,7 @@
# admin server
ifndef ADM_RELDATE
- ADM_RELDATE = 20060328
+ ADM_RELDATE = 20060405
endif
ifndef ADM_VERSDIR
ADM_VERSDIR = adminserver/1.0
@@ -122,7 +122,7 @@
# setuputil
ifndef SETUPUTIL_RELDATE
- SETUPUTIL_RELDATE = 20060327
+ SETUPUTIL_RELDATE = 20060405
endif
ifndef SETUPUTIL_VER
SETUPUTIL_VER = 10
@@ -166,7 +166,7 @@
endif
ifndef PERLDAP_VERSION
- PERLDAP_VERSION=1.5/20051028
+ PERLDAP_VERSION=1.5/20060331
endif
ifndef JSS_COMP
@@ -185,7 +185,7 @@
SASL_VERSDIR=cyrus
endif
ifndef SASL_RELDATE
- SASL_RELDATE=v2.1.20
+ SASL_RELDATE=v2.1.20.1
endif
# jakarta/axis for DSMLGW
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- components.mk 29 Mar 2006 19:42:39 -0000 1.44
+++ components.mk 7 Apr 2006 01:33:30 -0000 1.45
@@ -194,7 +194,8 @@
SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
# add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-SECURITY_LIBNAMES = ssl3 nss3 softokn3
+# as of NSS 3.11, no longer need to link with softokn3
+SECURITY_LIBNAMES = ssl3 nss3
# these libs have a corresponding .chk file
SECURITY_NEED_CHK = softokn3
@@ -359,7 +360,7 @@
SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
else
SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
- SASL_INCDIR = $(SASL_BUILD_DIR)/include
+ SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
endif
endif
SASL_INCLUDE = $(SASL_INCDIR)
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- internal_buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
+++ internal_buildpaths.mk 7 Apr 2006 01:33:30 -0000 1.9
@@ -118,11 +118,10 @@
#DB_SOURCE_ROOT = $(BUILD_ROOT)/../db-4.2.52.NC
# DB_MAJOR_MINOR is the root name for the db shared library
-# source builds use db-4.2 - uncomment this if using source
-#DB_MAJOR_MINOR := db-4.2
+DB_MAJOR_MINOR := db-4.2
ifndef DB_SOURCE_ROOT
-DB_MAJOR_MINOR := db42
-db_component_name=$(DB_MAJOR_MINOR)
+# db_component_name is the dir name in /s/b/c
+db_component_name=db42
db_path_config :=$(NSCP_DISTDIR)/$(db_component_name)
endif # DB_SOURCE_ROOT
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- internal_comp_deps.mk 29 Mar 2006 19:42:39 -0000 1.38
+++ internal_comp_deps.mk 7 Apr 2006 01:33:30 -0000 1.39
@@ -176,7 +176,7 @@
ifndef SASL_SOURCE_ROOT
ifneq ($(ARCH), Linux)
-SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
SASL_DEP = $(SASL_INCLUDE)/sasl.h
ifndef SASL_PULL_METHOD
SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -216,10 +216,11 @@
ifndef DB_SOURCE_ROOT
#if no version specified, we'll use the latest one
ifndef DB_VERSION
- DB_VERSION=20040130
+ DB_VERSION=20060308
endif
# define the paths to the component parts
-db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
+#db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
+db_components_share=$(COMPONENTS_DIR_DEV)/$(db_component_name)
MY_NSOBJDIR_TAG=$(NSOBJDIR_TAG).OBJ
db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(MY_NSOBJDIR_TAG)
# add ",bin" to DB_FILES if you want the programs like db_verify, db_recover, etc.
@@ -508,7 +509,18 @@
#PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
ifeq ($(BUILD_MODE), int)
-PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+ ifeq ($(BUILD_ARCH), RHEL4)
+ # use 64-bit perl on 64-bit RHEL4; 32-bit on 32-bit RHEL4
+ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME)
+ endif
+ ifeq ($(BUILD_ARCH), HPUX)
+ HPUX_ARCH := $(shell uname -m)
+ ifeq ($(HPUX_ARCH), ia64)
+ # use 64-bit perl on 64-bit IPF HP-UX
+ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME)
+ endif
+ endif
else
PERLDAP_COMPONENT_DIR = $(FED_COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nsconfig.mk 28 Feb 2006 21:51:21 -0000 1.19
+++ nsconfig.mk 7 Apr 2006 01:33:30 -0000 1.20
@@ -67,6 +67,7 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+ USE_PERLDAP:=1
else
USE_ADMINSERVER:=1
USE_CONSOLE:=1
@@ -75,6 +76,7 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+ USE_PERLDAP:=1
GET_JAVA_FROM_PATH := 1
GET_ANT_FROM_PATH := 1
USE_PERL_FROM_PATH := 1
@@ -532,13 +534,15 @@
CC=cc -Ae -D_POSIX_C_SOURCE=199506L
ifeq ($(BUILD_MODULE), HTTP_ADMIN)
ifeq ($(NSOS_RELEASE),B.11.23)
-CXX=aCC -AP -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
+# -AA -- new-lib libstd 2
+CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
else
CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
endif
else
ifeq ($(NSOS_RELEASE),B.11.23)
-CXX=aCC -AP -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
+# -AA -- new-lib libstd 2
+CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
else
CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
endif
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsperl.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsperl.mk 21 Oct 2005 19:21:04 -0000 1.5
+++ nsperl.mk 7 Apr 2006 01:33:30 -0000 1.6
@@ -41,7 +41,7 @@
NSPERL_RELDATE := 20020626
# default; will be redefined below for specific platform
#PERL=$(NSPERL_COMPONENT_DIR)/lib/$(NSPERL_VERSION)/nsperl
-PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl
+PERL=perl
ifeq ($(BUILD_ARCH), WINNT)
PERL=nsperl
endif
17 years, 10 months
[Fedora-directory-commits] ldapserver/ldap/cm genPerlDAPInf.pl, NONE, 1.1 Makefile, 1.54, 1.55
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/ldap/cm
Modified Files:
Makefile
Added Files:
genPerlDAPInf.pl
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
--- NEW FILE genPerlDAPInf.pl ---
#
# 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) 2006 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Usage: genPerlDAPInf.pl <full_path_to_perldap.inf> <version> <Vendor>
$vendor = "Red Hat, Inc.";
if ($#ARGV < 1) {
print "Usage: genPerlDAPInf.pl <full_path_to_perldap.inf> <version> [<Vendora>]\n";
exit 1;
}
$outfile = $ARGV[0];
$version = $ARGV[1];
if ($#ARGV >= 2) {
$vendor = $ARGV[2];
}
print "outfile: $outfile, version: $version, vendor: $vendor\n";
($nodot_version = $version) =~ tr/\.//d;
$component = "perldap" . $nodot_version;
open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!";
print OUT "[General]\n";
print OUT "Name=PerLDAP\n";
print OUT "Description=This is mozilla.org PerLDAP.\n";
print OUT "Components=$component\n\n";
print OUT "[$component]\n";
print OUT "Description=The mozilla.org PerLDAP $version\n";
print OUT "NickName=$component\n";
print OUT "Name=PerLDAP $version\n";
print OUT "SourcePath=perldap\n";
print OUT "Vendor=$vendor\n";
print OUT "Security=none\n";
print OUT "Version=$version\n";
print OUT "Compatible=$version\n";
print OUT "Archive=perldap-$version.zip\n";
print OUT "Visible=FALSE\n";
print OUT "Checked=TRUE\n";
close OUT;
exit 0;
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile 4 Apr 2006 21:26:52 -0000 1.54
+++ Makefile 7 Apr 2006 01:33:36 -0000 1.55
@@ -195,7 +195,7 @@
ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
ifeq ($(USE_SETUPUTIL), 1)
- LDAP_PACKAGE_FILES:=setup setup.inf setup.res slient.inf unzip_wrapper.pl dsktune LICENSE.txt README.txt slapd
+ LDAP_PACKAGE_FILES:=setup setup.inf setup.res silent.inf unzip_wrapper.pl svrcore dsktune LICENSE.txt README.txt slapd
else
LDAP_PACKAGE_FILES:=setup dsktune slapd
endif
@@ -626,12 +626,24 @@
# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
ifeq ($(USE_SETUPUTIL), 1)
cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR)
+ @echo "removing unzipped dir"
+ @dirs=`ls $(INSTDIR)`; for adir in $$dirs ; do \
+ if [ -d $(INSTDIR)/$$adir/unzipped ] ; then \
+ rm -rf $(INSTDIR)/$$adir/unzipped; \
+ fi; \
+ done
ifeq ($(DS_BRAND), redhat)
- cd $(INSTDIR); \
- $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \
+ @(cd $(INSTDIR); \
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \
cat setup.inf | sed -e "s/^#Resource/Resource/" > setup.inf.tmp; \
- mv setup.inf.tmp setup.inf
+ mv setup.inf.tmp setup.inf)
+endif
endif
+
+ifeq ($(USE_PERLDAP), 1)
+ mkdir $(INSTDIR)/perldap
+ cp -R $(PERLDAP_BUILT_DIR)/* $(INSTDIR)/perldap
+ $(PERL) genPerlDAPInf.pl $(INSTDIR)/perldap/perldap.inf 1.5 "Fedora Project"
endif
# copy in our product .inf files
17 years, 10 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst ux-dialog.cc, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/ldap/cm/newinst
Modified Files:
ux-dialog.cc
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
Index: ux-dialog.cc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-dialog.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ux-dialog.cc 19 Apr 2005 22:07:21 -0000 1.8
+++ ux-dialog.cc 7 Apr 2006 01:33:37 -0000 1.9
@@ -49,17 +49,20 @@
**
*********************************************************************/
-#include <errno.h>
-#include <iostream.h>
-#include <fstream.h>
-/* Newer g++ wants the new std header forms */
-#if defined( Linux )
+#if !defined(HPUX) || defined(_HP_NAMESPACE_STD)
+#include <iostream>
#include <strstream>
+#include <fstream>
+using namespace std;
using std::ostrstream;
-/* But some platforms won't accept those (specifically HP-UX aCC */
#else
+/* older HP-UX compiler, using libstd 1 (no -AA) */
+#include <iostream.h> /* use old name on older systems */
#include <strstream.h>
+#include <fstream.h>
#endif
+
+#include <errno.h>
#include <stdio.h>
#include <unistd.h>
#include <ctype.h>
17 years, 10 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd Makefile, 1.11, 1.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/ldap/servers/slapd
Modified Files:
Makefile
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 29 Mar 2006 19:46:21 -0000 1.11
+++ Makefile 7 Apr 2006 01:33:37 -0000 1.12
@@ -91,12 +91,12 @@
endif
ifeq ($(ARCH), HPUX)
-ifeq ($(OS_TEST),ia64)
-LDAP_DONT_USE_SMARTHEAP=1
-ifeq ($(DEBUG), optimize)
-CFLAGS+=+O3
-endif
-endif
+ ifeq ($(NSOS_TEST1),ia64)
+ LDAP_DONT_USE_SMARTHEAP=1
+ ifeq ($(DEBUG), optimize)
+ CFLAGS+=+O3
+ endif
+ endif
endif
# Don't use smartheap for debug builds
@@ -200,12 +200,12 @@
ifeq ($(DEBUG), full)
ifeq ($(USE_64), 1)
EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
- ifneq ($(OS_TEST), ia64)
+ ifneq ($(NSOS_TEST1), ia64)
EXTRA_LIBS += /opt/langtools/lib/pa20_64/end.o
endif
else
EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
- ifneq ($(OS_TEST), ia64)
+ ifneq ($(NSOS_TEST1), ia64)
EXTRA_LIBS += /opt/langtools/lib/end.o
endif
endif #USE_64
17 years, 10 months
[Fedora-directory-commits] ldapserver/config HP-UXB.11.23.mk, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/config
Added Files:
HP-UXB.11.23.mk
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
--- NEW FILE HP-UXB.11.23.mk ---
#
# 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) 2006 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
#
# Config stuff for HP-UX.11.23
#
include $(DEPTH)/config/HP-UX.mk
17 years, 10 months
[Fedora-directory-commits] ldapserver/ldap javarules.mk,1.6,1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/ldap
Modified Files:
javarules.mk
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
Index: javarules.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/javarules.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- javarules.mk 3 Oct 2005 19:53:46 -0000 1.6
+++ javarules.mk 7 Apr 2006 01:33:30 -0000 1.7
@@ -68,54 +68,34 @@
PATH_SEP := :
ifeq ($(OS), Windows_NT)
- GET_JAVA_FROM_PATH := 1
- PATH_SEP := ;
- EXE_SUFFIX := .exe
+ GET_JAVA_FROM_PATH := 1
+ PATH_SEP := ;
+ EXE_SUFFIX := .exe
endif
-# For NT, assume a locally installed JDK
-ifdef GET_JAVA_FROM_PATH
+ifeq ($(INTERNAL_BUILD), 1)
+ # For UNIX, use JDK and JAR files over NFS
+ ifeq ($(ARCH), Linux)
+ JDK_VERSION:=1.4.2_SR3
+ JDK_VERSDIR:=ibmjdk/$(JDK_VERSION)/$(NSOBJDIR_NAME)
+ else
+ ifeq ($(ARCH), HPUX)
+ JDK_VERSION:=1.4.2_09
+ JDK_VERSDIR:=hpjdk/$(JDK_VERSION)
+ else
+ JDK_VERSION:=1.4.2_10 # Solaris
+ JDK_VERSDIR:=jdk/$(JDK_VERSION)/$(NSOBJDIR_NAME)
+ endif
+ endif
+ JDKLIB:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/lib/tools.jar
+ JAVABINDIR:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/bin
+else # INTERNAL_BUILD
# Figure out where the java lib .jar files are, from where javac is
JDKCOMP := $(shell which javac)
JDKPRELIB := $(subst bin/javac$(EXE_SUFFIX),lib,$(JDKCOMP))
JDKLIB := $(addprefix $(JDKPRELIB)/,tools.jar)
-else
-
-# For UNIX, use JDK and JAR files over NFS
-# Use NT classes.zip; doesn't matter that it was compiled on NT
-#
-# Version 1.4.0_01 of the JDK does not seem to run well on RHEL 3.0
- ifeq ($(ARCH), Linux)
- JDK_VERSION=1.4.2
- else
- ifeq ($(ARCH), HPUX)
- JDK_VERSION=1.4.1_05
- else
- JDK_VERSION=1.4.0_01
- endif
- endif
+endif
- JDK_VERSDIR=jdk$(JDK_VERSION)
- JDKLIB=/share/builds/components/jdk/$(JDK_VERSION)/$(PRETTY_ARCH)/lib/tools.jar
- ifeq ($(NSOS_ARCH), IRIX)
-# Get IRIX compiler from tools directory, currently 1.1.3
- JAVABINDIR=/tools/ns/bin
- else
- ifeq ($(ARCH), AIX)
-# Get AIX compiler from tools directory, currently 1.1.2
- JAVABINDIR=/tools/ns/bin
- else
- ifeq ($(ARCH), OSF1)
- JAVABINDIR=/share/builds/components/jdk/1.1.6beta/OSF1/bin
- else
-# Solaris, Linux, HP/UX and any others:
- JDK_DIR=$(COMPONENTS_DIR)/jdk
- JAVABINDIR=$(JDK_DIR)/$(JDK_VERSION)/$(PRETTY_ARCH)/bin
- endif
- endif
- endif
-endif
-
CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE)
ifndef JAVA
17 years, 10 months
[Fedora-directory-commits] adminserver components.mk,1.47,1.48
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23436
Modified Files:
components.mk
Log Message:
Updated SETUPUTIL_RELDATE to 20060405.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- components.mk 29 Mar 2006 02:19:52 -0000 1.47
+++ components.mk 5 Apr 2006 20:05:15 -0000 1.48
@@ -137,7 +137,7 @@
# SETUPUTIL
##############################################################
-SETUPUTIL_RELDATE = 20060327
+SETUPUTIL_RELDATE = 20060405
SETUPUTIL_FILE = setuputil.tar.gz
SETUPUTIL_COMPNAME = setuputil/1.0
17 years, 10 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.53,1.54
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2915
Modified Files:
Makefile
Log Message:
setup.inf, setup.res, silent.inf, unzip_wrapper.pl, LICENSE.txt, README.txt were missing from the tar-gz package file.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile 29 Mar 2006 19:45:15 -0000 1.53
+++ Makefile 4 Apr 2006 21:26:52 -0000 1.54
@@ -194,6 +194,12 @@
ADMIN_SERVER_TARGZ=$(ADMINSERVER_PKG)
ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
+ifeq ($(USE_SETUPUTIL), 1)
+ LDAP_PACKAGE_FILES:=setup setup.inf setup.res slient.inf unzip_wrapper.pl dsktune LICENSE.txt README.txt slapd
+else
+ LDAP_PACKAGE_FILES:=setup dsktune slapd
+endif
+
# these are files we need to put in the command line/console only package
#LDAPSDK_IMPORTS=ldapsearch ldapdelete ldapmodify
@@ -751,8 +757,8 @@
# build the combined packages tar file; use h flag to follow symlinks
ifdef BUILD_SHIP
ifndef BUILD_PATCH
- cd $(INSTDIR); $(TAR) cvfh - setup slapd \
- dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ cd $(INSTDIR); $(TAR) cvfh - $(LDAP_PACKAGE_FILES) \
+ $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
@@ -760,8 +766,8 @@
else
echo base/unzipped > $(TMPLIST)
echo admin/unzipped >> $(TMPLIST)
- cd $(INSTDIR); $(TAR) cvfh - -X $(TMPLIST) setup slapd \
- dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ cd $(INSTDIR); $(TAR) cvfh - -X $(TMPLIST) $(LDAP_PACKAGE_FILES) \
+ $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
rm -f $(TMPLIST)
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
17 years, 10 months