[Fedora-directory-commits] mod_nss mod_nss.c, 1.15, 1.16 mod_nss.h, 1.17, 1.18 nss_engine_init.c, 1.28, 1.29 nss_engine_io.c, 1.7, 1.8 nss_engine_kernel.c, 1.9, 1.10 nss_engine_vars.c, 1.8, 1.9 nss_util.c, 1.2, 1.3
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20057
Modified Files:
mod_nss.c mod_nss.h nss_engine_init.c nss_engine_io.c
nss_engine_kernel.c nss_engine_vars.c nss_util.c
Log Message:
Resolves: 241936
Bring in some updates based on diffs from 2.0.59 to 2.2.4
- Do explicit TRUE/FALSE tests with sc->enabled to see if SSL is enabled.
Don't depend on the fact that TRUE == 1
- Remove some dead code
- Minor update to the buffer code that buffers POST data during a
renegotation
- Optimize setting environment variables by using a switch statement.
Index: mod_nss.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_nss.c 20 Oct 2006 15:23:39 -0000 1.15
+++ mod_nss.c 31 May 2007 21:36:03 -0000 1.16
@@ -206,7 +206,7 @@
SSLConnRec *sslconn;
- if (!sc->enabled) {
+ if (sc->enabled == FALSE) {
return 0;
}
Index: mod_nss.h
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_nss.h 20 Oct 2006 15:23:39 -0000 1.17
+++ mod_nss.h 31 May 2007 21:36:03 -0000 1.18
@@ -446,9 +446,6 @@
/* Utility Functions */
char *nss_util_vhostid(apr_pool_t *, server_rec *);
-void nss_util_strupper(char *);
-void nss_util_uuencode(char *, const char *, BOOL);
-void nss_util_uuencode_binary(unsigned char *, const unsigned char *, int, BOOL);
apr_file_t *nss_util_ppopen(server_rec *, apr_pool_t *, const char *,
const char * const *);
void nss_util_ppclose(server_rec *, apr_pool_t *, apr_file_t *);
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nss_engine_init.c 1 Feb 2007 14:06:56 -0000 1.28
+++ nss_engine_init.c 31 May 2007 21:36:03 -0000 1.29
@@ -1036,13 +1036,13 @@
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{
- if (sc->enabled) {
+ if (sc->enabled == TRUE) {
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"Configuring server for SSL protocol");
nss_init_server_ctx(s, p, ptemp, sc);
}
- if (sc->proxy_enabled) {
+ if (sc->proxy_enabled == TRUE) {
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"Enabling proxy.");
nss_init_proxy_ctx(s, p, ptemp, sc);
@@ -1070,7 +1070,7 @@
for (s = base_server; s; s = s->next) {
sc = mySrvConfig(s);
- if (sc->enabled) {
+ if (sc->enabled == TRUE) {
if (sc->server->nickname) {
CERT_DestroyCertificate(sc->server->servercert);
SECKEY_DestroyPrivateKey(sc->server->serverkey);
Index: nss_engine_io.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_io.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nss_engine_io.c 9 Aug 2006 20:11:45 -0000 1.7
+++ nss_engine_io.c 31 May 2007 21:36:03 -0000 1.8
@@ -578,8 +578,7 @@
switch (status) {
case HTTP_BAD_REQUEST:
/* log the situation */
- ap_log_error(APLOG_MARK, APLOG_INFO, 0,
- f->c->base_server,
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, f->c->base_server,
"SSL handshake failed: HTTP spoken on HTTPS port; "
"trying to send HTML error page");
@@ -924,6 +923,7 @@
struct modnss_buffer_ctx {
apr_bucket_brigade *bb;
+ apr_pool_t *pool;
};
int nss_io_buffer_fill(request_rec *r)
@@ -936,7 +936,8 @@
/* Create the context which will be passed to the input filter. */
ctx = apr_palloc(r->pool, sizeof *ctx);
- ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc);
+ apr_pool_create(&ctx->pool, r->pool);
+ ctx->bb = apr_brigade_create(ctx->pool, c->bucket_alloc);
/* ... and a temporary brigade. */
tempb = apr_brigade_create(r->pool, c->bucket_alloc);
@@ -981,7 +982,7 @@
total += len;
}
- rv = apr_bucket_setaside(e, r->pool);
+ rv = apr_bucket_setaside(e, ctx->pool);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"could not setaside bucket for SSL buffer");
@@ -1059,6 +1060,9 @@
* the APR_BRIGADE_* macros. */
APR_RING_UNSPLICE(d, e, link);
APR_RING_SPLICE_HEAD(&bb->list, d, e, apr_bucket, link);
+
+ APR_BRIGADE_CHECK_CONSISTENCY(bb);
+ APR_BRIGADE_CHECK_CONSISTENCY(ctx->bb);
}
}
else {
Index: nss_engine_kernel.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_kernel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nss_engine_kernel.c 9 Aug 2006 20:32:47 -0000 1.9
+++ nss_engine_kernel.c 31 May 2007 21:36:03 -0000 1.10
@@ -130,7 +130,7 @@
* no further access control checks are relevant. The test for
* sc->enabled is probably strictly unnecessary
*/
- if (!(sc->enabled || !ssl)) {
+ if (!((sc->enabled == TRUE) || !ssl)) {
return DECLINED;
}
@@ -619,7 +619,7 @@
* - ssl not enabled
* - client did not present a certificate
*/
- if (!(sc->enabled && sslconn && sslconn->ssl && sslconn->client_cert) ||
+ if (!((sc->enabled == TRUE) && sslconn && sslconn->ssl && sslconn->client_cert) ||
!(dc->nOptions & SSL_OPT_FAKEBASICAUTH) || r->user)
{
return DECLINED;
@@ -781,7 +781,7 @@
/*
* Check to see if SSL is on
*/
- if (!(sc->enabled && sslconn && (ssl = sslconn->ssl))) {
+ if (!((sc->enabled == TRUE) && sslconn && (ssl = sslconn->ssl))) {
return DECLINED;
}
Index: nss_engine_vars.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_vars.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nss_engine_vars.c 9 Aug 2006 19:31:18 -0000 1.8
+++ nss_engine_vars.c 31 May 2007 21:36:03 -0000 1.9
@@ -80,59 +80,82 @@
* Request dependent stuff
*/
if (r != NULL) {
- if (strcEQ(var, "HTTP_USER_AGENT"))
- result = nss_var_lookup_header(p, r, "User-Agent");
- else if (strcEQ(var, "HTTP_REFERER"))
- result = nss_var_lookup_header(p, r, "Referer");
- else if (strcEQ(var, "HTTP_COOKIE"))
- result = nss_var_lookup_header(p, r, "Cookie");
- else if (strcEQ(var, "HTTP_FORWARDED"))
- result = nss_var_lookup_header(p, r, "Forwarded");
- else if (strcEQ(var, "HTTP_HOST"))
- result = nss_var_lookup_header(p, r, "Host");
- else if (strcEQ(var, "HTTP_PROXY_CONNECTION"))
- result = nss_var_lookup_header(p, r, "Proxy-Connection");
- else if (strcEQ(var, "HTTP_ACCEPT"))
- result = nss_var_lookup_header(p, r, "Accept");
- else if (strlen(var) > 5 && strcEQn(var, "HTTP:", 5))
- /* all other headers from which we are still not know about */
- result = nss_var_lookup_header(p, r, var+5);
- else if (strcEQ(var, "THE_REQUEST"))
- result = r->the_request;
- else if (strcEQ(var, "REQUEST_METHOD"))
- result = (char *)(r->method);
- else if (strcEQ(var, "REQUEST_SCHEME"))
+ switch (var[0]) {
+ case 'H':
+ case 'h':
+ if (strcEQ(var, "HTTP_USER_AGENT"))
+ result = nss_var_lookup_header(p, r, "User-Agent");
+ else if (strcEQ(var, "HTTP_REFERER"))
+ result = nss_var_lookup_header(p, r, "Referer");
+ else if (strcEQ(var, "HTTP_COOKIE"))
+ result = nss_var_lookup_header(p, r, "Cookie");
+ else if (strcEQ(var, "HTTP_FORWARDED"))
+ result = nss_var_lookup_header(p, r, "Forwarded");
+ else if (strcEQ(var, "HTTP_HOST"))
+ result = nss_var_lookup_header(p, r, "Host");
+ else if (strcEQ(var, "HTTP_PROXY_CONNECTION"))
+ result = nss_var_lookup_header(p, r, "Proxy-Connection");
+ else if (strcEQ(var, "HTTP_ACCEPT"))
+ result = nss_var_lookup_header(p, r, "Accept");
+ else if (strlen(var) > 5 && strcEQn(var, "HTTP:", 5))
+ /* all other headers from which we are still not know about */
+ result = nss_var_lookup_header(p, r, var+5);
+ break;
+
+ case 'R':
+ case 'r':
+ if (strcEQ(var, "REQUEST_METHOD"))
+ result = (char *)(r->method);
+ else if (strcEQ(var, "REQUEST_SCHEME"))
#if AP_SERVER_MINORVERSION_NUMBER < 2 /* See comment in mod_nss.h */
- result = (char *)ap_http_method(r);
+ result = (char *)ap_http_method(r);
#else
- result = (char *)ap_http_scheme(r);
+ result = (char *)ap_http_scheme(r);
#endif
- else if (strcEQ(var, "REQUEST_URI"))
- result = r->uri;
- else if (strcEQ(var, "SCRIPT_FILENAME") ||
- strcEQ(var, "REQUEST_FILENAME"))
- result = r->filename;
- else if (strcEQ(var, "PATH_INFO"))
- result = r->path_info;
- else if (strcEQ(var, "QUERY_STRING"))
- result = r->args;
- else if (strcEQ(var, "REMOTE_HOST"))
- result = (char *)ap_get_remote_host(r->connection,
+ else if (strcEQ(var, "REQUEST_URI"))
+ result = r->uri;
+ else if (strcEQ(var, "REQUEST_FILENAME"))
+ result = r->filename;
+ else if (strcEQ(var, "REMOTE_HOST"))
+ result = (char *)ap_get_remote_host(r->connection,
r->per_dir_config, REMOTE_NAME, NULL);
- else if (strcEQ(var, "REMOTE_IDENT"))
- result = (char *)ap_get_remote_logname(r);
- else if (strcEQ(var, "IS_SUBREQ"))
- result = (r->main != NULL ? "true" : "false");
- else if (strcEQ(var, "DOCUMENT_ROOT"))
- result = (char *)ap_document_root(r);
- else if (strcEQ(var, "SERVER_ADMIN"))
- result = r->server->server_admin;
- else if (strcEQ(var, "SERVER_NAME"))
- result = (char *)ap_get_server_name(r);
- else if (strcEQ(var, "SERVER_PORT"))
- result = apr_psprintf(p, "%u", ap_get_server_port(r));
- else if (strcEQ(var, "SERVER_PROTOCOL"))
- result = r->protocol;
+ else if (strcEQ(var, "REMOTE_IDENT"))
+ result = (char *)ap_get_remote_logname(r);
+ else if (strcEQ(var, "REMOTE_USER"))
+ result = r->user;
+ break;
+
+ case 'S':
+ case 's':
+ if (strcEQn(var, "SSL", 3)) break; /* shortcut common case */
+
+ if (strcEQ(var, "SERVER_ADMIN"))
+ result = r->server->server_admin;
+ else if (strcEQ(var, "SERVER_NAME"))
+ result = (char *)ap_get_server_name(r);
+ else if (strcEQ(var, "SERVER_PORT"))
+ result = apr_psprintf(p, "%u", ap_get_server_port(r));
+ else if (strcEQ(var, "SERVER_PROTOCOL"))
+ result = r->protocol;
+ else if (strcEQ(var, "SCRIPT_FILENAME"))
+ result = r->filename;
+ break;
+
+ default:
+ if (strcEQ(var, "PATH_INFO"))
+ result = r->path_info;
+ else if (strcEQ(var, "QUERY_STRING"))
+ result = r->args;
+ else if (strcEQ(var, "IS_SUBREQ"))
+ result = (r->main != NULL ? "true" : "false");
+ else if (strcEQ(var, "DOCUMENT_ROOT"))
+ result = (char *)ap_document_root(r);
+ else if (strcEQ(var, "AUTH_TYPE"))
+ result = r->ap_auth_type;
+ if (strcEQ(var, "THE_REQUEST"))
+ result = r->the_request;
+ break;
+ }
}
/*
@@ -140,15 +163,11 @@
*/
if (result == NULL && c != NULL) {
SSLConnRec *sslconn = myConnConfig(c);
- if (strcEQ(var, "REMOTE_ADDR"))
- result = c->remote_ip;
- else if (strcEQ(var, "REMOTE_USER"))
- result = r->user;
- else if (strcEQ(var, "AUTH_TYPE"))
- result = r->ap_auth_type;
- else if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
+ if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
&& sslconn && sslconn->ssl)
result = nss_var_lookup_ssl(p, c, var+4);
+ else if (strcEQ(var, "REMOTE_ADDR"))
+ result = c->remote_ip;
else if (strcEQ(var, "HTTPS")) {
if (sslconn && sslconn->ssl)
result = "on";
Index: nss_util.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nss_util.c 31 May 2005 14:32:42 -0000 1.2
+++ nss_util.c 31 May 2007 21:36:03 -0000 1.3
@@ -36,7 +36,7 @@
port = s->port;
else {
sc = mySrvConfig(s);
- if (sc->enabled)
+ if (sc->enabled == TRUE)
port = DEFAULT_HTTPS_PORT;
else
port = DEFAULT_HTTP_PORT;
@@ -45,52 +45,6 @@
return id;
}
-void nss_util_strupper(char *s)
-{
- for (; *s; ++s)
- *s = apr_toupper(*s);
- return;
-}
-
-static const char nss_util_uuencode_six2pr[64+1] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-void nss_util_uuencode(char *szTo, const char *szFrom, BOOL bPad)
-{
- nss_util_uuencode_binary((unsigned char *)szTo,
- (const unsigned char *)szFrom,
- strlen(szFrom), bPad);
-}
-
-void nss_util_uuencode_binary(unsigned char *szTo,
- const unsigned char *szFrom,
- int nLength, BOOL bPad)
-{
- const unsigned char *s;
- int nPad = 0;
-
- for (s = szFrom; nLength > 0; s += 3) {
- *szTo++ = nss_util_uuencode_six2pr[s[0] >> 2];
- *szTo++ = nss_util_uuencode_six2pr[(s[0] << 4 | s[1] >> 4) & 0x3f];
- if (--nLength == 0) {
- nPad = 2;
- break;
- }
- *szTo++ = nss_util_uuencode_six2pr[(s[1] << 2 | s[2] >> 6) & 0x3f];
- if (--nLength == 0) {
- nPad = 1;
- break;
- }
- *szTo++ = nss_util_uuencode_six2pr[s[2] & 0x3f];
- --nLength;
- }
- while(bPad && nPad--) {
- *szTo++ = NUL;
- }
- *szTo = NUL;
- return;
-}
-
apr_file_t *nss_util_ppopen(server_rec *s, apr_pool_t *p, const char *cmd,
const char * const *argv)
{
16 years, 6 months
[Fedora-directory-commits] adminutil/m4 icu.m4,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8401/adminutil/m4
Modified Files:
icu.m4
Log Message:
Resolves: bug 235293
Bug Description: Review Request: adminutil - Utility library for Fedora Directory Server administration
Fix Description:
1) Use macros consistently in the spec file
2) Use install -p to ensure header file timestamps are preserved
3) Fixed acclanglist.c to use LGPL
4) Link admsslutil against adminutil to resolve undefined symbols
5) Check for genrb in icu.m4
Index: icu.m4
===================================================================
RCS file: /cvs/dirsec/adminutil/m4/icu.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icu.m4 4 Apr 2007 19:37:41 -0000 1.2
+++ icu.m4 25 May 2007 22:55:55 -0000 1.3
@@ -100,3 +100,7 @@
AC_MSG_ERROR([ICU not found, specify with --with-icu.])
fi
fi
+
+if test ! -f "$icu_bin/genrb" ; then
+ AC_MSG_ERROR([genrb not found in $icu_bin - please specify ICU bin directory])
+fi
16 years, 6 months
[Fedora-directory-commits] adminutil Makefile.am, 1.3, 1.4 Makefile.in, 1.4, 1.5 adminutil.spec, 1.5, 1.6 configure, 1.4, 1.5 configure.ac, 1.3, 1.4 aclocal.m4, 1.4, 1.5 missing, 1.3, 1.4 install-sh, 1.3, 1.4 depcomp, 1.3, 1.4 config.guess, 1.3, 1.4 compile, 1.3, 1.4 config.sub, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8401/adminutil
Modified Files:
Makefile.am Makefile.in adminutil.spec configure configure.ac
aclocal.m4 missing install-sh depcomp config.guess compile
config.sub
Log Message:
Resolves: bug 235293
Bug Description: Review Request: adminutil - Utility library for Fedora Directory Server administration
Fix Description:
1) Use macros consistently in the spec file
2) Use install -p to ensure header file timestamps are preserved
3) Fixed acclanglist.c to use LGPL
4) Link admsslutil against adminutil to resolve undefined symbols
5) Check for genrb in icu.m4
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 17 May 2007 19:25:12 -0000 1.3
+++ Makefile.am 25 May 2007 22:55:54 -0000 1.4
@@ -17,7 +17,9 @@
NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
+if enable_tests
SASL_LINK = @sasl_lib@ -lsasl2
+endif
ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
#------------------------
@@ -26,6 +28,7 @@
lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
pkgdata_DATA = root.res en.res en_US.res
+if enable_tests
check_PROGRAMS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
@@ -51,6 +54,7 @@
psetwrite_SOURCES = tests/psetwrite.c
psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
psetwrite_LDADD = $(TEST_LDADD)
+endif
#------------------------
# Installed Files
@@ -123,5 +127,5 @@
lib/libadmsslutil/uginfossl.c
libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 17 May 2007 19:25:12 -0000 1.4
+++ Makefile.in 25 May 2007 22:55:54 -0000 1.5
@@ -37,8 +37,9 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-check_PROGRAMS = retrieveSIE$(EXEEXT) retrieveSIEssl$(EXEEXT) \
- psetread$(EXEEXT) psetreadssl$(EXEEXT) psetwrite$(EXEEXT)
+@enable_tests_TRUE@check_PROGRAMS = retrieveSIE$(EXEEXT) \
+@enable_tests_TRUE@ retrieveSIEssl$(EXEEXT) psetread$(EXEEXT) \
+@enable_tests_TRUE@ psetreadssl$(EXEEXT) psetwrite$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/adminutil.pc.in \
$(top_srcdir)/configure \
@@ -84,7 +85,7 @@
lib/libadminutil/libadminutil_la-strlist.lo \
lib/libadminutil/libadminutil_la-uginfo.lo
libadminutil_la_OBJECTS = $(am_libadminutil_la_OBJECTS)
-libadmsslutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+libadmsslutil_la_DEPENDENCIES = libadminutil.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libadmsslutil_la_OBJECTS = \
@@ -96,26 +97,35 @@
lib/libadmsslutil/libadmsslutil_la-sslerror.lo \
lib/libadmsslutil/libadmsslutil_la-uginfossl.lo
libadmsslutil_la_OBJECTS = $(am_libadmsslutil_la_OBJECTS)
-am_psetread_OBJECTS = tests/psetread-psetread.$(OBJEXT)
+am__psetread_SOURCES_DIST = tests/psetread.c
+@enable_tests_TRUE@am_psetread_OBJECTS = \
+@enable_tests_TRUE@ tests/psetread-psetread.$(OBJEXT)
psetread_OBJECTS = $(am_psetread_OBJECTS)
-am__DEPENDENCIES_2 = libadmsslutil.la libadminutil.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
-psetread_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_psetreadssl_OBJECTS = tests/psetreadssl-psetreadssl.$(OBJEXT)
+@enable_tests_TRUE@am__DEPENDENCIES_2 = libadmsslutil.la \
+@enable_tests_TRUE@ libadminutil.la $(am__DEPENDENCIES_1) \
+@enable_tests_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@enable_tests_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@enable_tests_TRUE@psetread_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__psetreadssl_SOURCES_DIST = tests/psetreadssl.c
+@enable_tests_TRUE@am_psetreadssl_OBJECTS = \
+@enable_tests_TRUE@ tests/psetreadssl-psetreadssl.$(OBJEXT)
psetreadssl_OBJECTS = $(am_psetreadssl_OBJECTS)
-psetreadssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_psetwrite_OBJECTS = tests/psetwrite-psetwrite.$(OBJEXT)
+@enable_tests_TRUE@psetreadssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__psetwrite_SOURCES_DIST = tests/psetwrite.c
+@enable_tests_TRUE@am_psetwrite_OBJECTS = \
+@enable_tests_TRUE@ tests/psetwrite-psetwrite.$(OBJEXT)
psetwrite_OBJECTS = $(am_psetwrite_OBJECTS)
-psetwrite_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_retrieveSIE_OBJECTS = tests/retrieveSIE-retrieveSIE.$(OBJEXT)
+@enable_tests_TRUE@psetwrite_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__retrieveSIE_SOURCES_DIST = tests/retrieveSIE.c
+@enable_tests_TRUE@am_retrieveSIE_OBJECTS = \
+@enable_tests_TRUE@ tests/retrieveSIE-retrieveSIE.$(OBJEXT)
retrieveSIE_OBJECTS = $(am_retrieveSIE_OBJECTS)
-retrieveSIE_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_retrieveSIEssl_OBJECTS = \
- tests/retrieveSIEssl-retrieveSIEssl.$(OBJEXT)
+@enable_tests_TRUE@retrieveSIE_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__retrieveSIEssl_SOURCES_DIST = tests/retrieveSIEssl.c
+@enable_tests_TRUE@am_retrieveSIEssl_OBJECTS = tests/retrieveSIEssl-retrieveSIEssl.$(OBJEXT)
retrieveSIEssl_OBJECTS = $(am_retrieveSIEssl_OBJECTS)
-retrieveSIEssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@enable_tests_TRUE@retrieveSIEssl_DEPENDENCIES = \
+@enable_tests_TRUE@ $(am__DEPENDENCIES_2)
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -132,9 +142,9 @@
$(psetwrite_SOURCES) $(retrieveSIE_SOURCES) \
$(retrieveSIEssl_SOURCES)
DIST_SOURCES = $(libadminutil_la_SOURCES) $(libadmsslutil_la_SOURCES) \
- $(psetread_SOURCES) $(psetreadssl_SOURCES) \
- $(psetwrite_SOURCES) $(retrieveSIE_SOURCES) \
- $(retrieveSIEssl_SOURCES)
+ $(am__psetread_SOURCES_DIST) $(am__psetreadssl_SOURCES_DIST) \
+ $(am__psetwrite_SOURCES_DIST) $(am__retrieveSIE_SOURCES_DIST) \
+ $(am__retrieveSIEssl_SOURCES_DIST)
adminincDATA_INSTALL = $(INSTALL_DATA)
admsslincDATA_INSTALL = $(INSTALL_DATA)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
@@ -238,6 +248,8 @@
build_vendor = @build_vendor@
datadir = @datadir@
debug_defs = @debug_defs@
+enable_tests_FALSE = @enable_tests_FALSE@
+enable_tests_TRUE = @enable_tests_TRUE@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -295,7 +307,7 @@
NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
-SASL_LINK = @sasl_lib@ -lsasl2
+@enable_tests_TRUE@SASL_LINK = @sasl_lib@ -lsasl2
ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
#------------------------
@@ -303,24 +315,24 @@
#------------------------
lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
pkgdata_DATA = root.res en.res en_US.res
-TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
-TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
-retrieveSIE_SOURCES = tests/retrieveSIE.c
-retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
-retrieveSIE_LDADD = $(TEST_LDADD)
-retrieveSIEssl_SOURCES = tests/retrieveSIEssl.c
-retrieveSIEssl_CPPFLAGS = $(TEST_CPPFLAGS)
-retrieveSIEssl_LDADD = $(TEST_LDADD)
-psetread_SOURCES = tests/psetread.c
-psetread_CPPFLAGS = $(TEST_CPPFLAGS)
-psetread_LDADD = $(TEST_LDADD)
-psetreadssl_SOURCES = tests/psetreadssl.c
-psetreadssl_CPPFLAGS = $(TEST_CPPFLAGS)
-psetreadssl_LDADD = $(TEST_LDADD)
-psetwrite_SOURCES = tests/psetwrite.c
-psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
-psetwrite_LDADD = $(TEST_LDADD)
+@enable_tests_TRUE@TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
+@enable_tests_TRUE@TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+@enable_tests_TRUE@TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+@enable_tests_TRUE@retrieveSIE_SOURCES = tests/retrieveSIE.c
+@enable_tests_TRUE@retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
+@enable_tests_TRUE@retrieveSIE_LDADD = $(TEST_LDADD)
+@enable_tests_TRUE@retrieveSIEssl_SOURCES = tests/retrieveSIEssl.c
+@enable_tests_TRUE@retrieveSIEssl_CPPFLAGS = $(TEST_CPPFLAGS)
+@enable_tests_TRUE@retrieveSIEssl_LDADD = $(TEST_LDADD)
+@enable_tests_TRUE@psetread_SOURCES = tests/psetread.c
+@enable_tests_TRUE@psetread_CPPFLAGS = $(TEST_CPPFLAGS)
+@enable_tests_TRUE@psetread_LDADD = $(TEST_LDADD)
+@enable_tests_TRUE@psetreadssl_SOURCES = tests/psetreadssl.c
+@enable_tests_TRUE@psetreadssl_CPPFLAGS = $(TEST_CPPFLAGS)
+@enable_tests_TRUE@psetreadssl_LDADD = $(TEST_LDADD)
+@enable_tests_TRUE@psetwrite_SOURCES = tests/psetwrite.c
+@enable_tests_TRUE@psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
+@enable_tests_TRUE@psetwrite_LDADD = $(TEST_LDADD)
#------------------------
# Installed Files
@@ -380,7 +392,7 @@
lib/libadmsslutil/uginfossl.c
libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
all: all-am
Index: adminutil.spec
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- adminutil.spec 23 May 2007 13:56:01 -0000 1.5
+++ adminutil.spec 25 May 2007 22:55:54 -0000 1.6
@@ -7,7 +7,7 @@
Summary: Utility library for directory server administration
Name: adminutil
Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPL
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
@@ -35,16 +35,15 @@
well as resource handling (ICU ures API).
%package devel
-Summary: Development and header files for %{name}
-Group: Development/Libraries
+Summary: Development and header files for %{name}
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-devel >= %{nss_version}
-BuildRequires: svrcore-devel >= %{svrcore_version}
-BuildRequires: mozldap-devel >= %{mozldap_version}
-BuildRequires: libicu-devel >= %{icu_version}
-BuildRequires: icu >= %{icu_version}
+Requires: pkgconfig
+Requires: nspr-devel >= %{nspr_version}
+Requires: nss-devel >= %{nss_version}
+Requires: svrcore-devel >= %{svrcore_version}
+Requires: mozldap-devel >= %{mozldap_version}
+Requires: libicu-devel >= %{icu_version}
%description devel
Development files and header files necessary to build applications
@@ -55,15 +54,15 @@
%build
-%configure
-make
+%configure --disable-tests
+%{__make} %{?_smp_mflags}
%install
%{__rm} -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -85,6 +84,12 @@
%{_includedir}/libadmsslutil
%changelog
+* Wed May 23 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-3
+- more fedora review stuff - use macros consistently
+- make sure install preserves timestamps
+- use lgpl instead of gpl for acclanglist.c
+- fix undefined weak symbols in libadmsslutil
+
* Fri May 18 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-2
- pkgconfig is a requires not a build requires
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure 17 May 2007 19:25:12 -0000 1.4
+++ configure 25 May 2007 22:55:54 -0000 1.5
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs debug_defs PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir sasl_inc sasl_lib icu_inc icu_lib icu_libdir icu_bin WINNT_TRUE WINNT_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs debug_defs enable_tests_TRUE enable_tests_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir sasl_inc sasl_lib icu_inc icu_lib icu_libdir icu_bin WINNT_TRUE WINNT_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1038,7 +1038,8 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-debug Enable debug features
+ --enable-debug Enable debug features
+ --enable-tests Enable tests to be built (default: yes)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4285,7 +4286,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4288 "configure"' > conftest.$ac_ext
+ echo '#line 4289 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5420,7 +5421,7 @@
# Provide some information about the compiler.
-echo "$as_me:5423:" \
+echo "$as_me:5424:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6483,11 +6484,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6490: \$? = $ac_status" >&5
+ echo "$as_me:6491: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6751,11 +6752,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6754: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6755: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6758: \$? = $ac_status" >&5
+ echo "$as_me:6759: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6855,11 +6856,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6858: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6859: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6862: \$? = $ac_status" >&5
+ echo "$as_me:6863: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8324,7 +8325,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8327 "configure"' > conftest.$ac_ext
+ echo '#line 8328 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9221,7 +9222,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9224 "configure"
+#line 9225 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9321,7 +9322,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9324 "configure"
+#line 9325 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11664,11 +11665,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11671: \$? = $ac_status" >&5
+ echo "$as_me:11672: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11768,11 +11769,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11771: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11775: \$? = $ac_status" >&5
+ echo "$as_me:11776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12304,7 +12305,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12307 "configure"' > conftest.$ac_ext
+ echo '#line 12308 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13362,11 +13363,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13366: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13369: \$? = $ac_status" >&5
+ echo "$as_me:13370: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13466,11 +13467,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13469: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13473: \$? = $ac_status" >&5
+ echo "$as_me:13474: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14915,7 +14916,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14918 "configure"' > conftest.$ac_ext
+ echo '#line 14919 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15693,11 +15694,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15696: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15700: \$? = $ac_status" >&5
+ echo "$as_me:15701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15961,11 +15962,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15964: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15968: \$? = $ac_status" >&5
+ echo "$as_me:15969: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16065,11 +16066,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16068: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16072: \$? = $ac_status" >&5
+ echo "$as_me:16073: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17534,7 +17535,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17537 "configure"' > conftest.$ac_ext
+ echo '#line 17538 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22888,6 +22889,34 @@
fi;
+if test -z "$enable_tests" ; then
+ enable_tests=yes # default is on - --disable-tests to disable
+fi
+echo "$as_me:$LINENO: checking for --enable-tests" >&5
+echo $ECHO_N "checking for --enable-tests... $ECHO_C" >&6
+# Check whether --enable-tests or --disable-tests was given.
+if test "${enable_tests+set}" = set; then
+ enableval="$enable_tests"
+
+fi;
+if test "$enable_tests" = "yes" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test "$enable_tests" = "yes"; then
+ enable_tests_TRUE=
+ enable_tests_FALSE='#'
+else
+ enable_tests_TRUE='#'
+ enable_tests_FALSE=
+fi
+
+
# BEGIN COPYRIGHT BLOCK
@@ -23465,6 +23494,7 @@
{ (exit 1); exit 1; }; }
fi
+if test "$enable_tests" = "yes" ; then
# -*- tab-width: 4; -*-
# Configure paths for SASL
# Public domain - Nathan Kinder <nkinder(a)redhat.com> 2006-06-26
@@ -23590,6 +23620,7 @@
fi
fi
+fi
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -23776,6 +23807,12 @@
fi
fi
+if test ! -f "$icu_bin/genrb" ; then
+ { { echo "$as_me:$LINENO: error: genrb not found in $icu_bin - please specify ICU bin directory" >&5
+echo "$as_me: error: genrb not found in $icu_bin - please specify ICU bin directory" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -24020,6 +24057,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${enable_tests_TRUE}" && test -z "${enable_tests_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"enable_tests\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"enable_tests\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -24626,6 +24670,8 @@
s,@LIBOBJS@,$LIBOBJS,;t t
s,@platform_defs@,$platform_defs,;t t
s,@debug_defs@,$debug_defs,;t t
+s,@enable_tests_TRUE@,$enable_tests_TRUE,;t t
+s,@enable_tests_FALSE@,$enable_tests_FALSE,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@ICU_CONFIG@,$ICU_CONFIG,;t t
s,@nspr_inc@,$nspr_inc,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.ac 8 May 2007 19:25:45 -0000 1.3
+++ configure.ac 25 May 2007 22:55:54 -0000 1.4
@@ -71,7 +71,8 @@
AC_SUBST([platform_defs])
AC_MSG_CHECKING(for --enable-debug)
-AC_ARG_ENABLE(debug, [ --enable-debug Enable debug features],
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug], [Enable debug features]),
[
AC_MSG_RESULT(yes)
debug_defs="-DLDAP_DEBUG"
@@ -82,12 +83,27 @@
])
AC_SUBST([debug_defs])
+if test -z "$enable_tests" ; then
+ enable_tests=yes # default is on - --disable-tests to disable
+fi
+AC_MSG_CHECKING(for --enable-tests)
+AC_ARG_ENABLE(tests,
+ AS_HELP_STRING([--enable-tests], [Enable tests to be built (default: yes)]))
+if test "$enable_tests" = "yes" ; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(enable_tests,test "$enable_tests" = "yes")
+
AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
m4_include(m4/nspr.m4)
m4_include(m4/nss.m4)
m4_include(m4/mozldap.m4)
+if test "$enable_tests" = "yes" ; then
m4_include(m4/sasl.m4)
+fi
m4_include(m4/icu.m4)
m4_include(m4/fhs.m4)
16 years, 6 months
[Fedora-directory-commits] adminutil/lib/libadminutil acclanglist.c, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8401/adminutil/lib/libadminutil
Modified Files:
acclanglist.c
Log Message:
Resolves: bug 235293
Bug Description: Review Request: adminutil - Utility library for Fedora Directory Server administration
Fix Description:
1) Use macros consistently in the spec file
2) Use install -p to ensure header file timestamps are preserved
3) Fixed acclanglist.c to use LGPL
4) Link admsslutil against adminutil to resolve undefined symbols
5) Check for genrb in icu.m4
Index: acclanglist.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/acclanglist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acclanglist.c 4 Apr 2007 19:37:36 -0000 1.1
+++ acclanglist.c 25 May 2007 22:55:55 -0000 1.2
@@ -1,39 +1,21 @@
/** 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) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version
+ * 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* END COPYRIGHT BLOCK **/
#include <stdio.h>
16 years, 6 months
[Fedora-directory-commits] adminutil adminutil.spec,1.4,1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7641
Modified Files:
adminutil.spec
Log Message:
final spec fix for fedora
Index: adminutil.spec
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- adminutil.spec 21 May 2007 15:03:44 -0000 1.4
+++ adminutil.spec 23 May 2007 13:56:01 -0000 1.5
@@ -12,15 +12,12 @@
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: pkgconfig
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version}
BuildRequires: svrcore-devel >= %{svrcore_version}
BuildRequires: mozldap-devel >= %{mozldap_version}
BuildRequires: libicu-devel >= %{icu_version}
BuildRequires: icu >= %{icu_version}
-# cyrus-sasl-devel is required because mozldap uses it
-BuildRequires: cyrus-sasl-devel
Source0: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
@@ -41,13 +38,13 @@
Summary: Development and header files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version}
BuildRequires: svrcore-devel >= %{svrcore_version}
BuildRequires: mozldap-devel >= %{mozldap_version}
BuildRequires: libicu-devel >= %{icu_version}
BuildRequires: icu >= %{icu_version}
-BuildRequires: pkgconfig
%description devel
Development files and header files necessary to build applications
16 years, 6 months
[Fedora-directory-commits] adminserver/m4 httpd.m4, 1.2, 1.3 mod_nss.m4, 1.1, 1.2 nss.m4, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539/adminserver/m4
Modified Files:
httpd.m4 mod_nss.m4 nss.m4
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Fixes for RHEL5 and Apache 2.2 - the existing code for handling Apache 2.2 did not work, including cgisock code in httpd.conf
2) better support for mod_nss detection - look in several places for pcache and module
3) admin server post install will mkdirs that it uses if they do not already exist, and set permissions appropriately
4) use --variable=libdir with nss pkg-config to get the libdir - --libs-only-L returns nothing if the library is already in the system libdir - we need the actual libdir in every case because we have to use it in the ld_preload in the startup script
Index: httpd.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/httpd.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd.m4 11 May 2007 19:44:07 -0000 1.2
+++ httpd.m4 21 May 2007 15:52:27 -0000 1.3
@@ -43,7 +43,7 @@
httpdconf=${httpd_root}/${httpd_conf_rel}
mimemagic=`grep MIMEMagicFile $httpdconf|grep -v \^# | awk '{print $2}'`
-if [ ! -f "$mimemagic" ] ; then
+if test ! -f "$mimemagic" ; then
# assume relative to root
mimemagic=${httpd_root}/${mimemagic}
fi
Index: mod_nss.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/mod_nss.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_nss.m4 11 May 2007 19:44:07 -0000 1.1
+++ mod_nss.m4 21 May 2007 15:52:27 -0000 1.2
@@ -81,9 +81,38 @@
# else, punt
if test -z "$modnssbindir" ; then
- modnssbindir='$(sbindir)'
+ nsspcache=`grep NSSPassPhraseHelper $httpdconf|awk '{print $2}'`
+ if test -z "$nsspcache" ; then
+ nsspcache=`grep NSSPassPhraseHelper $httpd_root/conf.d/* | awk '{print $2}'`
+ fi
+ if test -z "$nsspcache" ; then
+ # same directory as Apache?
+ modnssbindir=`dirname $HTTPD`
+ nsspcache="$modnssbindir/nss_pcache"
+ fi
+ if test -z "$nsspcache" -o ! -f "$nsspcache" ; then
+ AC_PATH_PROG([nsspcache], [nss_pcache], [],
+ [$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin])
+ fi
+ if test -n "$nsspcache" -a -f "$nsspcache" ; then
+ modnssbindir=`dirname $nsspcache`
+ else
+ modnssbindir=
+ fi
fi
if test -z "$nssmoddir" ; then
nssmoddir="$moddir"
fi
+
+if test ! -f "$modnssbindir/nss_pcache" ; then
+ AC_MSG_ERROR([Could not find the mod_nss pass phrase helper $modnssbindir/nss_pcache])
+else
+ AC_MSG_RESULT([Using mod_nss pass phrase helper $modnssbindir/nss_pcache])
+fi
+
+if test ! -d "$nssmoddir" ; then
+ AC_MSG_ERROR([Could not find the mod_nss module directory $nssmoddir])
+else
+ AC_MSG_RESULT([Using mod_nss module directory $nssmoddir])
+fi
Index: nss.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/nss.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss.m4 9 May 2007 00:26:38 -0000 1.1
+++ nss.m4 21 May 2007 15:52:27 -0000 1.2
@@ -79,12 +79,12 @@
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
- nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ .*$//`
+ nss_libdir=`$PKG_CONFIG --variable=libdir nss`
AC_MSG_RESULT([using system NSS])
elif $PKG_CONFIG --exists dirsec-nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
- nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ .*$//`
+ nss_libdir=`$PKG_CONFIG --variable=libdir dirsec-nss`
AC_MSG_RESULT([using system dirsec NSS])
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
16 years, 6 months
[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.27, 1.28
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539/adminserver/admserv/newinst/src
Modified Files:
ux-update.cc
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Fixes for RHEL5 and Apache 2.2 - the existing code for handling Apache 2.2 did not work, including cgisock code in httpd.conf
2) better support for mod_nss detection - look in several places for pcache and module
3) admin server post install will mkdirs that it uses if they do not already exist, and set permissions appropriately
4) use --variable=libdir with nss pkg-config to get the libdir - --libs-only-L returns nothing if the library is already in the system libdir - we need the actual libdir in every case because we have to use it in the ld_preload in the startup script
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ux-update.cc 15 May 2007 22:59:13 -0000 1.27
+++ ux-update.cc 21 May 2007 15:52:26 -0000 1.28
@@ -70,6 +70,7 @@
const char *CHOWN_CMD = "chown -R %s %s >/dev/null 2>&1";
const char *CHGRP_CMD = "chgrp -R %s %s >/dev/null 2>&1";
+const char *MKDIR_CMD = "mkdir -p %s > /dev/null 2>&1";
const char *DEFAULT_ADMIN_CONFIG_ACI = "(targetattr=*)(version 3.0; acl \"Enable delegated admin to access configuration\"; allow (read,search) groupdn=\"ldap:///%s\";)";
@@ -274,7 +275,7 @@
if (ret)
{
- printf("Can't start Admin server [%s] (error: %s)", startProgram, system_errmsg());
+ printf("Can't start Admin server [%s] (error: %s)\n", startProgram, system_errmsg());
installLog->logMessage(WARN, "Admin", "Can't start Admin server [%s] (error: %s)", startProgram, system_errmsg());
}
else
@@ -294,6 +295,42 @@
}
}
+/* like mkdir -p and chmod */
+void
+admin_mkdir(const char *path, int mode)
+{
+ struct stat fi;
+ int rc = stat(path, &fi);
+ int err = errno;
+ char tmp[BIG_BUF];
+
+ if (!rc && S_ISDIR(fi.st_mode)) {
+ /* already exists */
+ return;
+ }
+ if (!rc && !S_ISDIR(fi.st_mode)) {
+ installLog->logMessage(FATAL, "Admin", "Can't create directory [%s]: that path already exists but is not a directory",
+ path);
+ exit(1);
+ }
+ if (rc && (err != ENOENT)) {
+ installLog->logMessage(FATAL, "Admin", "Can't create directory [%s]: [%d:%s]",
+ path, err, system_errmsg());
+ exit(1);
+ }
+
+ sprintf(tmp, MKDIR_CMD, path);
+ if (system(tmp)) {
+ err = errno;
+ installLog->logMessage(FATAL, "Admin", "Can't create directory [%s]: [%d:%s]",
+ path, err, system_errmsg());
+ exit(1);
+ }
+ chmod(path, mode);
+
+ return;
+}
+
void
admin_chown(const char *path, uid_t tuid, const char *tuser, gid_t tgid, const char *tgrp)
{
@@ -523,11 +560,6 @@
installLog->logMessage(INFO, "Admin", "Writing configuration data to %s", configdir);
}
- if ((mkdir(dir, 0700) == -1) && (errno != EEXIST))
- {
- fatal_error("Can't create directory %s (error: %s)", dir, system_errmsg());
- }
-
/*
* Write new admpw.
*/
@@ -547,6 +579,9 @@
hexp = make_shexp(hosts);
aexp = make_shexp(addrs);
+ admin_mkdir(configdir, S_IRUSR | S_IWUSR | S_IXUSR);
+ admin_mkdir(securitydir, S_IRUSR | S_IWUSR | S_IXUSR);
+ admin_mkdir(logdir, S_IRUSR | S_IWUSR | S_IXUSR);
if (!geteuid())
{
/* Current pw ent, target pw ent */
16 years, 6 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff httpd-2.2.conf.in, 1.4, 1.5 httpd.conf.in, 1.4, 1.5 start-ds-admin.in, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539/adminserver/admserv/cfgstuff
Modified Files:
httpd-2.2.conf.in httpd.conf.in start-ds-admin.in
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Fixes for RHEL5 and Apache 2.2 - the existing code for handling Apache 2.2 did not work, including cgisock code in httpd.conf
2) better support for mod_nss detection - look in several places for pcache and module
3) admin server post install will mkdirs that it uses if they do not already exist, and set permissions appropriately
4) use --variable=libdir with nss pkg-config to get the libdir - --libs-only-L returns nothing if the library is already in the system libdir - we need the actual libdir in every case because we have to use it in the ld_preload in the startup script
Index: httpd-2.2.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd-2.2.conf.in 15 May 2007 16:45:44 -0000 1.4
+++ httpd-2.2.conf.in 21 May 2007 15:52:26 -0000 1.5
@@ -395,9 +395,8 @@
Scriptsock @piddir(a)/admin-serv.cgisock
</IfModule>
-<IfModule mod_restartd.c>
+# and this one is for mod_restartd because mod_cgid will consume the other one
Scriptsock @piddir(a)/admin-serv.cgisock
-</IfModule>
#
# Redirect allows you to tell clients about documents which used to exist in
Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.conf.in 15 May 2007 16:45:44 -0000 1.4
+++ httpd.conf.in 21 May 2007 15:52:26 -0000 1.5
@@ -394,9 +394,8 @@
Scriptsock @piddir(a)/admin-serv.cgisock
</IfModule>
-<IfModule mod_restartd.c>
+# and this one is for mod_restartd because mod_cgid will consume the other one
Scriptsock @piddir(a)/admin-serv.cgisock
-</IfModule>
#
# Redirect allows you to tell clients about documents which used to exist in
Index: start-ds-admin.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- start-ds-admin.in 11 May 2007 17:26:11 -0000 1.1
+++ start-ds-admin.in 21 May 2007 15:52:26 -0000 1.2
@@ -41,7 +41,12 @@
/usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1
if [ $hasol -eq 1 ] ; then
- LD_PRELOAD="@nss_libdir(a)/libssl3.so @ldapsdk_libdir(a)/libldap60.so"
+ nss_libdir="@nss_libdir@"
+ if [ -n "$nss_libdir" ] ; then
+ LD_PRELOAD="$nss_libdir/libssl3.so @ldapsdk_libdir(a)/libldap60.so"
+ else
+ LD_PRELOAD="@ldapsdk_libdir(a)/libldap60.so"
+ fi
export LD_PRELOAD
fi
fi
16 years, 6 months
[Fedora-directory-commits] adminserver Makefile.am, 1.5, 1.6 configure.ac, 1.3, 1.4 aclocal.m4, 1.3, 1.4 configure, 1.4, 1.5 missing, 1.2, 1.3 install-sh, 1.2, 1.3 depcomp, 1.2, 1.3 compile, 1.2, 1.3 Makefile.in, 1.5, 1.6 config.sub, 1.2, 1.3 config.guess, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18539/adminserver
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
Log Message:
Resolves: bug 239502
Description: adminserver: autotools, FHS, and many bug fixes
Fix Description: 1) Fixes for RHEL5 and Apache 2.2 - the existing code for handling Apache 2.2 did not work, including cgisock code in httpd.conf
2) better support for mod_nss detection - look in several places for pcache and module
3) admin server post install will mkdirs that it uses if they do not already exist, and set permissions appropriately
4) use --variable=libdir with nss pkg-config to get the libdir - --libs-only-L returns nothing if the library is already in the system libdir - we need the actual libdir in every case because we have to use it in the ld_preload in the startup script
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 15 May 2007 22:59:13 -0000 1.5
+++ Makefile.am 21 May 2007 15:52:25 -0000 1.6
@@ -305,9 +305,11 @@
-e 's,@vendor\@,$(vendor),g' \
-e 's,@mimemagic\@,$(mimemagic),g'
-% : %.in
+# because the source may be either httpd.conf.in or httpd-2.2.conf.in
+admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(fixupcmd) $< > $@
-# because the source may be either httpd.conf.in or httpd-2.2.conf.in
-admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
+% : %.in
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(fixupcmd) $< > $@
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.ac 15 May 2007 00:30:48 -0000 1.3
+++ configure.ac 21 May 2007 15:52:25 -0000 1.4
@@ -199,7 +199,7 @@
# WINNT should be true if building on Windows system not using
# cygnus, mingw, or the like and using cmd.exe as the shell
AM_CONDITIONAL([WINNT], false)
-AM_CONDITIONAL([APACHE22], $APACHE22)
+AM_CONDITIONAL([APACHE22], test $APACHE22)
AC_CONFIG_FILES([Makefile])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure 15 May 2007 22:59:13 -0000 1.4
+++ configure 21 May 2007 15:52:25 -0000 1.5
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/$PACKAGE_BASE_NAME
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HTTPD APXS PKG_CONFIG ICU_CONFIG instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23420,7 +23420,7 @@
httpdconf=${httpd_root}/${httpd_conf_rel}
mimemagic=`grep MIMEMagicFile $httpdconf|grep -v \^# | awk '{print $2}'`
-if ! -f "$mimemagic" ; then
+if test ! -f "$mimemagic" ; then
# assume relative to root
mimemagic=${httpd_root}/${mimemagic}
fi
@@ -23794,13 +23794,13 @@
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
- nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ .*$//`
+ nss_libdir=`$PKG_CONFIG --variable=libdir nss`
echo "$as_me:$LINENO: result: using system NSS" >&5
echo "${ECHO_T}using system NSS" >&6
elif $PKG_CONFIG --exists dirsec-nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
- nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ .*$//`
+ nss_libdir=`$PKG_CONFIG --variable=libdir dirsec-nss`
echo "$as_me:$LINENO: result: using system dirsec NSS" >&5
echo "${ECHO_T}using system dirsec NSS" >&6
else
@@ -24600,13 +24600,86 @@
# else, punt
if test -z "$modnssbindir" ; then
- modnssbindir='$(sbindir)'
+ nsspcache=`grep NSSPassPhraseHelper $httpdconf|awk '{print $2}'`
+ if test -z "$nsspcache" ; then
+ nsspcache=`grep NSSPassPhraseHelper $httpd_root/conf.d/* | awk '{print $2}'`
+ fi
+ if test -z "$nsspcache" ; then
+ # same directory as Apache?
+ modnssbindir=`dirname $HTTPD`
+ nsspcache="$modnssbindir/nss_pcache"
+ fi
+ if test -z "$nsspcache" -o ! -f "$nsspcache" ; then
+ # Extract the first word of "nss_pcache", so it can be a program name with args.
+set dummy nss_pcache; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_nsspcache+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $nsspcache in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_nsspcache="$nsspcache" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/opt/hpws/apache/bin:/usr/local/apache/sbin:/usr/local/apache2/sbin:/usr/sbin"
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_nsspcache="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+nsspcache=$ac_cv_path_nsspcache
+
+if test -n "$nsspcache"; then
+ echo "$as_me:$LINENO: result: $nsspcache" >&5
+echo "${ECHO_T}$nsspcache" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ fi
+ if test -n "$nsspcache" -a -f "$nsspcache" ; then
+ modnssbindir=`dirname $nsspcache`
+ else
+ modnssbindir=
+ fi
fi
if test -z "$nssmoddir" ; then
nssmoddir="$moddir"
fi
+if test ! -f "$modnssbindir/nss_pcache" ; then
+ { { echo "$as_me:$LINENO: error: Could not find the mod_nss pass phrase helper $modnssbindir/nss_pcache" >&5
+echo "$as_me: error: Could not find the mod_nss pass phrase helper $modnssbindir/nss_pcache" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ echo "$as_me:$LINENO: result: Using mod_nss pass phrase helper $modnssbindir/nss_pcache" >&5
+echo "${ECHO_T}Using mod_nss pass phrase helper $modnssbindir/nss_pcache" >&6
+fi
+
+if test ! -d "$nssmoddir" ; then
+ { { echo "$as_me:$LINENO: error: Could not find the mod_nss module directory $nssmoddir" >&5
+echo "$as_me: error: Could not find the mod_nss module directory $nssmoddir" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ echo "$as_me:$LINENO: result: Using mod_nss module directory $nssmoddir" >&5
+echo "${ECHO_T}Using mod_nss module directory $nssmoddir" >&6
+fi
+
# server userid, groupid
httpduser=nobody
@@ -24731,7 +24804,7 @@
-if $APACHE22; then
+if test $APACHE22; then
APACHE22_TRUE=
APACHE22_FALSE='#'
else
@@ -25536,6 +25609,7 @@
s,@APXS@,$APXS,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@ICU_CONFIG@,$ICU_CONFIG,;t t
+s,@nsspcache@,$nsspcache,;t t
s,@instconfigdir@,$instconfigdir,;t t
s,@PACKAGE_BASE_NAME@,$PACKAGE_BASE_NAME,;t t
s,@nspr_inc@,$nspr_inc,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 15 May 2007 22:59:13 -0000 1.5
+++ Makefile.in 21 May 2007 15:52:25 -0000 1.6
@@ -398,6 +398,7 @@
nss_lib = @nss_lib@
nss_libdir = @nss_libdir@
nssmoddir = @nssmoddir@
+nsspcache = @nsspcache@
oldincludedir = @oldincludedir@
piddir = $(localstatedir)@piddir@
pidfile = @pidfile@
@@ -1846,12 +1847,14 @@
%_de.res : %_de.properties
$(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+
-% : %.in
+# because the source may be either httpd.conf.in or httpd-2.2.conf.in
+admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(fixupcmd) $< > $@
-# because the source may be either httpd.conf.in or httpd-2.2.conf.in
-admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
+% : %.in
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(fixupcmd) $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
16 years, 6 months
[Fedora-directory-commits] adminutil adminutil.spec, 1.3, 1.4 ltmain.sh, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736
Modified Files:
adminutil.spec ltmain.sh
Log Message:
pkgconfig is a requires, not a build requires
Index: adminutil.spec
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- adminutil.spec 17 May 2007 19:25:12 -0000 1.3
+++ adminutil.spec 21 May 2007 15:03:44 -0000 1.4
@@ -7,11 +7,12 @@
Summary: Utility library for directory server administration
Name: adminutil
Version: 1.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPL
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: pkgconfig
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version}
BuildRequires: svrcore-devel >= %{svrcore_version}
@@ -20,7 +21,6 @@
BuildRequires: icu >= %{icu_version}
# cyrus-sasl-devel is required because mozldap uses it
BuildRequires: cyrus-sasl-devel
-BuildRequires: pkgconfig
Source0: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
@@ -88,6 +88,9 @@
%{_includedir}/libadmsslutil
%changelog
+* Fri May 18 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-2
+- pkgconfig is a requires not a build requires
+
* Thu May 17 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-1
- Many bug fixes - bumped version to 1.1.1
- fixed concerns from Fedora package review
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/adminutil/ltmain.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ltmain.sh 8 May 2007 19:25:45 -0000 1.3
+++ ltmain.sh 21 May 2007 15:03:44 -0000 1.4
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
16 years, 6 months