[Fedora-directory-commits] ldapserver/ldap/servers/slapd fe.h, 1.6, 1.7 slap.h, 1.23, 1.24 main.c, 1.18, 1.19 daemon.c, 1.13, 1.14
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26550
Modified Files:
fe.h slap.h main.c daemon.c
Log Message:
Resolves: #250702
Summary: not all the addresses associated with listenhost are bound to listen sockets (comment #10)
Index: fe.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fe.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fe.h 27 Feb 2007 02:57:30 -0000 1.6
+++ fe.h 3 Aug 2007 22:14:41 -0000 1.7
@@ -134,6 +134,16 @@
/* An array of connections, file descriptors, and a mapping between them. */
Connection *c;
struct POLL_STRUCT *fd;
+ int n_tcps; /* standard socket start index in fd */
+ int n_tcpe; /* standard socket last ( +1 ) index in fd */
+ int s_tcps; /* ssl socket start index in fd */
+ int s_tcpe; /* ssl socket last ( +1 ) in fd */
+#ifndef XP_WIN32
+#if defined(ENABLE_LDAPI)
+ int i_unixs; /* unix socket start index in fd */
+ int i_unixe; /* unix socket last ( +1 ) in fd */
+#endif /* ENABLE_LDAPI */
+#endif
PRLock *table_mutex;
};
typedef struct connection_table Connection_Table;
@@ -166,7 +176,7 @@
int daemon_pre_setuid_init(daemon_ports_t *ports);
void slapd_daemon( daemon_ports_t *ports );
void daemon_register_connection();
-int slapd_listenhost2addr( const char *listenhost, PRNetAddr *addr );
+int slapd_listenhost2addr( const char *listenhost, PRNetAddr ***addr );
int daemon_register_reslimits( void );
int secure_read_function( int ignore , void *buffer, int count, struct lextiof_socket_private *handle );
int secure_write_function( int ignore, const void *buffer, int count, struct lextiof_socket_private *handle );
Index: slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- slap.h 11 Jul 2007 01:14:05 -0000 1.23
+++ slap.h 3 Aug 2007 22:14:41 -0000 1.24
@@ -1456,20 +1456,21 @@
typedef struct daemon_ports_s {
int n_port;
int s_port;
- PRNetAddr n_listenaddr;
- PRNetAddr s_listenaddr;
+ PRNetAddr **n_listenaddr;
+ PRNetAddr **s_listenaddr;
#if defined( XP_WIN32 )
int n_socket;
int s_socket_native;
#else
- PRFileDesc *n_socket;
+ PRFileDesc **n_socket;
+#if defined(ENABLE_LDAPI)
/* ldapi */
- PRNetAddr i_listenaddr;
+ PRNetAddr **i_listenaddr;
int i_port; /* used as a flag only */
- PRFileDesc *i_socket;
-
+ PRFileDesc **i_socket;
+#endif
#endif
- PRFileDesc *s_socket;
+ PRFileDesc **s_socket;
} daemon_ports_t;
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- main.c 27 Feb 2007 02:57:30 -0000 1.18
+++ main.c 3 Aug 2007 22:14:41 -0000 1.19
@@ -846,13 +846,15 @@
(slapd_exemode == SLAPD_EXEMODE_REFERRAL)) {
ports_info.n_port = (unsigned short)n_port;
if ( slapd_listenhost2addr( config_get_listenhost(),
- &ports_info.n_listenaddr ) != 0 ) {
+ &ports_info.n_listenaddr ) != 0 ||
+ ports_info.n_listenaddr == NULL ) {
return(1);
}
ports_info.s_port = (unsigned short)s_port;
if ( slapd_listenhost2addr( config_get_securelistenhost(),
- &ports_info.s_listenaddr ) != 0 ) {
+ &ports_info.s_listenaddr ) != 0 ||
+ ports_info.s_listenaddr == NULL ) {
return(1);
}
@@ -861,11 +863,13 @@
config_get_ldapi_filename() != 0)
{
i_port = ports_info.i_port = 1; /* flag ldapi as on */
- ports_info.i_listenaddr.local.family = PR_AF_LOCAL;
- PL_strncpyz(ports_info.i_listenaddr.local.path,
+ ports_info.i_listenaddr = (PRNetAddr **)slapi_ch_calloc(2, sizeof(PRNetAddr *));
+ *ports_info.i_listenaddr = (PRNetAddr *)slapi_ch_calloc(1, sizeof(PRNetAddr));
+ (*ports_info.i_listenaddr)->local.family = PR_AF_LOCAL;
+ PL_strncpyz((*ports_info.i_listenaddr)->local.path,
config_get_ldapi_filename(),
- sizeof(ports_info.i_listenaddr.local.path));
- unlink(ports_info.i_listenaddr.local.path);
+ sizeof((*ports_info.i_listenaddr)->local.path));
+ unlink((*ports_info.i_listenaddr)->local.path);
}
#endif /* ENABLE_LDAPI */
@@ -919,10 +923,15 @@
if ((slapd_exemode == SLAPD_EXEMODE_SLAPD) ||
(slapd_exemode == SLAPD_EXEMODE_REFERRAL)) {
- if ( init_ssl && ( 0 != slapd_ssl_init2(&ports_info.s_socket, 0) ) ) {
- LDAPDebug(LDAP_DEBUG_ANY,
+ if ( init_ssl ) {
+ PRFileDesc **sock;
+ for (sock = ports_info.s_socket; sock && *sock; sock++) {
+ if ( 0 != slapd_ssl_init2(sock, 0) ) {
+ LDAPDebug(LDAP_DEBUG_ANY,
"ERROR: SSL Initialization phase 2 Failed.\n", 0, 0, 0 );
- exit( 1 );
+ exit( 1 );
+ }
+ }
}
}
Index: daemon.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- daemon.c 7 Mar 2007 01:53:36 -0000 1.13
+++ daemon.c 3 Aug 2007 22:14:41 -0000 1.14
@@ -127,9 +127,6 @@
static int readsignalpipe = SLAPD_INVALID_SOCKET;
#define FDS_SIGNAL_PIPE 0
-#define FDS_N_TCPS 1
-#define FDS_S_TCPS 2
-#define FDS_I_UNIX 3
static int get_configured_connection_table_size();
#ifdef RESOLVER_NEEDS_LOW_FILE_DESCRIPTORS
@@ -139,12 +136,12 @@
#ifdef XP_WIN32
static int createlistensocket(unsigned short port, const PRNetAddr *listenaddr);
#endif
-static PRFileDesc *createprlistensocket(unsigned short port,
- const PRNetAddr *listenaddr, int secure, int local);
+static PRFileDesc **createprlistensockets(unsigned short port,
+ PRNetAddr **listenaddr, int secure, int local);
static const char *netaddr2string(const PRNetAddr *addr, char *addrbuf,
size_t addrbuflen);
static void set_shutdown (int);
-static void setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix, PRIntn *num_to_read);
+static void setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps, PRFileDesc **i_unix, PRIntn *num_to_read);
#ifdef HPUX10
static void* catch_signals();
@@ -373,7 +370,7 @@
#ifdef _WIN32
static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, int n_tcps, PRFileDesc *s_tcps);
#else
-static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix);
+static void unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc **n_tcps, PRFileDesc **s_tcps, PRFileDesc **i_unix);
#endif
static int write_pid_file();
static int init_shutdown_detect();
@@ -396,14 +393,14 @@
ports->n_socket = createlistensocket((unsigned short)ports->n_port,
&ports->n_listenaddr);
#else
- ports->n_socket = createprlistensocket(ports->n_port,
- &ports->n_listenaddr, 0, 0);
+ ports->n_socket = createprlistensockets(ports->n_port,
+ ports->n_listenaddr, 0, 0);
#endif
}
if ( config_get_security() && (0 != ports->s_port) ) {
- ports->s_socket = createprlistensocket((unsigned short)ports->s_port,
- &ports->s_listenaddr, 1, 0);
+ ports->s_socket = createprlistensockets((unsigned short)ports->s_port,
+ ports->s_listenaddr, 1, 0);
#ifdef XP_WIN32
ports->s_socket_native = PR_FileDesc2NativeHandle(ports->s_socket);
#endif
@@ -418,7 +415,7 @@
#if defined(ENABLE_LDAPI)
/* ldapi */
if(0 != ports->i_port) {
- ports->i_socket = createprlistensocket(1, &ports->i_listenaddr, 0, 1);
+ ports->i_socket = createprlistensockets(1, ports->i_listenaddr, 0, 1);
}
#endif /* ENABLE_LDAPI */
#endif
@@ -486,12 +483,14 @@
#if defined( XP_WIN32 )
int n_tcps = 0;
int s_tcps_native = 0;
+ PRFileDesc *s_tcps = NULL;
#else
- PRFileDesc *n_tcps = NULL;
PRFileDesc *tcps = 0;
- PRFileDesc *i_unix = 0;
+ PRFileDesc **n_tcps = NULL;
+ PRFileDesc **s_tcps = NULL;
+ PRFileDesc **i_unix = NULL;
+ PRFileDesc **fdesp = NULL;
#endif
- PRFileDesc *s_tcps = NULL;
PRIntn num_poll = 0;
PRIntervalTime pr_timeout = PR_MillisecondsToInterval(slapd_wakeup_timer);
PRThread *time_thread_p;
@@ -576,44 +575,59 @@
g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
}
#else
- if ( n_tcps != NULL
- && PR_Listen( n_tcps, DAEMON_LISTEN_SIZE ) == PR_FAILURE) {
- PRErrorCode prerr = PR_GetError();
- char addrbuf[ 256 ];
-
- slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
- "PR_Listen() on %s port %d failed: %s error %d (%s)\n",
- netaddr2string(&ports->n_listenaddr, addrbuf, sizeof(addrbuf)),
- ports->n_port, SLAPI_COMPONENT_NAME_NSPR, prerr,
- slapd_pr_strerror( prerr ));
- g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+ if ( n_tcps != NULL ) {
+ PRFileDesc **fdesp;
+ PRNetAddr **nap = ports->n_listenaddr;
+ for (fdesp = n_tcps; fdesp && *fdesp; fdesp++, nap++) {
+ if ( PR_Listen( *fdesp, DAEMON_LISTEN_SIZE ) == PR_FAILURE ) {
+ PRErrorCode prerr = PR_GetError();
+ char addrbuf[ 256 ];
+
+ slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
+ "PR_Listen() on %s port %d failed: %s error %d (%s)\n",
+ netaddr2string(*nap, addrbuf, sizeof(addrbuf)),
+ ports->n_port, SLAPI_COMPONENT_NAME_NSPR, prerr,
+ slapd_pr_strerror( prerr ));
+ g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+ }
+ }
}
#endif
- if ( s_tcps != NULL
- && PR_Listen( s_tcps, DAEMON_LISTEN_SIZE ) == PR_FAILURE ) {
- PRErrorCode prerr = PR_GetError();
- char addrbuf[ 256 ];
-
- slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
- "PR_Listen() on %s port %d failed: %s error %d (%s)\n",
- netaddr2string(&ports->s_listenaddr, addrbuf, sizeof(addrbuf)),
- ports->s_port, SLAPI_COMPONENT_NAME_NSPR, prerr,
- slapd_pr_strerror( prerr ));
- g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+ if ( s_tcps != NULL ) {
+ PRFileDesc **fdesp;
+ PRNetAddr **sap = ports->s_listenaddr;
+ for (fdesp = s_tcps; fdesp && *fdesp; fdesp++, sap++) {
+ if ( PR_Listen( *fdesp, DAEMON_LISTEN_SIZE ) == PR_FAILURE ) {
+ PRErrorCode prerr = PR_GetError();
+ char addrbuf[ 256 ];
+
+ slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
+ "PR_Listen() on %s port %d failed: %s error %d (%s)\n",
+ netaddr2string(*sap, addrbuf, sizeof(addrbuf)),
+ ports->s_port, SLAPI_COMPONENT_NAME_NSPR, prerr,
+ slapd_pr_strerror( prerr ));
+ g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+ }
+ }
}
#if !defined( XP_WIN32 )
#if defined(ENABLE_LDAPI)
- if( i_unix != NULL &&
- PR_Listen(i_unix, DAEMON_LISTEN_SIZE) == PR_FAILURE) {
- PRErrorCode prerr = PR_GetError();
- slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
- "listen() on %s failed: error %d (%s)\n",
- ports->i_listenaddr.local.path,
- prerr,
- slapd_pr_strerror( prerr ));
- g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+ if( i_unix != NULL ) {
+ PRFileDesc **fdesp;
+ PRNetAddr **iap = ports->i_listenaddr;
+ for (fdesp = i_unix; fdesp && *fdesp; fdesp++, iap++) {
+ if ( PR_Listen(*fdesp, DAEMON_LISTEN_SIZE) == PR_FAILURE) {
+ PRErrorCode prerr = PR_GetError();
+ slapi_log_error(SLAPI_LOG_FATAL, "slapd_daemon",
+ "listen() on %s failed: error %d (%s)\n",
+ (*iap)->local.path,
+ prerr,
+ slapd_pr_strerror( prerr ));
+ g_set_shutdown( SLAPI_SHUTDOWN_EXIT );
+ }
+ }
}
#endif /* ENABLE_LDAPI */
#endif
@@ -632,6 +646,7 @@
int select_return = 0;
int secure = 0; /* is a new connection an SSL one ? */
int local = 0; /* is new connection an ldapi one? */
+ int i;
#ifndef _WIN32
PRErrorCode prerr;
@@ -680,21 +695,44 @@
clear_signal(&readfds);
#else
tcps = NULL;
- /* info for n_tcps is always in fd[FDS_N_TCPS] and info for s_tcps is always
- * in fd[FDS_S_TCPS] */
- if( n_tcps != NULL &&
- the_connection_table->fd[FDS_N_TCPS].out_flags & SLAPD_POLL_FLAGS ) {
- tcps = n_tcps;
- } else if ( s_tcps != NULL &&
- the_connection_table->fd[FDS_S_TCPS].out_flags & SLAPD_POLL_FLAGS ) {
- tcps = s_tcps;
- secure = 1;
+ /* info for n_tcps is always in fd[n_tcps ~ n_tcpe] */
+ if( NULL != n_tcps ) {
+ for (i = the_connection_table->n_tcps;
+ i < the_connection_table->n_tcpe; i++) {
+ if (the_connection_table->fd[i].out_flags &
+ SLAPD_POLL_FLAGS ) {
+ /* tcps = n_tcps[i - the_connection_table->n_tcps]; */
+ tcps = the_connection_table->fd[i].fd;
+ break;
+ }
+ }
+ }
+ /* info for s_tcps is always in fd[s_tcps ~ s_tcpe] */
+ if ( NULL == tcps && NULL != s_tcps ) {
+ for (i = the_connection_table->s_tcps;
+ i < the_connection_table->s_tcpe; i++) {
+ if (the_connection_table->fd[i].out_flags &
+ SLAPD_POLL_FLAGS ) {
+ /* tcps = s_tcps[i - the_connection_table->s_tcps]; */
+ tcps = the_connection_table->fd[i].fd;
+ secure = 1;
+ break;
+ }
+ }
}
#if defined(ENABLE_LDAPI)
- else if ( i_unix != 0 &&
- the_connection_table->fd[FDS_I_UNIX].out_flags & SLAPD_POLL_FLAGS ) {
- tcps = i_unix;
- local = 1;
+ /* info for i_unix is always in fd[i_unixs ~ i_unixe] */
+ if ( NULL == tcps && NULL != i_unix ) {
+ for (i = the_connection_table->i_unixs;
+ i < the_connection_table->i_unixe; i++) {
+ if (the_connection_table->fd[i].out_flags &
+ SLAPD_POLL_FLAGS ) {
+ /* tcps = i_unix[i - the_connection_table->i_unixs]; */
+ tcps = the_connection_table->fd[i].fd;
+ local = 1;
+ break;
+ }
+ }
}
#endif /* ENABLE_LDAPI */
@@ -723,20 +761,45 @@
if ( n_tcps != SLAPD_INVALID_SOCKET ) {
closesocket( n_tcps );
}
+ if ( s_tcps != NULL ) {
+ PR_Close( s_tcps );
+ }
#else
- if ( n_tcps != NULL ) {
- PR_Close( n_tcps );
+ for (fdesp = n_tcps; fdesp && *fdesp; fdesp++) {
+ PR_Close( *fdesp );
}
+ slapi_ch_free ((void**)&n_tcps);
- if ( i_unix != NULL ) {
- PR_Close( i_unix );
+ for (fdesp = i_unix; fdesp && *fdesp; fdesp++) {
+ PR_Close( *fdesp );
}
+ slapi_ch_free ((void**)&i_unix);
-#endif
+ for (fdesp = s_tcps; fdesp && *fdesp; fdesp++) {
+ PR_Close( *fdesp );
+ }
+ slapi_ch_free ((void**)&s_tcps);
- if ( s_tcps != NULL ) {
- PR_Close( s_tcps );
+ /* freeing NetAddrs */
+ {
+ PRNetAddr **nap;
+ for (nap = ports->n_listenaddr; nap && *nap; nap++) {
+ slapi_ch_free ((void**)nap);
+ }
+ slapi_ch_free ((void**)&ports->n_listenaddr);
+
+ for (nap = ports->s_listenaddr; nap && *nap; nap++) {
+ slapi_ch_free ((void**)nap);
+ }
+ slapi_ch_free ((void**)&ports->s_listenaddr);
+#if defined(ENABLE_LDAPI)
+ for (nap = ports->i_listenaddr; nap && *nap; nap++) {
+ slapi_ch_free ((void**)nap);
+ }
+ slapi_ch_free ((void**)&ports->i_listenaddr);
+#endif
}
+#endif
/* Might compete with housecleaning thread, but so far so good */
be_flushall();
@@ -988,8 +1051,9 @@
#endif /* _WIN32 */
static int first_time_setup_pr_read_pds = 1;
+static int listen_addr_count = 0;
static void
-setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix, PRIntn *num_to_read)
+setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps, PRFileDesc **i_unix, PRIntn *num_to_read)
{
Connection *c= NULL;
Connection *next= NULL;
@@ -1001,19 +1065,19 @@
int max_threads_per_conn = config_get_maxthreadsperconn();
accept_new_connections = ((ct->size - g_get_current_conn_count())
- > slapdFrontendConfig->reservedescriptors);
+ > slapdFrontendConfig->reservedescriptors);
if ( ! accept_new_connections ) {
if ( last_accept_new_connections ) {
LDAPDebug( LDAP_DEBUG_ANY, "Not listening for new "
- "connections - too many fds open\n", 0, 0, 0 );
+ "connections - too many fds open\n", 0, 0, 0 );
/* reinitialize n_tcps and s_tcps to the pds */
first_time_setup_pr_read_pds = 1;
}
} else {
if ( ! last_accept_new_connections &&
- last_accept_new_connections != -1 ) {
+ last_accept_new_connections != -1 ) {
LDAPDebug( LDAP_DEBUG_ANY, "Listening for new "
- "connections again\n", 0, 0, 0 );
+ "connections again\n", 0, 0, 0 );
/* reinitialize n_tcps and s_tcps to the pds */
first_time_setup_pr_read_pds = 1;
}
@@ -1021,91 +1085,116 @@
last_accept_new_connections = accept_new_connections;
- /* initialize the mapping from connection table entries to fds entries */
+ /* initialize the mapping from connection table entries to fds entries */
if (first_time_setup_pr_read_pds)
{
int i;
- for (i = 0; i < ct->size; i++)
- {
- ct->c[i].c_fdi = SLAPD_INVALID_SOCKET_INDEX;
- }
+ for (i = 0; i < ct->size; i++)
+ {
+ ct->c[i].c_fdi = SLAPD_INVALID_SOCKET_INDEX;
+ }
- /* The fds entry for n_tcps is always FDS_N_TCPS */
- if (n_tcps != NULL && accept_new_connections)
- {
- ct->fd[FDS_N_TCPS].fd = n_tcps;
- ct->fd[FDS_N_TCPS].in_flags = SLAPD_POLL_FLAGS;
- ct->fd[FDS_N_TCPS].out_flags = 0;
- LDAPDebug( LDAP_DEBUG_HOUSE,
- "listening for connections on %d\n", socketdesc, 0, 0 );
- } else {
- ct->fd[FDS_N_TCPS].fd = NULL;
- }
+ /* The fds entry for the signalpipe is always FDS_SIGNAL_PIPE (== 0) */
+ count = FDS_SIGNAL_PIPE;
+#if !defined(_WIN32)
+ ct->fd[count].fd = signalpipe[0];
+ ct->fd[count].in_flags = SLAPD_POLL_FLAGS;
+ ct->fd[count].out_flags = 0;
+#else
+ ct->fd[count].fd = NULL;
+#endif
+ count++;
+
+ /* The fds entry for n_tcps starts with n_tcps and less than n_tcpe */
+ ct->n_tcps = count;
+ if (n_tcps != NULL && accept_new_connections)
+ {
+ PRFileDesc **fdesc = NULL;
+ for (fdesc = n_tcps; fdesc && *fdesc; fdesc++, count++) {
+ ct->fd[count].fd = *fdesc;
+ ct->fd[count].in_flags = SLAPD_POLL_FLAGS;
+ ct->fd[count].out_flags = 0;
+ LDAPDebug( LDAP_DEBUG_HOUSE,
+ "listening for connections on %d\n", socketdesc, 0, 0 );
+ }
+ } else {
+ ct->fd[count].fd = NULL;
+ count++;
+ }
+ ct->n_tcpe = count;
+
+ ct->s_tcps = count;
+ /* The fds entry for s_tcps starts with s_tcps and less than s_tcpe */
+ if (s_tcps != NULL && accept_new_connections)
+ {
+ PRFileDesc **fdesc = NULL;
+ for (fdesc = s_tcps; fdesc && *fdesc; fdesc++, count++) {
+ ct->fd[count].fd = *fdesc;
+ ct->fd[count].in_flags = SLAPD_POLL_FLAGS;
+ ct->fd[count].out_flags = 0;
+ LDAPDebug( LDAP_DEBUG_HOUSE,
+ "listening for SSL connections on %d\n", socketdesc, 0, 0 );
+ }
+ } else {
+ ct->fd[count].fd = NULL;
+ count++;
+ }
+ ct->s_tcpe = count;
- /* The fds entry for s_tcps is always FDS_S_TCPS */
- if (s_tcps != NULL && accept_new_connections)
- {
- ct->fd[FDS_S_TCPS].fd = s_tcps;
- ct->fd[FDS_S_TCPS].in_flags = SLAPD_POLL_FLAGS;
- ct->fd[FDS_S_TCPS].out_flags = 0;
- LDAPDebug( LDAP_DEBUG_HOUSE,
- "listening for SSL connections on %d\n", socketdesc, 0, 0 );
- } else {
- ct->fd[FDS_S_TCPS].fd = NULL;
- }
#if !defined(_WIN32)
- /* The fds entry for i_unix is always FDS_I_UNIX */
- if (i_unix != NULL && accept_new_connections)
- {
- ct->fd[FDS_I_UNIX].fd = i_unix;
- ct->fd[FDS_I_UNIX].in_flags = SLAPD_POLL_FLAGS;
- ct->fd[FDS_I_UNIX].out_flags = 0;
- LDAPDebug( LDAP_DEBUG_HOUSE,
- "listening for LDAPI connections on %d\n", socketdesc, 0, 0 );
- } else {
- ct->fd[FDS_I_UNIX].fd = NULL;
- }
+#if defined(ENABLE_LDAPI)
+ ct->i_unixs = count;
+ /* The fds entry for i_unix starts with i_unixs and less than i_unixe */
+ if (i_unix != NULL && accept_new_connections)
+ {
+ PRFileDesc **fdesc = NULL;
+ for (fdesc = i_unix; fdesc && *fdesc; fdesc++, count++) {
+ ct->fd[count].fd = *fdesc;
+ ct->fd[count].in_flags = SLAPD_POLL_FLAGS;
+ ct->fd[count].out_flags = 0;
+ LDAPDebug( LDAP_DEBUG_HOUSE,
+ "listening for LDAPI connections on %d\n", socketdesc, 0, 0 );
+ }
+ } else {
+ ct->fd[count].fd = NULL;
+ count++;
+ }
+ ct->i_unixe = count;
+#endif
+#endif
- /* The fds entry for the signalpipe is always FDS_SIGNAL_PIPE */
- ct->fd[FDS_SIGNAL_PIPE].fd = signalpipe[0];
- ct->fd[FDS_SIGNAL_PIPE].in_flags = SLAPD_POLL_FLAGS;
- ct->fd[FDS_SIGNAL_PIPE].out_flags = 0;
-#else
- ct->fd[FDS_SIGNAL_PIPE].fd = NULL;
-#endif
- first_time_setup_pr_read_pds = 0;
- }
-
- /* count is the number of entries we've place in the fds array.
- * we always put n_tcps in slot FDS_N_TCPS, s_tcps in slot
- * FDS_S_TCPS and the signal pipe in slot FDS_SIGNAL_PIPE
- * and i_unix in FDS_I_UNIX
- * so we now set count to 4 */
- count = 4;
-
- /* Walk down the list of active connections to find
+ first_time_setup_pr_read_pds = 0;
+ listen_addr_count = count;
+ }
+
+ /* count is the number of entries we've place in the fds array.
+ * listen_addr_count is counted up when
+ * first_time_setup_pr_read_pds is TURE. */
+ count = listen_addr_count;
+
+ /* Walk down the list of active connections to find
* out which connections we should poll over. If a connection
* is no longer in use, we should remove it from the linked
* list. */
c = connection_table_get_first_active_connection (ct);
while (c)
- {
- next = connection_table_get_next_active_connection (ct, c);
- if ( c->c_mutex == NULL )
- {
- connection_table_move_connection_out_of_active_list(ct,c);
- }
- else
- {
- PR_Lock( c->c_mutex );
+ {
+ next = connection_table_get_next_active_connection (ct, c);
+ if ( c->c_mutex == NULL )
+ {
+ connection_table_move_connection_out_of_active_list(ct,c);
+ }
+ else
+ {
+ PR_Lock( c->c_mutex );
if (c->c_flags & CONN_FLAG_CLOSING)
{
- /* A worker thread has marked that this connection
- * should be closed by calling disconnect_server.
+ /* A worker thread has marked that this connection
+ * should be closed by calling disconnect_server.
* move this connection out of the active list
* the last thread to use the connection will close it
- */
+ */
connection_table_move_connection_out_of_active_list(ct,c);
}
else if ( c->c_sd == SLAPD_INVALID_SOCKET )
@@ -1119,18 +1208,18 @@
{
ct->fd[count].fd = c->c_prfd;
ct->fd[count].in_flags = SLAPD_POLL_FLAGS;
- /* slot i of the connection table is mapped to slot
- * count of the fds array */
- c->c_fdi = count;
- count++;
+ /* slot i of the connection table is mapped to slot
+ * count of the fds array */
+ c->c_fdi = count;
+ count++;
}
- else
+ else
{
- c->c_fdi = SLAPD_INVALID_SOCKET_INDEX;
- }
+ c->c_fdi = SLAPD_INVALID_SOCKET_INDEX;
+ }
}
PR_Unlock( c->c_mutex );
- }
+ }
c = next;
}
@@ -2021,8 +2110,8 @@
slapi_pblock_destroy(search_pb);
slapi_ch_free_string(&filter);
slapi_ch_free_string(&utype);
- slapi_ch_free_string(>ype);
- slapi_ch_free_string(&base_dn);
+ slapi_ch_free_string(>ype);
+ slapi_ch_free_string(&base_dn);
}
if(ret && 0 == uid)
@@ -2363,7 +2452,7 @@
unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, int n_tcps, PRFileDesc *s_tcps)
#else
static void
-unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc *n_tcps, PRFileDesc *s_tcps, PRFileDesc *i_unix)
+unfurl_banners(Connection_Table *ct,daemon_ports_t *ports, PRFileDesc **n_tcps, PRFileDesc **s_tcps, PRFileDesc **i_unix)
#endif
{
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -2407,30 +2496,57 @@
*/
#if !defined( XP_WIN32 )
if ( n_tcps != NULL ) { /* standard LDAP */
-#else
- if ( n_tcps != SLAPD_INVALID_SOCKET ) { /* standard LDAP */
-#endif
+ PRNetAddr **nap = NULL;
+ int isfirsttime = 1;
+ for (nap = ports->n_listenaddr; nap && *nap; nap++) {
+ if (isfirsttime) {
+ LDAPDebug( LDAP_DEBUG_ANY,
+ "slapd started. Listening on %s port %d for LDAP requests\n",
+ netaddr2string(*nap, addrbuf, sizeof(addrbuf)),
+ ports->n_port, 0 );
+ isfirsttime = 0;
+ } else {
+ LDAPDebug( LDAP_DEBUG_ANY,
+ "Listening on %s port %d for LDAP requests\n",
+ netaddr2string(*nap, addrbuf, sizeof(addrbuf)),
+ ports->n_port, 0 );
+ }
+ }
+ }
+
+ if ( s_tcps != NULL ) { /* LDAP over SSL; separate port */
+ PRNetAddr **sap = NULL;
+
+ for (sap = ports->s_listenaddr; sap && *sap; sap++) {
+ LDAPDebug( LDAP_DEBUG_ANY,
+ "Listening on %s port %d for LDAPS requests\n",
+ netaddr2string(*sap, addrbuf, sizeof(addrbuf)),
+ ports->s_port, 0 );
+ }
+ }
+#else
+ if ( n_tcps != SLAPD_INVALID_SOCKET ) { /* standard LDAP; XP_WIN32 */
LDAPDebug( LDAP_DEBUG_ANY,
- "slapd started. Listening on %s port %d for LDAP requests\n",
+ "slapd started. Listening on %s port %d for LDAP requests\n",
netaddr2string(&ports->n_listenaddr, addrbuf, sizeof(addrbuf)),
ports->n_port, 0 );
}
if ( s_tcps != NULL ) { /* LDAP over SSL; separate port */
LDAPDebug( LDAP_DEBUG_ANY,
- "Listening on %s port %d for LDAPS requests\n",
+ "Listening on %s port %d for LDAPS requests\n",
netaddr2string(&ports->s_listenaddr, addrbuf, sizeof(addrbuf)),
ports->s_port, 0 );
}
+#endif
#if !defined( XP_WIN32 )
#if defined(ENABLE_LDAPI)
if ( i_unix != NULL ) { /* LDAPI */
+ PRNetAddr **iap = ports->i_listenaddr;
LDAPDebug( LDAP_DEBUG_ANY,
- "Listening on %s for LDAPI requests\n",
- ports->i_listenaddr.local.path,
- 0, 0 );
+ "Listening on %s for LDAPI requests\n", (*iap)->local.path, 0, 0 );
}
#endif /* ENABLE_LDAPI */
#endif
@@ -2619,26 +2735,29 @@
return tcps;
failed:
- WSACleanup();
- exit( 1 );
+ WSACleanup();
+ exit( 1 );
suppressed:
- return -1;
+ return -1;
} /* createlistensocket */
#endif /* XP_WIN32 */
-static PRFileDesc *
-createprlistensocket(PRUint16 port, const PRNetAddr *listenaddr,
+static PRFileDesc **
+createprlistensockets(PRUint16 port, PRNetAddr **listenaddr,
int secure, int local)
{
- PRFileDesc *sock;
+ PRFileDesc **sock;
PRNetAddr sa_server;
PRErrorCode prerr = 0;
PRSocketOptionData pr_socketoption;
char addrbuf[ 256 ];
- char *logname = "createprlistensocket";
- int socktype = PR_AF_INET6;
- char *socktype_s = "PR_AF_INET";
+ char *logname = "createprlistensockets";
+ int sockcnt = 0;
+ int socktype;
+ char *socktype_s = NULL;
+ PRNetAddr **lap;
+ int i;
if (!port) goto suppressed;
@@ -2649,61 +2768,79 @@
socktype = PR_AF_LOCAL;
socktype_s = "PR_AF_LOCAL";
}
-#endif /* ENABLE_LDAPI */
+#endif
- /* create TCP socket */
- if ((sock = PR_OpenTCPSocket(socktype)) == SLAPD_INVALID_SOCKET) {
- prerr = PR_GetError();
- slapi_log_error(SLAPI_LOG_FATAL, logname,
- "PR_OpenTCPSocket(%s) failed: %s error %d (%s)\n",
- socktype_s,
- SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
- goto failed;
+ /* need to know the count */
+ sockcnt = 0;
+ for (lap = listenaddr; lap && *lap; lap++) {
+ sockcnt++;
}
- pr_socketoption.option = PR_SockOpt_Reuseaddr;
- pr_socketoption.value.reuse_addr = 1;
- if ( PR_SetSocketOption(sock, &pr_socketoption ) == PR_FAILURE) {
- prerr = PR_GetError();
+ if (0 == sockcnt) {
slapi_log_error(SLAPI_LOG_FATAL, logname,
- "PR_SetSocketOption(PR_SockOpt_Reuseaddr) failed: %s error %d (%s)\n",
- SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror( prerr ));
+ "There is no address to listen\n");
goto failed;
}
+ sock = (PRFileDesc **)slapi_ch_calloc(sockcnt + 1, sizeof(PRFileDesc *));
+ pr_socketoption.option = PR_SockOpt_Reuseaddr;
+ pr_socketoption.value.reuse_addr = 1;
+ for (i = 0, lap = listenaddr; lap && *lap && i < sockcnt; i++, lap++) {
+ /* create TCP socket */
+ socktype = PR_NetAddrFamily(*lap);
+ if (PR_AF_INET6 == socktype) {
+ socktype_s = "PR_AF_INET6";
+ } else {
+ socktype_s = "PR_AF_INET";
+ }
+ if ((sock[i] = PR_OpenTCPSocket(socktype)) == SLAPD_INVALID_SOCKET) {
+ prerr = PR_GetError();
+ slapi_log_error(SLAPI_LOG_FATAL, logname,
+ "PR_OpenTCPSocket(%s) failed: %s error %d (%s)\n",
+ socktype_s,
+ SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
+ goto failed;
+ }
- /* set up listener address, including port */
- memcpy(&sa_server, listenaddr, sizeof(sa_server));
+ if ( PR_SetSocketOption(sock[i], &pr_socketoption ) == PR_FAILURE) {
+ prerr = PR_GetError();
+ slapi_log_error(SLAPI_LOG_FATAL, logname,
+ "PR_SetSocketOption(PR_SockOpt_Reuseaddr) failed: %s error %d (%s)\n",
+ SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror( prerr ));
+ goto failed;
+ }
- if(!local)
- PRLDAP_SET_PORT( &sa_server, port );
+ /* set up listener address, including port */
+ memcpy(&sa_server, *lap, sizeof(sa_server));
- if ( PR_Bind(sock, &sa_server) == PR_FAILURE) {
- prerr = PR_GetError();
if(!local)
- {
- slapi_log_error(SLAPI_LOG_FATAL, logname,
- "PR_Bind() on %s port %d failed: %s error %d (%s)\n",
- netaddr2string(&sa_server, addrbuf, sizeof(addrbuf)), port,
- SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
- }
+ PRLDAP_SET_PORT( &sa_server, port );
+
+ if ( PR_Bind(sock[i], &sa_server) == PR_FAILURE) {
+ prerr = PR_GetError();
+ if(!local)
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, logname,
+ "PR_Bind() on %s port %d failed: %s error %d (%s)\n",
+ netaddr2string(&sa_server, addrbuf, sizeof(addrbuf)), port,
+ SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
+ }
#if defined(ENABLE_LDAPI)
- else
- {
- slapi_log_error(SLAPI_LOG_FATAL, logname,
- "PR_Bind() on %s file %s failed: %s error %d (%s)\n",
- netaddr2string(&sa_server, addrbuf, sizeof(addrbuf)),
- sa_server.local.path,
- SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
- }
+ else
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, logname,
+ "PR_Bind() on %s file %s failed: %s error %d (%s)\n",
+ netaddr2string(&sa_server, addrbuf, sizeof(addrbuf)),
+ sa_server.local.path,
+ SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
+ }
#endif /* ENABLE_LDAPI */
-
- goto failed;
+ goto failed;
+ }
}
#if defined(ENABLE_LDAPI)
- if(local)
- {
- if(chmod(listenaddr->local.path,
+ if(local) { /* ldapi */
+ if(chmod((*listenaddr)->local.path,
S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))
{
slapi_log_error(SLAPI_LOG_FATAL, logname, "err: %d", errno);
@@ -2721,7 +2858,7 @@
suppressed:
return (PRFileDesc *)-1;
-} /* createprlistensocket */
+} /* createprlistensockets */
/*
@@ -2729,36 +2866,63 @@
* Returns: 0 if successful and -1 if not (after logging an error message).
*/
int
-slapd_listenhost2addr(const char *listenhost, PRNetAddr *addr)
+slapd_listenhost2addr(const char *listenhost, PRNetAddr ***addr)
{
- char *logname = "slapd_listenhost2addr";
- PRErrorCode prerr = 0;
- int rval = 0;
+ char *logname = "slapd_listenhost2addr";
+ PRErrorCode prerr = 0;
+ int rval = 0;
+ PRNetAddr *netaddr = (PRNetAddr *)slapi_ch_calloc(1, sizeof(PRNetAddr));
PR_ASSERT( addr != NULL );
+ *addr = NULL;
if (NULL == listenhost) {
/* listen on all interfaces */
- if ( PR_SUCCESS != PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, addr)) {
+ if ( PR_SUCCESS != PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, netaddr)) {
prerr = PR_GetError();
slapi_log_error( SLAPI_LOG_FATAL, logname,
"PR_SetNetAddr(PR_IpAddrAny) failed - %s error %d (%s)\n",
SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
rval = -1;
+ slapi_ch_free ((void**)&netaddr);
}
- } else if (PR_SUCCESS == PR_StringToNetAddr(listenhost, addr)) {
+ *addr = (PRNetAddr **)slapi_ch_calloc(2, sizeof (PRNetAddr *));
+ *addr[0] = netaddr;
+ } else if (PR_SUCCESS == PR_StringToNetAddr(listenhost, netaddr)) {
/* PR_StringNetAddr newer than NSPR v4.6.2 supports both IPv4&v6 */;
+ *addr = (PRNetAddr **)slapi_ch_calloc(2, sizeof (PRNetAddr *));
+ *addr[0] = netaddr;
} else {
PRAddrInfo *infop = PR_GetAddrInfoByName( listenhost,
PR_AF_UNSPEC, (PR_AI_ADDRCONFIG|PR_AI_NOCANONNAME) );
if ( NULL != infop ) {
- memset( addr, 0, sizeof( PRNetAddr ));
- if ( NULL == PR_EnumerateAddrInfo( NULL, infop, 0, addr )) {
+ void *iter = NULL;
+ int addrcnt = 0;
+ int i = 0;
+ memset( netaddr, 0, sizeof( PRNetAddr ));
+ /* need to count the address, first */
+ while ( (iter = PR_EnumerateAddrInfo( iter, infop, 0, netaddr ))
+ != NULL ) {
+ addrcnt++;
+ }
+ if ( 0 == addrcnt ) {
slapi_log_error( SLAPI_LOG_FATAL, logname,
"PR_EnumerateAddrInfo for %s failed - %s error %d (%s)\n",
listenhost, SLAPI_COMPONENT_NAME_NSPR, prerr,
slapd_pr_strerror(prerr));
rval = -1;
+ } else {
+ *addr = (PRNetAddr **)slapi_ch_calloc(addrcnt + 1, sizeof (PRNetAddr *));
+ iter = NULL; /* from the beginning */
+ memset( netaddr, 0, sizeof( PRNetAddr ));
+ for ( i = 0; i < addrcnt; i++ ) {
+ iter = PR_EnumerateAddrInfo( iter, infop, 0, netaddr );
+ if ( NULL == iter ) {
+ break;
+ }
+ *addr[i] = netaddr;
+ netaddr = (PRNetAddr *)slapi_ch_calloc(1, sizeof(PRNetAddr));
+ }
}
PR_FreeAddrInfo( infop );
} else {
@@ -2915,20 +3079,15 @@
return size;
}
-
-
-
PRFileDesc * get_ssl_listener_fd()
{
PRFileDesc * listener;
- listener = the_connection_table->fd[FDS_S_TCPS].fd;
+ listener = the_connection_table->fd[the_connection_table->s_tcps].fd;
return listener;
}
-
-
int configure_pr_socket( PRFileDesc **pr_socket, int secure, int local )
{
int ns = 0;
16 years, 8 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 ds_unregister.in, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25248/admserv/cgi-src40
Added Files:
ds_unregister.in
Log Message:
Resolves: #214276
Summary: "rpm -e fedora-ds" uninstall doesn't remove server from configuration
directory (comment #2-#4 with fix #6)
--- NEW FILE ds_unregister.in ---
#!@perlexec@
# 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.
#
# Copyright (C) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
use lib qw(@perlpath@);
use strict;
use CGI qw(:cgi :oldstyle_urls);
use Inf;
use AdminUtil;
use Util;
use Resource;
my $res = new Resource("@propertydir(a)/ds_remove.res",
"@propertydir(a)/setup-ds-admin.res",
"@propertydir(a)/setup-ds.res");
# parse the input parameters
my $query = new CGI;
# call ds_newinst as a GET (GET or POST works, GET is simpler)
$ENV{REQUEST_METHOD} = "GET";
$ENV{QUERY_STRING} = $query->query_string();
my $instname = $query->param('InstanceName');
my ($slapd, $inst) = split(/-/, $instname, 2);
my $configdir = "@instconfigdir@/slapd-$inst";
if ( ! -d $configdir )
{
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: $configdir does not exist\n";
print "NMC_Status: 1\n";
print STDERR "Error: $configdir does not exist\n";
exit 1;
}
my @errs;
my $inf = createInfFromConfig($configdir, $inst, \@errs);
if (@errs)
{
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
print STDERR "Error: ", $res->getText(@errs), "\n";
exit 1;
}
# add the parmeters necessary to configure this DS to be managed
# by the console and to be registered with the config DS - these
# are usually passed in via the CGI params, or use reasonable
# default values
my $admConf = getAdmConf("@instconfigdir@/admin-serv");
$inf->{General}->{ConfigDirectoryLdapURL} = $query->param('ldap_url') ||
$admConf->{ldapurl};
$inf->{General}->{AdminDomain} = $query->param('admin_domain') ||
$admConf->{AdminDomain};
# Unregister the server from the configuration ds
# get config ds url from input or admconf
# get admin id from input or admconf
# must get admin password from input (PASSWORD_PIPE?)
# get admin domain
# config ds info
if (!unregisterDSWithConfigDS($inst, \@errs, $inf))
{
print "Content-type: text/plain\n\n";
print "NMC_ErrInfo: ", $res->getText(@errs), "\n";
print "NMC_Status: 1\n";
print STDERR "Error:", $res->getText(@errs), "\n";
exit 1;
}
# if we got here, report success
print "Content-type: text/plain\n\n";
print "NMC_Status: 0\n";
exit 0;
16 years, 8 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff ds_unregister.in, NONE, 1.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25248/admserv/cfgstuff
Added Files:
ds_unregister.in
Log Message:
Resolves: #214276
Summary: "rpm -e fedora-ds" uninstall doesn't remove server from configuration
directory (comment #2-#4 with fix #6)
--- NEW FILE ds_unregister.in ---
#!/bin/sh
# 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) 2007 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
Usage()
{
echo "Usage: $0 -s server_id -w admin_password"
echo " server_id: Directory server identifier; slapd-<server_id>"
echo " admin_password: Administration user password"
}
err0=""
err1=""
err2=""
server_id=""
admin_pw=""
while [ "$1" != "" ]
do
if [ "$1" = "-s" ]; then
shift
server_id=$1
elif [ "$1" = "-w" ]; then
shift
admin_pw=$1
elif [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--help" ]; then
Usage
exit 0
else
err0="Option $1 is not supported. "
fi
if [ "$1" != "" ]; then
shift
fi
done
if [ "$server_id" = "" ]; then
err1="Directory Server identifier is missing. "
fi
if [ "$admin_pw" = "" ]; then
err2="Administration user password is missing. "
fi
if [ "$err0" != "" -o "$err1" != "" -o "$err2" != "" ];then
echo Error: ${err0}${err1}${err2}
Usage
exit 1
fi
PASSWORD_PIPE=STDIN; export PASSWORD_PIPE
QUERY_STRING="InstanceName=slapd-${server_id}"; export QUERY_STRING
SERVER_NAMES=slapd-${server_id}; export SERVER_NAMES
REQUEST_METHOD=GET; export REQUEST_METHOD
if [ -c /dev/null ]; then
NULL=/dev/null
else
NULL=/tmp/ds_unregister.out
fi
@cgibindir@/ds_unregister > $NULL << EOF
Password: ${admin_pw}
EOF
exit $?
16 years, 8 months
[Fedora-directory-commits] adminserver Makefile.am, 1.28, 1.29 Makefile.in, 1.31, 1.32 aclocal.m4, 1.25, 1.26 configure, 1.28, 1.29
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25248
Modified Files:
Makefile.am Makefile.in aclocal.m4 configure
Log Message:
Resolves: #214276
Summary: "rpm -e fedora-ds" uninstall doesn't remove server from configuration
directory (comment #2-#4 with fix #6)
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.am 2 Aug 2007 14:58:34 -0000 1.28
+++ Makefile.am 3 Aug 2007 22:06:59 -0000 1.29
@@ -171,11 +171,15 @@
ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \
ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
-cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create \
+ admserv/cgi-src40/ds_remove \
+ admserv/cgi-src40/ds_unregister
+
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \
admserv/cfgstuff/stop-ds-admin \
admserv/cfgstuff/restart-ds-admin \
- admserv/cfgstuff/ds_removal
+ admserv/cfgstuff/ds_removal \
+ admserv/cfgstuff/ds_unregister
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
admserv/newinst/src/migrate-ds-admin.pl \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.in 2 Aug 2007 14:58:34 -0000 1.31
+++ Makefile.in 3 Aug 2007 22:06:59 -0000 1.32
@@ -398,7 +398,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -607,11 +606,15 @@
admserv/newinst/src/dirserver.map \
admserv/newinst/src/asmigrate.map
-cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove
+cgibin_SCRIPTS = admserv/cgi-src40/ds_create \
+ admserv/cgi-src40/ds_remove \
+ admserv/cgi-src40/ds_unregister
+
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \
admserv/cfgstuff/stop-ds-admin \
admserv/cfgstuff/restart-ds-admin \
- admserv/cfgstuff/ds_removal
+ admserv/cfgstuff/ds_removal \
+ admserv/cfgstuff/ds_unregister
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \
admserv/newinst/src/migrate-ds-admin.pl \
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- aclocal.m4 2 Aug 2007 14:58:34 -0000 1.25
+++ aclocal.m4 3 Aug 2007 22:06:59 -0000 1.26
@@ -1578,27 +1578,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4305,9 +4288,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4441,11 +4421,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4457,7 +4437,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4517,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6353,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6385,6 @@
done
])
SED=$lt_cv_path_SED
-AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- configure 2 Aug 2007 14:58:34 -0000 1.28
+++ configure 3 Aug 2007 22:06:59 -0000 1.29
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
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 PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir 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.
@@ -3837,7 +3837,6 @@
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3872,7 +3871,6 @@
fi
SED=$lt_cv_path_SED
-
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4313,7 +4311,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4316 "configure"' > conftest.$ac_ext
+ echo '#line 4314 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5448,7 +5446,7 @@
# Provide some information about the compiler.
-echo "$as_me:5451:" \
+echo "$as_me:5449:" \
"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
@@ -6511,11 +6509,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:6514: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6512: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6518: \$? = $ac_status" >&5
+ echo "$as_me:6516: \$? = $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.
@@ -6779,11 +6777,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:6782: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6780: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6786: \$? = $ac_status" >&5
+ echo "$as_me:6784: \$? = $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.
@@ -6883,11 +6881,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:6886: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6884: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6890: \$? = $ac_status" >&5
+ echo "$as_me:6888: \$? = $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
@@ -8348,31 +8346,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 8355 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9249,7 +9226,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9252 "configure"
+#line 9229 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9349,7 +9326,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9352 "configure"
+#line 9329 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9680,9 +9657,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -9816,11 +9790,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -9832,7 +9806,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -9912,7 +9886,7 @@
link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -11692,11 +11666,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:11695: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11669: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11699: \$? = $ac_status" >&5
+ echo "$as_me:11673: \$? = $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.
@@ -11796,11 +11770,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:11799: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11773: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11803: \$? = $ac_status" >&5
+ echo "$as_me:11777: \$? = $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
@@ -12328,31 +12302,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 12335 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12736,9 +12689,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12872,11 +12822,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_CXX
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_CXX
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12888,7 +12838,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12968,7 +12918,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13390,11 +13340,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:13393: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13343: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13397: \$? = $ac_status" >&5
+ echo "$as_me:13347: \$? = $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.
@@ -13494,11 +13444,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:13497: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13447: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13501: \$? = $ac_status" >&5
+ echo "$as_me:13451: \$? = $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
@@ -14939,31 +14889,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 14946 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15347,9 +15276,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15483,11 +15409,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_F77
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_F77
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15499,7 +15425,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15579,7 +15505,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15721,11 +15647,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:15724: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15650: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15728: \$? = $ac_status" >&5
+ echo "$as_me:15654: \$? = $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.
@@ -15989,11 +15915,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:15992: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15918: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15996: \$? = $ac_status" >&5
+ echo "$as_me:15922: \$? = $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.
@@ -16093,11 +16019,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:16096: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16100: \$? = $ac_status" >&5
+ echo "$as_me:16026: \$? = $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
@@ -17558,31 +17484,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 17565 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17966,9 +17871,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18102,11 +18004,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_GCJ
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_GCJ
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18118,7 +18020,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18198,7 +18100,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18450,9 +18352,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18586,11 +18485,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_predep_objects_RC
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_postdep_objects_RC
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18602,7 +18501,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18682,7 +18581,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -26013,7 +25912,6 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
16 years, 8 months
[Fedora-directory-commits] admservconsole fedora-admin-console.spec, NONE, 1.1 build.properties, 1.4, 1.5 build.xml, 1.2, 1.3 fedora-admserv-console.spec, 1.1, NONE
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402
Modified Files:
build.properties build.xml
Added Files:
fedora-admin-console.spec
Removed Files:
fedora-admserv-console.spec
Log Message:
Resolves: 250699
Summary: Updated dependency on console framework and admin server.
--- NEW FILE fedora-admin-console.spec ---
%define major_version 1.1
%define minor_version 0
%define dsname fedora-ds
%define shortname fedora-admin
Name: fedora-admin-console
Version: %{major_version}.%{minor_version}
Release: 1
Summary: Fedora Admin Server Management Console
Group: Applications
License: LGPL
URL: http://directory.fedoraproject.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source: %{name}-%{version}.tar.bz2
Requires: %{dsname}-admin >= 1.1
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: idm-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
Admin Server.
%prep
%setup -q
%build
%{ant} \
-Dconsole.location=%{_javadir} \
-Dbuilt.dir=`pwd`/built
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
# create symlinks
pushd $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar
ln -s %{shortname}-%{version}.jar %{shortname}.jar
ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar
ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar
popd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}.jar
%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}.jar
%{_datadir}/%{dsname}/html/java/%{shortname}.jar
%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}_en.jar
%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}_en.jar
%{_datadir}/%{dsname}/html/java/%{shortname}_en.jar
%changelog
* Thu Aug 2 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1
- Initial creation
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 9 Jul 2007 20:10:09 -0000 1.4
+++ build.properties 2 Aug 2007 23:16:15 -0000 1.5
@@ -24,5 +24,5 @@
admservconsole.version=1.1.0
admservconsole.gen.version=1.1
brand=fedora
-admservconsole.name=${brand}-admserv-${admservconsole.version}
-admservconsole.gen.name=${brand}-admserv-${admservconsole.gen.version}
+admservconsole.name=${brand}-admin-${admservconsole.version}
+admservconsole.gen.name=${brand}-admin-${admservconsole.gen.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 9 Jul 2007 20:10:09 -0000 1.2
+++ build.xml 2 Aug 2007 23:16:15 -0000 1.3
@@ -82,9 +82,9 @@
<!-- Construct classpath -->
<path id="admservconsole.classpath">
<fileset dir="${console.location}">
- <include name="**/${brand}-base-*.jar"/>
- <include name="**/${brand}-mcc-*.jar"/>
- <include name="**/${brand}-nmclf-*.jar"/>
+ <include name="**/idm-console-base-*.jar"/>
+ <include name="**/idm-console-mcc-*.jar"/>
+ <include name="**/idm-console-nmclf-*.jar"/>
<include name="**/ldapjdk.jar"/>
</fileset>
<pathelement path="${built.classdir}"/>
--- fedora-admserv-console.spec DELETED ---
16 years, 8 months
[Fedora-directory-commits] esc/mac/misc Makefile-OSX.egate.patch, NONE, 1.1 libtool.coolkey.patch, NONE, 1.1 libtool.usb.patch, NONE, 1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/mac/misc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29733/misc
Added Files:
Makefile-OSX.egate.patch libtool.coolkey.patch
libtool.usb.patch
Log Message:
Add packaging capabilites. r mharmsen.
Makefile-OSX.egate.patch:
--- NEW FILE Makefile-OSX.egate.patch ---
--- Makefile-OSX.egate 2007-07-26 14:42:54.000000000 -0700
+++ Makefile-OSX 2007-07-26 14:43:21.000000000 -0700
@@ -8,11 +8,11 @@
-rm -f *.o *.so *.dylib
install: libifd_egate.dylib
- mkdir -p /usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
- cp Info.plist-OSX /usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/Info.plist
- cp libifd_egate.dylib /usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
- mkdir -p /usr/local/pcsc/drivers/ifd-egate.bundle/Contents/MacOS
- cp Info.plist-OSX /usr/local/pcsc/drivers/ifd-egate.bundle/Contents/Info.plist
- cp libifd_egate.dylib /usr/local/pcsc/drivers/ifd-egate.bundle/Contents/MacOS
+ mkdir -p $(DESTDIR)/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
+ cp Info.plist-OSX $(DESTDIR)/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/Info.plist
+ cp libifd_egate.dylib $(DESTDIR)/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS
+ mkdir -p $(DESTDIR)/usr/local/pcsc/drivers/ifd-egate.bundle/Contents/MacOS
+ cp Info.plist-OSX $(DESTDIR)/usr/local/pcsc/drivers/ifd-egate.bundle/Contents/Info.plist
+ cp libifd_egate.dylib $(DESTDIR)/usr/local/pcsc/drivers/ifd-egate.bundle/Contents/MacOS
all: libifd_egate.dylib
libtool.coolkey.patch:
--- NEW FILE libtool.coolkey.patch ---
--- libtool.coolkey 2007-07-26 15:03:11.000000000 -0700
+++ libtool 2007-07-26 15:05:50.000000000 -0700
@@ -211,7 +211,7 @@
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring"
+archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
@@ -6827,14 +6827,14 @@
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring"
-archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
+archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
# Commands used to build a loadable module (assumed same as above if empty)
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs\$compiler_flags"
-module_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs\$compiler_flags~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+module_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
# Commands to strip libraries.
old_striplib=""
libtool.usb.patch:
--- NEW FILE libtool.usb.patch ---
*** libtool.usb Thu Jul 26 14:13:16 2007
--- libtool Thu Jul 26 14:21:36 2007
***************
*** 202,208 ****
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
! archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs\$compiler_flags -install_name \$rpath/\$soname \$verstring"
archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs\$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
--- 202,208 ----
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
! archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs\$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
***************
*** 6923,6929 ****
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
! archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring"
archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
--- 6923,6929 ----
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
! archive_cmds="\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386 \$compiler_flags -install_name \$rpath/\$soname \$verstring"
archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[ ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib -single_module \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
postinstall_cmds=""
postuninstall_cmds=""
16 years, 8 months
[Fedora-directory-commits] esc/mac/coolkey_package_data/Resources License.txt, NONE, 1.1 background.gif, NONE, 1.1 postflight, NONE, 1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/mac/coolkey_package_data/Resources
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29733/coolkey_package_data/Resources
Added Files:
License.txt background.gif postflight
Log Message:
Add packaging capabilites. r mharmsen.
--- NEW FILE License.txt ---
END USER LICENSE AGREEMENT
RED HAT(R) DIRECTORY SERVER AND
RED HAT(R) CERTIFICATE SYSTEM
This end user license agreement ("EULA") governs the use of
Red Hat Directory Server (which uses Administration Server
and Red Hat Management Console) and Red Hat Certificate
System (which uses Enterprise Security Client and Auto
Enrollment Proxy) and any related updates to source code,
appearance, structure and organization (each, a "Program")
regardless of the delivery mechanism.
1. Red Hat Directory Server, Enterprise Security Client and
Auto Enrollment Proxy
1.1 License Grant. Red Hat Directory Server ("RHDS"),
Enterprise Security Client ("ESC") and Auto Enrollment Proxy
("AEP")are modular applications consisting of hundreds of
software components and are collective works under U.S.
Copyright Law. Subject to the following terms, Red Hat,
Inc. ("Red Hat") grants to you ('User") a perpetual,
worldwide license to RHDS, ESC and AEP pursuant to the GNU
General Public License v.2 ("GPL"). Please note that
Administration Server and Red Hat Management Console, which
are binary-only code used to configure and administer RHDS,
are subject to the license terms in Section 2. The end user
license agreement for each component of RHDS, ESC and AEP
are located in the component's source code. With the
exception of certain image files identified in Section 1.3
below, the license terms for the components permit User to
copy, modify, and redistribute the component, in both source
code and binary code forms. This EULA does not limit User's
rights under, or grant User rights that supersede, the
license terms of any particular component.
1.2 License Exception. In addition, as a special
exception, Red Hat gives User the additional right to link
the code of RHDS with code not covered under the GPL
("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 RHDS through those well defined
interfaces identified in that file named EXCEPTION in the
source code files for RHDS (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 GPL.
Only Red Hat may make changes or additions to the list of
Approved Interfaces. User must comply with the GPL in all
respects for all of the RHDS code and other code used in
conjunction with RHDS except the Non-GPL Code covered by
this exception. If User modifies RHDS, User may extend this
exception to its version of RHDS, but User is not obligated
to do so. If User does not wish to provide this exception
without modification, User must delete this exception
statement from User's version of RHDS and license RHDS
solely under the GPL without exception.
1.3 Intellectual Property Rights. RHDS, ESC, AEP and each
of their components, including the source code,
documentation, appearance, structure and organization are
owned by Red Hat and others and are protected under
copyright and other laws. Title to RHDS, ESC, AEP and any
component, or to any copy, modification, or merged portion
shall remain with the aforementioned, subject to the
applicable license. The "Red Hat" trademark and the
"Shadowman" logo are registered trademarks of Red Hat in the
U.S. and other countries. This EULA does not permit User to
distribute RHDS, ESC or AEP using Red Hat's trademarks.
User should read the information found at
http://www.redhat.com/about/corporate/trademark/ before
distributing a copy of these Programs, regardless of whether
they have been modified. User may make a commercial
redistribution of RHDS, ESC or AEP only if (a) a separate
agreement with Red Hat authorizing such commercial
redistribution is executed or other written permission is
granted by Red Hat or (b) User modifies any files identified
as "REDHAT-LOGOS" to remove and replace all images
containing the "Red Hat" trademark or the "Shadowman" logo.
Merely deleting these files may corrupt the Programs.
2. Red Hat Certificate System, Administration Server, and
Red Hat Management Console
2.1 License Grant. Subject to the provisions of this
Section 2.1, Red Hat hereby grants User a non-exclusive,
non-transferable, worldwide, perpetual, fully paid right
(without the right to sublicense) to use, reproduce and
distribute Red Hat Certificate System ("RHCS"),
Administration Server ("Admin Server"), and Red Hat
Management Console ("Console") in executable,
machine-readable form. User must reproduce all copyright
and other proprietary notices on such copies. User may only
reproduce and distribute RHCS, Admin Server or Console to
another party if the other party agrees in writing to be
obligated by the terms and conditions of this Section 2.1.
Except as provided in this Section 2.1, User may not modify,
copy, transfer or otherwise use RHCS, Admin Server, or
Console, and all licenses granted hereunder are
automatically terminated if User does so.
2.2 Change in Licensing. It is Red Hat's intent to change
the terms of the license granted under this Section 2 to
those of an open source license. If such change is
generally announced to the public, User will have the option
to elect to have RHCS, Admin Server and Console be governed
by the terms of such open source license. If User does not
make such election, the terms of this Agreement will
continue to govern User's use of the RHCS, Admin Server and
Console.
3. Limited Warranty. Except as specifically stated in this
Section 3, a separate agreement with Red Hat, or a license
for a particular component, to the maximum extent permitted
under applicable law, the Programs and the components are
provided and licensed "as is" without warranty of any kind,
expressed or implied, including the implied warranties of
merchantability, non-infringement or fitness for a
particular purpose. Red Hat warrants that the media on
which the Programs and the components are furnished will be
free from defects in materials and manufacture under normal
use for a period of thirty (30) days from the date of
delivery to User. Red Hat does not warrant that the
functions contained in the Programs will meet User's
requirements or that the operation of the Programs will be
entirely error free, appear precisely as described in the
accompanying documentation, or comply with regulatory
requirements. This warranty extends only to the party that
purchases services pertaining to the Programs from Red Hat
or a Red Hat authorized distributor.
4. Limitation of Remedies and Liability. To the maximum
extent permitted by applicable law, User's exclusive remedy
under this EULA is to return any defective media within
thirty (30) days of delivery along with a copy of User's
payment receipt and Red Hat, at its option, will replace it
or refund the money paid by User for the media. To the
maximum extent permitted under applicable law, neither Red
Hat, any Red Hat authorized distributor, nor the licensor of
any component provided to User under the EULA will be liable
to User for any incidental or consequential damages,
including lost profits or lost savings arising out of the
use or inability to use the Programs or any component, even
if Red Hat, such authorized distributor or licensor has been
advised of the possibility of such damages. In no event
shall Red Hat's liability, an authorized distributor's
liability or the liability of the licensor of a component
provided to User under this EULA exceed the amount that User
paid to Red Hat under this EULA during the twelve (12)
months preceding the action.
5. Export Control. As required by the laws of the United
States and other countries, User represents and warrants
that it: (a) understands that the Programs and their
components may be subject to export controls under the U.S.
Commerce Department's Export Administration Regulations
("EAR"); (b) is not located in a prohibited destination
country under the EAR or U.S. sanctions regulations
(currently Cuba, Iran, Iraq, North Korea, Sudan and Syria,
subject to change as posted by the United States
government); (c) will not export, re-export, or transfer the
Programs to any prohibited destination or persons or
entities on the U.S. Bureau of Industry and Security Denied
Parties List or Entity List, or the U.S. Office of Foreign
Assets Control list of Specially Designated Nationals and
Blocked Persons, or any similar lists maintained by other
countries, without the necessary export license(s) or
authorization(s); (d) will not use or transfer the Programs
for use in connection with any nuclear, chemical or
biological weapons, missile technology, or military end-uses
where prohibited by an applicable arms embargo, unless
authorized by the relevant government agency by regulation
or specific license; (e) understands and agrees that if it
is in the United States and exports or transfers the
Programs to eligible end users, it will, to the extent
required by EAR Section 740.17(e), submit semi-annual
reports to the Commerce Department's Bureau of Industry and
Security , which include the name and address (including
country) of each transferee; and (f) understands that
countries including the United States may restrict the
import, use, or export of encryption products (which may
include the Programs and the components) and agrees that it
shall be solely responsible for compliance with any such
import, use, or export restrictions.
6. Third Party Programs. Red Hat may distribute third party
software programs with the Programs that are not part of the
Programs. These third party programs are not required to
run the Programs, are provided as a convenience to User, and
are subject to their own license terms. The license terms
either accompany the third party software programs or can be
viewed at
http://www.redhat.com/licenses/thirdparty/eula.html. If
User does not agree to abide by the applicable license terms
for the third party software programs, then User may not
install them. If User wishes to install the third party
software programs on more than one system or transfer the
third party software programs to another party, then User
must contact the licensor of the applicable third party
software programs.
7. General. If any provision of this agreement is held to
be unenforceable, that shall not affect the enforceability
of the remaining provisions. This agreement shall be
governed by the laws of the State of New York and of the
United States, without regard to any conflict of laws
provisions. The rights and obligations of the parties to
this EULA shall not be governed by the United Nations
Convention on the International Sale of Goods.
--- NEW FILE postflight ---
#!/bin/bash
# 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.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK **/
echo "Hello from postflight."
if [ ! -a /usr/libexec/SmartCardServices/drivers/slbEGate.bundle ]
then
rm -rf /usr/libexec/SmartCardServices/drivers/slbEGate.bundle ]
fi
if [ ! -a /Library/"Application Support"/CoolKey/PKCS11 ]
then
mkdir -v -p /Library/"Application Support"/CoolKey/PKCS11
fi
if [ -f "/Library/Application Support/CoolKey/PKCS11/libcoolkeypk11.dylib" ]
then
rm -rf "/Library/Application Support/CoolKey/PKCS11/libcoolkeypk11.dylib"
fi
ln -f -s "/usr/local/CoolKey/lib/pkcs11/libcoolkeypk11.dylib" "/Library/Application Support/CoolKey/PKCS11/libcoolkeypk11.dylib"
rm -rf ~/Library/"Application Support"/ESC
rm -rf /Applications/Utilities/PK11Install/pk11install
ln -f -s "/usr/local/CoolKey/bin/pk11install" "/Applications/Utilities/PK11Install/pk11install"
/Applications/Utilities/PK11Install/pk11install -v "name='CoolKey Module' library='/Library/Application Support/CoolKey/PKCS11/libcoolkeypk11.dylib' NSS="slotParams={0x1=[slotFlags=PublicCerts]}""
16 years, 8 months
[Fedora-directory-commits] esc/mac/coolkey_package_data Description.plist, NONE, 1.1 Info.plist, NONE, 1.1 es-client.icns, NONE, 1.1 pk11install.command, NONE, 1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/mac/coolkey_package_data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29733/coolkey_package_data
Added Files:
Description.plist Info.plist es-client.icns
pk11install.command
Log Message:
Add packaging capabilites. r mharmsen.
--- NEW FILE Description.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- # 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.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK -->
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IFPkgDescriptionDeleteWarning</key>
<string></string>
<key>IFPkgDescriptionDescription</key>
<string>CoolKey drivers and ESC installer</string>
<key>IFPkgDescriptionTitle</key>
<string>Smart Card Manager Software Package</string>
<key>IFPkgDescriptionVersion</key>
<string>1.0</string>
</dict>
</plist>
--- NEW FILE Info.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- # 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.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK -->
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string>Smart Card Manager 1.14</string>
<key>CFBundleName</key>
<string>Smart Card Manager</string>
<key>CFBundleIdentifier</key>
<string>Smart Card Manager Installer</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>IFMajorVersion</key>
<integer>1</integer>
<key>IFMinorVersion</key>
<integer>0</integer>
<key>IFPkgFlagAllowBackRev</key>
<false/>
<key>IFPkgFlagAuthorizationAction</key>
<string>RootAuthorization</string>
<key>IFPkgFlagDefaultLocation</key>
<string>/</string>
<key>IFPkgFlagFollowLinks</key>
<false/>
<key>IFPkgFlagInstallFat</key>
<false/>
<key>IFPkgFlagIsRequired</key>
<false/>
<key>IFPkgFlagOverwritePermissions</key>
<false/>
<key>IFPkgFlagRelocatable</key>
<false/>
<key>IFPkgFlagRestartAction</key>
<string>NoRestart</string>
<key>IFPkgFlagRootVolumeOnly</key>
<true/>
<key>IFPkgFlagUpdateInstalledLanguages</key>
<false/>
<key>IFPkgFlagUseUserMask</key>
<integer>0</integer>
<key>IFPkgFormatVersion</key>
<real>0.10000000149011612</real>
</dict>
</plist>
--- NEW FILE es-client.icns ---
icns
9u���
�����[
�����������������w�
����������/�
�����P
���������������w�
����������/�
������b���9�
�����������������w�
o�{
3�
��
�����������������������������+
3ir���������������T�
'\z�������������<8E��^�
Ux����������
�������m@@6q�w�
Uv�����������������vu����R5>���
�
����������B�
�
�
�
3ir���������������T�
'\z�������������.+9��^�
Ux����������
������{d13(g�x�
Uv����������������ymk|���F'2���
�
����������B�
�
�
�
�
3ir���������������T�
'\z������������������[�
Ux����������
�������������s�
Uv�����������������������������
�
����������B�
�
���������������������d�
7$&+1/!0LS,�
�
�
�
N���������������
1�������������g/
$**U������y�
3C5X������������
6:/U}����������p�
3A<I}����������m�
3I6Hy��������
*I?Ft�����������������q�
<NGLu�������� ��������������3�
<VMSu��������������������s�����L�
<[VYx������������
��������������W�
Lefc�������������������������������S�
83<r�������������6���������������oTGSm����������������������������������`�
B86n����������������������������jUK[v��������������
FFAe���������������������������g\XZr���������������
����������U��������y�
���[�
>PNS����������������U''%"']my�������������y��������P�
�����}"**)�(�)�*R�|F�N
OM/h�������L�
MJFCCEA�
�
�
�
�
�
�
$**U������y�
3C5X������������
6:/U}����������p�
3A<I}����������m�
3I6Hy��������
*I?Ft�����������������q�
<NGLu�������� ��������������3�
<VMSu����������������{���i�����L�
<[VYx������������
�v�x���y�������W�
Lefc�������������������������������S�
83<r�������������6���������������dH<Gd��������������������x�������x�����`�
B86n���������������������������z`J>Ol��������������
FFAe��������������������������w]QMOh���������������
����������J��������y�
���������[�
$EKP_bam�������������<��������J�
>PNS��������������,���G
BEK[`]\Z[amnl��r�bz�������P�
*
O�������@�
530--/.�
�
�
�
�
$**U������y�
3C5X������������
6:/U}����������p�
3A<I}����������m�
3I6Hy��������
*I?Ft�����������������q�
<NGLu�����������������������3�
<VMSu���������������������������L�
<[VYx������������
���������������W�
Lefc�������������������������������S�
83<r������������� �����������������������������������������������������`�
B86n�����������������������������������������������
FFAe�����������������������������������������������
��������������������y�
9P������
��}����������[�
>PNS��������������.�����)
+''00)&#!)8BKc�@lj��������P�
%-)+-/+'!1r������W�
+r�����S�
P�������@�
�
�
�
�
GHE<4,$!"�
�
�
:l���������r
������������������
�������������������������������������������������������������������������������������������������������������������
--- NEW FILE pk11install.command ---
# 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.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK **/
echo Configuring PKCS11 with Mozilla...
/Applications/Utilities/PK11Install/pk11install -v "name='CoolKey Module' library='/Library/Application Support/CoolKey/PKCS11/libcoolkeypk11.dylib' NSS="slotParams={0x1=[slotFlags=PublicCerts]}""
16 years, 8 months
[Fedora-directory-commits] esc/mac mac-build.sh,NONE,1.1
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/mac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29733
Added Files:
mac-build.sh
Log Message:
Add packaging capabilites. r mharmsen.
--- NEW FILE mac-build.sh ---
#!/bin/bash
# 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.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK **/
# Build Mac ESC/CoolKey/IFD-EGATE/LIB-USB bundle
# Error reported by PackageMaker such as:
# : for architecture i386 object: updater malformed object (unknown flavor for flavor number 0 in LC_UNIXTHREAD command 14 can't byte swap it)
# Has been reported to only happen on a PPC system and is benign...
#Environment variables
# TOKEND_PATH_NAME - Path of where to obtain the TokenD bundle ex: /usr/local/tokend/COOLKEY.zip
printf "\n \n"
echo "Building ESC... for Mac.... "
printf "\n"
OSX_RPM_PATH=/usr/local/bin
LIB_USB_URL_BASE=http://downloads.sourceforge.net/libusb
LIB_USB_NAME=libusb-0.1.12
LIB_USB_URL=$LIB_USB_URL_BASE/$LIB_USB_NAME
IFD_EGATE_URL_BASE=ftp://download.fedora.redhat.com/pub/fedora/linux/core...
IFD_EGATE_NAME=ifd-egate-0.05
IFD_EGATE_REL=15
COOLKEY_PKG_NAME=SmartCardManager1.14.pkg
COOLKEY_VOL_NAME=SMARTCARDMANAGER
COOLKEY_TAG=HEAD
ESC_VERSION=1.0.1-4
COOLKEY_DMG_NAME=SmartCardManager-$ESC_VERSION.OSX4.darwin.dmg
ENABLE_PK11INSTALL=
#replacement libtool files
LIBTOOL_USB_PATCH=../misc/libtool.usb.patch
LIBTOOL_COOLKEY=
#Various CVS repositories
FEDORA_CVS_ROOT=:pserver:anonymous@cvs.fedora.redhat.com/cvs/dirsec
MOZ_CVS_ROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZ_XULRUNNER_BRANCH=MOZILLA_1_8_0_7_RELEASE
# Various path constants
PACKAGE_MAKER_PATH=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS
PK11INSTALL_PATH=/Applications/Utilities/PK11Install
TOKEND_DEST_PATH=/System/Library/Security/tokend
#TOKEND_PATH_NAME=/share/builds/components/tokend/20070111/COOLKEY.zip
TOKEND_DEST_NAME=A_COOLKEY.tokend
BASE_DIR=${PWD}
COOLKEY_PATH=/usr/local/CoolKey
#Where to grab a few universal NSS dylib's for pk11install
PK11INSTALL_LIB_PATH=$BASE_DIR/esc/dist/Darwin6.8_OPT.OBJ/xulrunner_build/i386/dist/universal/xulrunner/XUL.framework/Versions/Current
function cleanup {
cd $BASE_DIR
echo "Cleaning up.... "
printf "\n"
rm -f *.gz
rm -f COOLKEY.zip
}
function buildUSB {
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doUsb ];
then
echo "Do not build Usb"
return 0
fi
cd $BASE_DIR
echo "Build Lib USB... "
printf "\n"
curl --verbose -O -L $LIB_USB_URL_BASE/$LIB_USB_NAME.tar.gz
if [ $? != 0 ];
then
echo "Can't obtain tarball for Lib USB."
return 1
fi
tar -xzvf $LIB_USB_NAME.tar.gz
if [ $? != 0 ];
then
echo "Can't unpack Lib USB tarball."
return 1
fi
cd $LIB_USB_NAME
./configure --disable-dependency-tracking --prefix=$COOLKEY_PATH CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" LDFLAGS="-arch ppc -arch i386"
if [ $? != 0 ];
then
echo "Can't configure Lib USB."
return 1
fi
cp $LIBTOOL_USB_PATCH .
patch -p0 -N < libtool.usb.patch
make
if [ $? != 0 ];
then
echo "Can't make Lib USB."
return 1
fi
make DESTDIR=${PWD}/../staging install
return 0
}
function buildEGATE {
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEgate ];
then
echo "Do not build Egate"
return 0
fi
echo "Build IFD-EGATE ... "
printf "\n"
cd $BASE_DIR
curl --verbose -O $IFD_EGATE_URL_BASE/$IFD_EGATE_NAME-$IFD_EGATE_REL.src.rpm
if [ $? != 0 ];
then
echo "Can't obtain RPM for Egate."
return 1
fi
$OSX_RPM_PATH/rpm -ihv --define="_topdir ${PWD}" $IFD_EGATE_NAME-$IFD_EGATE_REL.src.rpm
$OSX_RPM_PATH/rpmbuild --nodeps -bp --define="_topdir ${PWD}" SPECS/ifd-egate.spec
cd BUILD/$IFD_EGATE_NAME
make PCSC_CFLAGS=-I/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers USB_CFLAGS="-I../../staging/usr/local/CoolKey/include -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386" USB_LDFLAGS="-L../../staging/usr/local/CoolKey/lib -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" -f Makefile-OSX
if [ $? != 0 ];
then
echo "Can't buld Egate."
return 1
fi
cp ../../misc/Makefile-OSX.egate.patch .
patch -p0 -N < Makefile-OSX.egate.patch
make -f Makefile-OSX DESTDIR=${PWD}/../../staging install
}
function buildCOOLKEY {
echo "Build CoolKey... "
printf "\n"
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doCoolKey ];
then
echo "Do not build CoolKey"
return 0
fi
echo "ENABLE_PK11INSTALLL $ENABLE_PK11INSTALL"
cd $BASE_DIR
cvs -d $FEDORA_CVS_ROOT co -r $COOLKEY_TAG coolkey
if [ $? != 0 ];
then
echo "Can't checkout CoolKey code..."
return 1
fi
cd coolkey
/usr/bin/autoconf
if [ $? != 0 ];
then
echo "CoolKey autoconf failed..."
return 1
fi
./configure --disable-dependency-tracking --prefix=$COOLKEY_PATH NSS_CFLAGS="-I ${PWD}/../esc/dist/Dar*/xulrunner_build/i386/dist/public/nss -I ${PWD}/../esc/dist/Dar*/xulrunner_build/i386/dist/include/nspr" NSS_LIBS="-L${PWD}/../esc/dist/Darwin6.8_OPT.OBJ/xulrunner_build/i386/dist/universal/xulrunner/XUL.framework/Versions/Current -Wl,-executable_path,${PWD}/../esc/dist/Darwin6.8_OPT.OBJ/xulrunner_build/i386/dist/universal/xulrunner/XUL.framework/Versions/Current"
if [ $? != 0 ];
then
echo "Coolkey configure failed..."
return 1
fi
cp ../misc/libtool.coolkey.patch .
patch -p0 -N < libtool.coolkey.patch
make clean
make
if [ $? != 0 ];
then
echo "Can't make coolkey."
return 1
fi
if [ $ENABLE_PK11INSTALL ];
then
echo "Making PK11INSTALL!!!! ......"
cd src/install
make
if [ $? != 0 ];
then
echo "Can't re-make coolkey."
return 1
fi
make install DESTDIR=$BASE_DIR/staging
cd ../..
fi
make install DESTDIR=$BASE_DIR/staging
# Manually give pk11install the NSS/NSPR dylibs it needs
cp -f $PK11INSTALL_LIB_PATH/libsoftokn3.dylib ../staging/$COOLKEY_PATH/bin
cp -f $PK11INSTALL_LIB_PATH/libplc4.dylib ../staging/$COOLKEY_PATH/bin
cp -f $PK11INSTALL_LIB_PATH/libplds4.dylib ../staging/$COOLKEY_PATH/bin
cp -f $PK11INSTALL_LIB_PATH/libnspr4.dylib ../staging/$COOLKEY_PATH/bin
return 0
}
function buildESC {
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ];
then
echo "Do not build ESC"
return 0
fi
echo "Build ESC ... "
printf "\n"
cd $BASE_DIR
if [ -d esc ];
then
cvs -d $FEDORA_CVS_ROOT update esc
else
cvs -d $FEDORA_CVS_ROOT co esc
fi
if [ $? != 0 ];
then
echo "Can't checkout ESC code."
return 1
fi
cd esc
mkdir -p dist/src
cd dist/src
cvs -d $MOZ_CVS_ROOT co -r $MOZ_XULRUNNER_BRANCH mozilla/client.mk
if [ $? != 0 ];
then
echo "Can't checkout Xulrunner code."
return 1
fi
cd mozilla
make -f client.mk checkout MOZ_CO_PROJECT=xulrunner
if [ $? != 0 ];
then
echo "Can't checkout Xulrunner code."
return 1
fi
cd ../../..
make BUILD_OPT=1 ESC_VERSION=$ESC_VERSION CKY_INCLUDE=-I$BASE_DIR/staging/$COOLKEY_PATH/include CKY_LIB_LDD=-L$BASE_DIR/staging/$COOLKEY_PATH/lib
if [ $? != 0 ];
then
echo "Can't make ESC."
return 1
fi
rsync -rl dist/Dar*/esc_build/ESC.app ../staging/Applications
return 0
}
function obtainTokenD {
echo "TOKEND_PATH_NAME $TOKEND_PATH_NAME"
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doTokenD ];
then
echo "Do not obtain TokenD"
return 0
fi
cd $BASE_DIR
echo "Obtaining the Mac TokenD driver...."
printf "\n"
if [ ! -f $TOKEND_PATH_NAME ];
then
echo "TokenD not found!..."
return 0;
fi
echo "TokenD found.... "
printf "\n"
cp $TOKEND_PATH_NAME .
if [ $? != 0 ];
then
echo "Can't find the TokenD zip file!"
return 0
fi
mkdir -p staging/$TOKEND_DEST_PATH
unzip COOLKEY.zip
if [ $? != 0 ];
then
echo "Can't unzip TokenD!"
return 0
fi
mv COOLKEY.tokend ./staging/$TOKEND_DEST_PATH/A_COOLKEY.tokend
if [ $? != 0 ];
then
echo "Can't rename TokenD bundle!."
return 0
fi
return 0
}
function buildMacPackage {
if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doInstaller ];
then
echo "Do not build SmartCardManager installer"
return 0
fi
cd $BASE_DIR
echo "Building final Mac installer package... "
printf "\n"
mkdir -p staging/$PK11INSTALL_PATH
cp coolkey_package_data/pk11install.command staging/$PK11INSTALL_PATH
cp $BASE_DIR/coolkey_package_data/es-client.icns $BASE_DIR/staging/Applications/ESC.app/Contents/Resources/xulrunner.icns
defaults write $BASE_DIR/staging/Applications/ESC.app/Contents/Info "CFBundleIconFile" 'xulrunner.icns'
if [ $? != 0 ];
then
echo "Can't configure ESC for custom icon file."
return 1
fi
# Get rid of stray .DS_Store files
find ./staging -name ".DS_Store" -exec rm -f {} \;
# Set bunch of permissions
echo "Setting file permissions.."
sudo chown -R -v -h root:wheel staging/usr
sudo chown -R -v -h root:wheel staging/System
sudo chown -R -v -h root:admin staging/Applications
sudo chmod -R 755 staging/usr
sudo chmod -R 775 staging/Applications
sudo chmod -R 755 staging/System
echo "About to create pkg installer..."
$PACKAGE_MAKER_PATH/PackageMaker -build -p $COOLKEY_PKG_NAME -f $BASE_DIR/staging -i $BASE_DIR/coolkey_package_data/Info.plist -d $BASE_DIR/coolkey_package_data/Description.plist -r $BASE_DIR/coolkey_package_data/Resources
if [ $? != 0 ];
then
echo "Can't build CoolKey installer package."
return 1
fi
echo "Creating final dmg file .... "
printf "\n"
hdiutil create -format UDZO -fs HFS+ -volname $COOLKEY_VOL_NAME -srcfolder $COOLKEY_PKG_NAME $COOLKEY_DMG_NAME
if [ $? != 0 ];
then
echo "Can't create final ESC DMG archive."
return 1
fi
return 0
}
function initializeBuild {
echo "Initializing system for Mac build..... "
printf "\n"
sudo chown -R -v -h ${USER}:${USER} staging/usr
sudo chown -R -v -h ${USER}:${USER} staging/System
sudo chown -R -v -h ${USER}:${USER} staging/Applications
echo "Setting default compiler to gcc 4.0.1 ...... "
printf "\n"
sudo gcc_select 4.0
rm -rf staging/CVS
rm -rf staging/$TOKEND_DEST_PATH
rm -rf *.dmg
mkdir -p BUILD
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
mkdir -p SPECS
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
mkdir -p SOURCES
if [ $? != 0 ];
then
echo "Problem setting up build...."
exit 1
fi
}
function usage {
echo "usage: ./build.sh [ -doUsb || -doEgate -doEsc || -doCoolKey || -doTokenD || -doInstaller ]"
}
function processARGS {
if [ $NUM_ARGS -ne 1 ] ;
then
if [ $NUM_ARGS -ne 0 ];
then
echo "Number of args must be 1 or 0 !"
usage
exit 1
fi
fi
if [ -z $THE_ARG ];
then
return
fi
if [ $THE_ARG != -doUsb ] && [ $THE_ARG != -doEgate ] && [ $THE_ARG != -doEsc ] && [ $THE_ARG != -doCoolKey ] && [ $THE_ARG != -doTokenD ] && [ $THE_ARG != -doInstaller ];
then
echo "Incorrect arguments!"
usage
exit 1
fi
}
##################################### main ##############################################################
NUM_ARGS=$#
THE_ARG=$1
processARGS
initializeBuild
buildUSB
if [ $? != 0 ];
then
exit 1
fi
buildEGATE
if [ $? != 0 ];
then
exit 1
fi
# Build coolkey because ESC needs it
buildCOOLKEY
if [ $? != 0 ];
then
exit 1
fi
buildESC
if [ $? != 0 ];
then
exit 1
fi
# Build coolkey, now with pk11install
ENABLE_PK11INSTALL=--enable-pk11install
buildCOOLKEY
if [ $? != 0 ];
then
exit 1
fi
obtainTokenD
if [ $? != 0 ];
then
exit 1
fi
buildMacPackage
if [ $? != 0 ];
then
exit 1
fi
cleanup
16 years, 8 months