From fedora-directory-commits at redhat.com Tue Nov 1 23:00:13 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 1 Nov 2005 18:00:13 -0500
Subject: [Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.30,
1.31
Message-ID: <200511012300.jA1N0Ddu000338@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv318
Modified Files:
internal_comp_deps.mk
Log Message:
Pull ldapconsole from integration area
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- internal_comp_deps.mk 31 Oct 2005 15:55:24 -0000 1.30
+++ internal_comp_deps.mk 1 Nov 2005 23:00:05 -0000 1.31
@@ -549,9 +549,9 @@
# LDAP Console java classes
###########################################################
-#LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
ifeq ($(BUILD_MODE), int)
-LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
+#LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
+LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
else
LDAPCONSOLE_RELEASE=$(FED_COMPONENTS_DIR)
endif
From fedora-directory-commits at redhat.com Wed Nov 2 01:15:25 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 1 Nov 2005 20:15:25 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
htmladmin.c, 1.4, 1.5 htmladmin.properties, 1.4, 1.5
Message-ID: <200511020115.jA21FP9x006184@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6161/adminserver/admserv/cgi-src40
Modified Files:
htmladmin.c htmladmin.properties
Log Message:
Bug(s) fixed: 172249
Bug Description: admin express pages not working with Fedora DS 1.0
Reviewed by: Nathan, Noriko (Thanks!)
Fix Description: The htmladmin admin express code was checking to see if
the version was >= 4.2. I just removed all version checking code. A
quick search of other admin server code did not reveal any similar
version checking. I also found a typo in the properties file (tarbbget?).
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: htmladmin.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmladmin.c 18 Aug 2005 18:59:03 -0000 1.4
+++ htmladmin.c 2 Nov 2005 01:15:17 -0000 1.5
@@ -285,11 +285,9 @@
/*
* Given an SIE, figure out what the URL of its local Admin Server is.
- * Also, determine whether its local Admin Server supports Admin Express or not:
- * if it's pre-Admin Express (i.e. pre-4.2), int *preAE returns 1, otherwise 0.
*/
-char *get_admin_url(LDAP *server, char *sie, int *preAE) {
+char *get_admin_url(LDAP *server, char *sie) {
LDAPMessage *result;
LDAPMessage *entry;
@@ -337,7 +335,7 @@
isie++; /* eliminate spaces */
/*
- * Get product version from ISIE; if less than 4.2, this Admin Server does not fully support Admin Express
+ * Get the ISIE entry
*/
if((ldapError = ldap_search_s(server, isie, LDAP_SCOPE_BASE,
@@ -346,17 +344,6 @@
entry = ldap_first_entry(server, result);
- *preAE = 0;
- if((vals = ldap_get_values(server, entry, ISIE_PRODVER_ATTR)) != NULL) {
- int major, minor;
-
- major = atoi(strtok(vals[0], "."));
- minor = atoi(strtok(NULL, "\0"));
-
- if((major < 4) || (major == 4 && minor < 2))
- *preAE = 1;
- }
-
/*
* Now search the SIE's configuration object to get the port and the security status.
*/
@@ -1220,7 +1207,6 @@
char *href;
char *info_link;
char *log_link;
- int preAE;
if(legacy) {
/* show server id, link to 3.x Admin Server page and move on */
@@ -1239,7 +1225,7 @@
continue;
}
- if(!(admin_url = get_admin_url(server, ldap_get_dn(server, sie_entry), &preAE)))
+ if(!(admin_url = get_admin_url(server, ldap_get_dn(server, sie_entry))))
continue;
if(!get_host_and_port(server, ldap_get_dn(server, sie_entry), sie_entry, &server_host, &server_port))
@@ -1282,26 +1268,19 @@
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(dirs)) + 2);
- sprintf(log_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]),
- htmladmin_strdup_escaped(dirs));
- }
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(dirs)) + 2);
+ sprintf(log_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ADMIN_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]),
+ htmladmin_strdup_escaped(dirs));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -1342,31 +1321,23 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- repl_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link, getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
- sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]));
-
- repl_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK)) + strlen(admin_url)*2 + strlen(htmladmin_strdup_escaped(host)) + strlen(getenv("NETSITE_ROOT")) + /*space for port num*/ 12);
- sprintf(repl_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK),
- admin_url,
- htmladmin_strdup_escaped(host),
- server_port[0],
- admin_url,
- getenv("NETSITE_ROOT"));
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link, getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
+ sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]));
+
+ repl_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK)) + strlen(admin_url)*2 + strlen(htmladmin_strdup_escaped(host)) + strlen(getenv("NETSITE_ROOT")) + /*space for port num*/ 12);
+ sprintf(repl_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_DIRECTORY_REPL_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(host),
+ server_port[0],
+ admin_url,
+ getenv("NETSITE_ROOT"));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS_WITH_REPL),
@@ -1392,24 +1363,17 @@
if(dirs) {
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
sprintf(info_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(dirs)) + 2);
sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_MSG_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]),
- htmladmin_strdup_escaped(dirs));
- }
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]),
+ htmladmin_strdup_escaped(dirs));
fprintf(stdout,
@@ -1512,22 +1476,15 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
- sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]));
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + 2);
+ sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_ES_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -1566,22 +1523,15 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]));
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(log_link, (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_CMS_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]));
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -1618,26 +1568,19 @@
view ? viewparam : "");
}
- if(preAE) {
- info_link = strdup("");
- log_link = strdup("");
- }
- else {
-
- info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
- sprintf(info_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK),
- admin_url,
- htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
-
- log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(vals[0])) + 3);
- sprintf(log_link,
- (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK),
- admin_url,
- htmladmin_strdup_escaped(vals[0]),
- htmladmin_strdup_escaped(vals[0]),
- FILE_PATHSEP);
- }
+ info_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry))) + 2);
+ sprintf(info_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_INFO_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(ldap_get_dn(server, sie_entry)));
+
+ log_link = (char *)malloc(strlen(getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK)) + strlen(admin_url) + strlen(htmladmin_strdup_escaped(vals[0])) + strlen(htmladmin_strdup_escaped(vals[0])) + 3);
+ sprintf(log_link,
+ (const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_OTHER_LOG_LINK),
+ admin_url,
+ htmladmin_strdup_escaped(vals[0]),
+ htmladmin_strdup_escaped(vals[0]),
+ FILE_PATHSEP);
fprintf(stdout,
(const char*)getResourceString(DBT_OUTPUT_TOPOLOGY_STATUS),
@@ -2053,7 +1996,6 @@
char **serverid;
char **serverroot;
char *sie;
- int preAE;
int count, max_count;
if(strstr(object, "Messaging")) {
@@ -2118,7 +2060,7 @@
else
active_port = ports[0];
- if((admin_url = get_admin_url(server, sie, &preAE)) == NULL)
+ if((admin_url = get_admin_url(server, sie)) == NULL)
goto output_topology;
count=0;
Index: htmladmin.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmladmin.properties 18 Aug 2005 18:59:03 -0000 1.4
+++ htmladmin.properties 2 Nov 2005 01:15:17 -0000 1.5
@@ -73,7 +73,7 @@
htmladmin68 { " " }
htmladmin69 { " " }
htmladmin70 { "Server Info |\n" }
-htmladmin71 { "Logs |\n" }
+htmladmin71 { "Logs |\n" }
htmladmin72 { "%s%s Status=%s%s\n\n" }
htmladmin73 { "On" }
htmladmin74 { "Off" }
From fedora-directory-commits at redhat.com Thu Nov 3 15:31:46 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 10:31:46 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd saslbind.c, 1.10, 1.11
Message-ID: <200511031531.jA3FVkSZ018800@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18776
Modified Files:
saslbind.c
Log Message:
Bug(s) fixed: 166229, 166081
Bug Description: slapd crashes during SASL authentication
Reviewed by: Noriko (Thanks!)
Branch: HEAD and Directory71RtmBranch
Fix Description: When we build cyrus-sasl on RHEL, we tell it to use
berkeley db for its sasldb database. It uses whatever version of
berkeley db is installed in the system. On RHEL3, this is usually
libdb-4.1. However, at runtime, slapd uses 4.2, leading to conflicts.
This doesn't happen on RHEL4 because it already has 4.2 on it. The db
is used to lookup auxiliary properties (auxprop) related to the user,
such as password or whatever. This happens in sasl after the user is
looked up. In our server, the way we use it, we don't care about these
auxprops, or we get them in another way. If you don't tell sasl which
auxprop plugin you want to use, it tries to use all of them, which means
it will attempt to use the sasldb plugin, which will lead to the crash.
The solution is to add our own auxprop plugin which is just a dummy that
does nothing, and tell sasl to use our plugin.
Platforms tested: RHEL3, RHEL4
Flag Day: no
Doc impact: no
QA impact: retest
New Tests integrated into TET: none
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- saslbind.c 29 Aug 2005 22:11:05 -0000 1.10
+++ saslbind.c 3 Nov 2005 15:31:38 -0000 1.11
@@ -95,6 +95,56 @@
* sasl library callbacks
*/
+/*
+ * We've added this auxprop stuff as a workaround for RHDS bug 166229
+ * and FDS bug 166081. The problem is that sasldb is configured and
+ * enabled by default, but we don't want or need to use it. What
+ * happens after canon_user is that sasl looks up any auxiliary
+ * properties of that user. If you don't tell sasl which auxprop
+ * plug-in to use, it tries all of them, including sasldb. In order
+ * to avoid this, we create a "dummy" auxprop plug-in with the name
+ * "iDS" and tell sasl to use this plug-in for auxprop lookups.
+ * The reason we don't need auxprops is because when we grab the user's
+ * entry from the internal database, at the same time we get any other
+ * properties we need - it's more efficient that way.
+ */
+static void ids_auxprop_lookup(void *glob_context __attribute__((unused)),
+ sasl_server_params_t *sparams __attribute__((unused)),
+ unsigned flags __attribute__((unused)),
+ const char *user __attribute__((unused)),
+ unsigned ulen __attribute__((unused)))
+{
+ /* do nothing - we don't need auxprops - we just do this to avoid
+ sasldb_auxprop_lookup */
+}
+
+static sasl_auxprop_plug_t ids_auxprop_plugin = {
+ 0, /* Features */
+ 0, /* spare */
+ NULL, /* glob_context */
+ NULL, /* auxprop_free */
+ ids_auxprop_lookup, /* auxprop_lookup */
+ "iDS", /* name */
+ NULL /* auxprop_store */
+};
+
+int ids_auxprop_plug_init(const sasl_utils_t *utils __attribute__((unused)),
+ int max_version,
+ int *out_version,
+ sasl_auxprop_plug_t **plug,
+ const char *plugname __attribute__((unused)))
+{
+ if(!out_version || !plug) return SASL_BADPARAM;
+
+ if(max_version < SASL_AUXPROP_PLUG_VERSION) return SASL_BADVERS;
+
+ *out_version = SASL_AUXPROP_PLUG_VERSION;
+
+ *plug = &ids_auxprop_plugin;
+
+ return SASL_OK;
+}
+
static int ids_sasl_getopt(
void *context,
const char *plugin_name,
@@ -121,6 +171,8 @@
if (LDAPDebugLevelIsSet(LDAP_DEBUG_TRACE)) {
*result = "6"; /* SASL_LOG_TRACE */
}
+ } else if (strcasecmp(option, "auxprop_plugin") == 0) {
+ *result = "iDS";
}
if (*result) *len = strlen(*result);
@@ -576,6 +628,8 @@
#endif
#endif
+ result = sasl_auxprop_add_plugin("iDS", ids_auxprop_plug_init);
+
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_init\n", 0, 0, 0 );
return result;
From fedora-directory-commits at redhat.com Thu Nov 3 15:36:27 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 10:36:27 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd saslbind.c, 1.9.2.1, 1.9.2.2
Message-ID: <200511031536.jA3FaRZv018876@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18860
Modified Files:
Tag: Directory71RtmBranch
saslbind.c
Log Message:
Bug(s) fixed: 166229, 166081
Bug Description: slapd crashes during SASL authentication
Reviewed by: Noriko (Thanks!)
Branch: HEAD and Directory71RtmBranch
Fix Description: When we build cyrus-sasl on RHEL, we tell it to use
berkeley db for its sasldb database. It uses whatever version of
berkeley db is installed in the system. On RHEL3, this is usually
libdb-4.1. However, at runtime, slapd uses 4.2, leading to conflicts.
This doesn't happen on RHEL4 because it already has 4.2 on it. The db
is used to lookup auxiliary properties (auxprop) related to the user,
such as password or whatever. This happens in sasl after the user is
looked up. In our server, the way we use it, we don't care about these
auxprops, or we get them in another way. If you don't tell sasl which
auxprop plugin you want to use, it tries to use all of them, which means
it will attempt to use the sasldb plugin, which will lead to the crash.
The solution is to add our own auxprop plugin which is just a dummy that
does nothing, and tell sasl to use our plugin.
Platforms tested: RHEL3, RHEL4
Flag Day: no
Doc impact: no
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- saslbind.c 29 Aug 2005 22:06:25 -0000 1.9.2.1
+++ saslbind.c 3 Nov 2005 15:36:19 -0000 1.9.2.2
@@ -95,6 +95,56 @@
* sasl library callbacks
*/
+/*
+ * We've added this auxprop stuff as a workaround for RHDS bug 166229
+ * and FDS bug 166081. The problem is that sasldb is configured and
+ * enabled by default, but we don't want or need to use it. What
+ * happens after canon_user is that sasl looks up any auxiliary
+ * properties of that user. If you don't tell sasl which auxprop
+ * plug-in to use, it tries all of them, including sasldb. In order
+ * to avoid this, we create a "dummy" auxprop plug-in with the name
+ * "iDS" and tell sasl to use this plug-in for auxprop lookups.
+ * The reason we don't need auxprops is because when we grab the user's
+ * entry from the internal database, at the same time we get any other
+ * properties we need - it's more efficient that way.
+ */
+static void ids_auxprop_lookup(void *glob_context __attribute__((unused)),
+ sasl_server_params_t *sparams __attribute__((unused)),
+ unsigned flags __attribute__((unused)),
+ const char *user __attribute__((unused)),
+ unsigned ulen __attribute__((unused)))
+{
+ /* do nothing - we don't need auxprops - we just do this to avoid
+ sasldb_auxprop_lookup */
+}
+
+static sasl_auxprop_plug_t ids_auxprop_plugin = {
+ 0, /* Features */
+ 0, /* spare */
+ NULL, /* glob_context */
+ NULL, /* auxprop_free */
+ ids_auxprop_lookup, /* auxprop_lookup */
+ "iDS", /* name */
+ NULL /* auxprop_store */
+};
+
+int ids_auxprop_plug_init(const sasl_utils_t *utils __attribute__((unused)),
+ int max_version,
+ int *out_version,
+ sasl_auxprop_plug_t **plug,
+ const char *plugname __attribute__((unused)))
+{
+ if(!out_version || !plug) return SASL_BADPARAM;
+
+ if(max_version < SASL_AUXPROP_PLUG_VERSION) return SASL_BADVERS;
+
+ *out_version = SASL_AUXPROP_PLUG_VERSION;
+
+ *plug = &ids_auxprop_plugin;
+
+ return SASL_OK;
+}
+
static int ids_sasl_getopt(
void *context,
const char *plugin_name,
@@ -121,6 +171,8 @@
if (LDAPDebugLevelIsSet(LDAP_DEBUG_TRACE)) {
*result = "6"; /* SASL_LOG_TRACE */
}
+ } else if (strcasecmp(option, "auxprop_plugin") == 0) {
+ *result = "iDS";
}
if (*result) *len = strlen(*result);
@@ -576,6 +628,8 @@
#endif
#endif
+ result = sasl_auxprop_add_plugin("iDS", ids_auxprop_plug_init);
+
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_init\n", 0, 0, 0 );
return result;
From fedora-directory-commits at redhat.com Thu Nov 3 18:57:51 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 13:57:51 -0500
Subject: [Fedora-directory-commits] mod_admserv makerpm.sh, NONE,
1.1 mod_admserv.spec, NONE, 1.1
Message-ID: <200511031857.jA3IvpTD025838@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822
Added Files:
makerpm.sh mod_admserv.spec
Log Message:
added spec file for building mod_admserv rpm
--- NEW FILE makerpm.sh ---
#!/bin/sh -xv
# This script provides an example of how to build the various flavors
# of the mod_admserv rpm. If you don't have a source tarball, you
# can create one from checking out the source tree (which you presumably
# have if you have checked out this script) and putting it in
# SOURCES/mod_admserv-1.0.tar.gz. The things you need to define below
# are:
# RPM_PLATFORM - one of RHEL3, RHEL4, FC3, FC4, etc. - should correspond
# to our internal build platform naming convention
# FLAVOR - use dbg for debug builds and opt for optimized builds
# NSPRDIR - directory holding NSPR include and lib directories
# NSSDIR - directory holding NSS include and lib directories
# LDAPSDKDIR - directory holding Mozilla C LDAP SDK include and lib directories
# ADMINUTILDIR - directory holding Adminutil include and lib directories
mkdirs() {
for d in "$@" ; do
if [ -d $d ]; then
mv $d $d.deleted
rm -rf $d.deleted &
fi
mkdir -p $d
done
}
#mkdirs SOURCES BUILD SRPMS RPMS
#cd SOURCES
#cvs -d $FEDCVSROOT co -d mod_admserv-1.0 mod_admserv
#tar cf - mod_admserv-1.0 | gzip > mod_admserv-1.0.tar.gz
#rm -rf mod_admserv-1.0
#cd ..
# define PLATFORM to be RHEL3, RHEL4, FC3, FC4, etc.
RPM_PLATFORM=RHEL4
# define FLAVOR to be dbg or opt for debug or optimized build
FLAVOR=dbg
# root dir for RPM built and temp files
ABS_TOPDIR=`pwd`
arch=`uname -i`
#mkdirs RPMS/$arch
# now define the locations of our components
NSPRDIR=/share/builds/components/nspr/v4.4.1/RHEL4_x86_gcc3_DBG.OBJ
NSSDIR=/share/builds/components/nss/NSS_3_9_3_RTM/RHEL4_x86_gcc3_DBG.OBJ
LDAPSDKDIR=/share/builds/components/ldapsdk50/v5.16/RHEL4_x86_gcc3_DBG.OBJ
ADMINUTILDIR=/home/rich/adminutil/adminutil/built/adminutil/RHEL4_x86_gcc3_DBG.OBJ
rpmbuild --define "_topdir $ABS_TOPDIR" --define "_sourcedir $ABS_TOPDIR/SOURCES" --define "_rpmdir $ABS_TOPDIR/RPMS" --define "_srcrpmdir $ABS_TOPDIR/SRPMS" --define "ARCH $arch" --define "flavor $FLAVOR" --define "platform $RPM_PLATFORM" --define "nsprincdir $NSPRDIR/include" --define "nsprlibdir $NSPRDIR/lib" --define "nssincdir $NSSDIR/include" --define "nsslibdir $NSSDIR/lib" --define "ldapsdkincdir $LDAPSDKDIR/include" --define "ldapsdklibdir $LDAPSDKDIR/lib" --define "adminutildir $ADMINUTILDIR" --nodeps -ba mod_admserv.spec
--- NEW FILE mod_admserv.spec ---
# BEGIN COPYRIGHT BLOCK
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
%define product fedora
%define flavor
%define _build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.%{flavor}.rpm
Summary: mod_admserv
Name: mod_admserv
Version: 1.0
Release: 1.%{platform}
License: Apache 2.0
Group: System Environment/Daemons
URL: http://directory.fedora.redhat.com/
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: httpd-devel,apr-devel
# Without Autoreq: 0, rpmbuild finds all sorts of crazy
# dependencies that we don't care about, and refuses to install
Autoreq: 0
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
Requires: httpd,apr
Provides: mod_admserv
Prefix: /opt/%{product}-ds/bin/admin/lib
%description
An Apache 2.0 module for implementing the admin server functionality required by Red Hat and Fedora Admin Server and Directory Server
%prep
%setup -q
%build
%ifarch x86_64 ppc64 ia64 s390x
mycflags=-m64
%endif
if [ %{flavor} = 'dbg' ]; then
flag=-g
else
flag=-O2
fi
# configure requires nspr, nss, ldapsdk, adminutil
# if can't find apxs, use --with-apxs=/path/to/apxs
./configure --with-apr-config --with-nspr-inc=%{nsprincdir} --with-nspr-lib=%{nsprlibdir} --with-nss-inc=%{nssincdir} --with-nss-lib=%{nsslibdir} --with-ldapsdk-inc=%{ldapsdkincdir} --with-ldapsdk-lib=%{ldapsdklibdir} --with-adminutil=%{adminutildir}
CFLAGS="$flag $mycflags" make
%install
# we don't really want to install this in the system Apache modules dir
%{__mkdir_p} $RPM_BUILD_ROOT/%{prefix}
install -m 755 .libs/libmodadmserv.so $RPM_BUILD_ROOT%{prefix}
%clean
rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX
%files
# rather than listing individual files, we just package (and own)
# the entire ldapserver directory - if we change this to put
# files in different places, we won't be able to do this anymore
%defattr(-,root,root,-)
%{prefix}/libmodadmserv.so
%changelog
* Thu Nov 3 2005 Richard Megginson - 1.0
- Initial version
From fedora-directory-commits at redhat.com Thu Nov 3 19:41:08 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 14:41:08 -0500
Subject: [Fedora-directory-commits] mod_nss makerpm.sh, NONE,
1.1 mod_nss.spec, NONE, 1.1 Makefile.in, 1.10, 1.11 aclocal.m4,
1.3, 1.4 configure, 1.7, 1.8 missing, 1.1.1.1, 1.2
Message-ID: <200511031941.jA3Jf8vO027742@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27715
Modified Files:
Makefile.in aclocal.m4 configure missing
Added Files:
makerpm.sh mod_nss.spec
Log Message:
added mod_nss.spec and makerpm.sh
--- NEW FILE makerpm.sh ---
#!/bin/sh -xv
# This script provides an example of how to build the various flavors
# of the mod_nss rpm. If you don't have a source tarball, you
# can create one from checking out the source tree (which you presumably
# have if you have checked out this script) and putting it in
# SOURCES/mod_nss-1.0.tar.gz. The things you need to define below
# are:
# RPM_PLATFORM - one of RHEL3, RHEL4, FC3, FC4, etc. - should correspond
# to our internal build platform naming convention
# FLAVOR - use dbg for debug builds and opt for optimized builds
# NSPRDIR - directory holding NSPR include and lib directories
# NSSDIR - directory holding NSS include and lib directories
mkdirs() {
for d in "$@" ; do
if [ -d $d ]; then
mv $d $d.deleted
rm -rf $d.deleted &
fi
mkdir -p $d
done
}
mkdirs SOURCES BUILD SRPMS RPMS
cd SOURCES
cvs -d $FEDCVSROOT co -d mod_nss-1.0 mod_nss
tar cf - mod_nss-1.0 | gzip > mod_nss-1.0.tar.gz
rm -rf mod_nss-1.0
cd ..
# define PLATFORM to be RHEL3, RHEL4, FC3, FC4, etc.
RPM_PLATFORM=RHEL4
# define FLAVOR to be dbg or opt for debug or optimized build
FLAVOR=dbg
# root dir for RPM built and temp files
ABS_TOPDIR=`pwd`
arch=`uname -i`
#mkdirs RPMS/$arch
# now define the locations of our components
NSPRDIR=/share/builds/components/nspr/v4.4.1/RHEL4_x86_gcc3_DBG.OBJ
NSSDIR=/share/builds/components/nss/NSS_3_9_3_RTM/RHEL4_x86_gcc3_DBG.OBJ
rpmbuild --define "_topdir $ABS_TOPDIR" --define "_sourcedir $ABS_TOPDIR/SOURCES" --define "_rpmdir $ABS_TOPDIR/RPMS" --define "_srcrpmdir $ABS_TOPDIR/SRPMS" --define "ARCH $arch" --define "flavor $FLAVOR" --define "platform $RPM_PLATFORM" --define "nsprincdir $NSPRDIR/include" --define "nsprlibdir $NSPRDIR/lib" --define "nssincdir $NSSDIR/include" --define "nsslibdir $NSSDIR/lib" --nodeps -ba mod_nss.spec
--- NEW FILE mod_nss.spec ---
# BEGIN COPYRIGHT BLOCK
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
%define product fedora
%define flavor
%define _build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.%{flavor}.rpm
Summary: mod_nss
Name: mod_nss
Version: 1.0
Release: 1.%{platform}
License: Apache 2.0
Group: System Environment/Daemons
URL: http://directory.fedora.redhat.com/
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: httpd-devel,apr-devel
# Without Autoreq: 0, rpmbuild finds all sorts of crazy
# dependencies that we don't care about, and refuses to install
Autoreq: 0
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
Requires: httpd,apr
Provides: mod_nss
Prefix: /opt/%{product}-ds/bin/admin
%description
An Apache 2.0 module for implementing crypto using the Mozilla NSS crypto libraries. This supports SSLv3/TLSv1 including support for client certificate authentication. NSS provides web applications with a FIPS 140 certified crypto provider and support for a full range of PKCS11 devices.
%prep
%setup -q
%build
%ifarch x86_64 ppc64 ia64 s390x
mycflags=-m64
%endif
if [ %{flavor} = 'dbg' ]; then
flag=-g
else
flag=-O2
fi
# configure requires nspr, nss, ldapsdk, adminutil
# if can't find apxs, use --with-apxs=/path/to/apxs
./configure --with-apr-config --with-nspr-inc=%{nsprincdir} --with-nspr-lib=%{nsprlibdir} --with-nss-inc=%{nssincdir} --with-nss-lib=%{nsslibdir}
CFLAGS="$flag $mycflags" make
%install
# we don't really want to install this in the system Apache modules dir
%{__mkdir_p} $RPM_BUILD_ROOT/%{prefix}/lib
%{__mkdir_p} $RPM_BUILD_ROOT/%{prefix}/admin/bin
install -m 755 .libs/libmodnss.so $RPM_BUILD_ROOT%{prefix}/lib
install -m 755 nss_pcache $RPM_BUILD_ROOT%{prefix}/admin/bin
%clean
rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX
%files
# rather than listing individual files, we just package (and own)
# the entire ldapserver directory - if we change this to put
# files in different places, we won't be able to do this anymore
%defattr(-,root,root,-)
%{prefix}/lib/libmodnss.so
%{prefix}/admin/bin/nss_pcache
%changelog
* Thu Nov 3 2005 Richard Megginson - 1.0
- Initial version
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_nss/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 3 Oct 2005 14:59:26 -0000 1.10
+++ Makefile.in 3 Nov 2005 19:41:00 -0000 1.11
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,225 +13,290 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
+
+
+SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+bin_PROGRAMS = nss_pcache$(EXEEXT)
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/gencert.in \
+ $(srcdir)/nss.conf.in $(top_srcdir)/configure AUTHORS COPYING \
+ ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
+ install-sh ltmain.sh missing mkinstalldirs nss_expr_parse.c \
+ nss_expr_scan.c
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = nss.conf gencert
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libmodnss_la_LIBADD =
+am_libmodnss_la_OBJECTS = mod_nss.lo nss_engine_config.lo \
+ nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \
+ nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \
+ nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo \
+ nss_expr_scan.lo nss_util.lo nss_engine_rand.lo
+libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_nss_pcache_OBJECTS = nss_pcache.$(OBJEXT)
+nss_pcache_OBJECTS = $(am_nss_pcache_OBJECTS)
+nss_pcache_LDADD = $(LDADD)
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+ $(AM_YFLAGS)
+SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
+DIST_SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APR_CONFIG = @APR_CONFIG@
APXS = @APXS@
-AS = @AS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-OBJDUMP = @OBJDUMP@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSL2_FALSE = @SSL2_FALSE@
+SSL2_TRUE = @SSL2_TRUE@
STRIP = @STRIP@
VERSION = @VERSION@
YACC = @YACC@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
apache_bin = @apache_bin@
apache_conf = @apache_conf@
apache_inc = @apache_inc@
apache_prefix = @apache_prefix@
apr_inc = @apr_inc@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
nspr_dir = @nspr_dir@
nspr_inc = @nspr_inc@
nspr_lib = @nspr_lib@
nss_dir = @nss_dir@
nss_inc = @nss_inc@
nss_lib = @nss_lib@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
lib_LTLIBRARIES = libmodnss.la
-
-bin_PROGRAMS = nss_pcache
-
nss_pcache_SOURCES = nss_pcache.c
-
libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c nss_engine_rand.c
-
INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@
-LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4
@SSL2_TRUE at AM_CFLAGS = -DWANT_SSL2
-
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = nss.conf gencert
-LTLIBRARIES = $(lib_LTLIBRARIES)
-
-libmodnss_la_LDFLAGS =
-libmodnss_la_LIBADD =
-am_libmodnss_la_OBJECTS = mod_nss.lo nss_engine_config.lo \
- nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \
- nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \
- nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo nss_expr_scan.lo \
- nss_util.lo nss_engine_rand.lo
-libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS)
-bin_PROGRAMS = nss_pcache$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_nss_pcache_OBJECTS = nss_pcache.$(OBJEXT)
-nss_pcache_OBJECTS = $(am_nss_pcache_OBJECTS)
-nss_pcache_LDADD = $(LDADD)
-nss_pcache_DEPENDENCIES =
-nss_pcache_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_nss.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_config.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_init.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_io.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_kernel.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_log.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_pphrase.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_rand.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_vars.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_eval.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_parse.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_scan.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nss_pcache.Po ./$(DEPDIR)/nss_util.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-CFLAGS = @CFLAGS@
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-DIST_SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS TODO aclocal.m4 config.guess config.sub \
- configure configure.in depcomp gencert.in install-sh ltmain.sh \
- missing mkinstalldirs nss.conf.in nss_expr_parse.c \
- nss_expr_scan.c
-SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .l .lo .o .obj .y
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): configure.in
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-nss.conf: $(top_builddir)/config.status nss.conf.in
+nss.conf: $(top_builddir)/config.status $(srcdir)/nss.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-gencert: $(top_builddir)/config.status gencert.in
+gencert: $(top_builddir)/config.status $(srcdir)/gencert.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-libLTLIBRARIES_INSTALL = $(INSTALL)
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test -z "$dir" && dir=.; \
+ test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libmodnss.la: $(libmodnss_la_OBJECTS) $(libmodnss_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libmodnss_la_LDFLAGS) $(libmodnss_la_OBJECTS) $(libmodnss_la_LIBADD) $(LIBS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@@ -245,7 +310,7 @@
$(LINK) $(nss_pcache_LDFLAGS) $(nss_pcache_OBJECTS) $(nss_pcache_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -266,42 +331,40 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_pcache.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_util.Plo at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CCDEPMODE = @CCDEPMODE@
+ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
.l.c:
- $(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
+ $(LEXCOMPILE) $<
sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
rm -f $(LEX_OUTPUT_ROOT).c
.y.c:
- $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
- sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@
- rm -f y.tab.c
+ $(YACCCOMPILE) $<
if test -f y.tab.h; then \
to=`echo "$*_H" | sed \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
- sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \
+ sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
+ y.tab.h >$*.ht; \
rm -f y.tab.h; \
if cmp -s $*.ht $*.h; then \
rm -f $*.ht ;\
@@ -312,6 +375,8 @@
if test -f y.output; then \
mv y.output $*.output; \
fi
+ sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
+ rm -f y.tab.c
mostlyclean-libtool:
-rm -f *.lo
@@ -323,11 +388,6 @@
-rm -f libtool
uninstall-info-am:
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -336,6 +396,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -347,8 +408,24 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
@@ -357,30 +434,24 @@
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distcleancheck_listfiles = find . -type f -print
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/.
- @list='$(DISTFILES)'; for file in $$list; do \
+ $(mkdir_p) $(distdir)/.
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -401,26 +472,54 @@
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
$(am__remove_distdir)
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- $(am__remove_distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
- && cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -428,23 +527,40 @@
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- find $$dc_install_base -type f -print ; \
- exit 1; } >&2 ) \
- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @echo "$(distdir).tar.gz is ready for distribution" | \
- sed 'h;s/./=/g;p;x;p;x'
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
distcleancheck: distclean
- if test '$(srcdir)' = . ; then \
+ @if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left after distclean:" ; \
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
@@ -452,10 +568,10 @@
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
install-binPROGRAMS: install-libLTLIBRARIES
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -467,7 +583,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -475,12 +591,13 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "nss_expr_parse.cnss_expr_scan.c" || rm -f nss_expr_parse.c nss_expr_scan.c
+ -rm -f nss_expr_parse.c
+ -rm -f nss_expr_scan.c
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
@@ -488,13 +605,17 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-libtool distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
@@ -511,7 +632,9 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf autom4te.cache
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -519,20 +642,30 @@
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
uninstall-libLTLIBRARIES
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libLTLIBRARIES clean-libtool dist dist-all \
- dist-gzip distcheck distclean distclean-compile \
- distclean-depend distclean-generic distclean-libtool \
- distclean-tags distcleancheck distdir dvi dvi-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-info-am uninstall-libLTLIBRARIES
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/mod_nss/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aclocal.m4 26 Sep 2005 20:01:24 -0000 1.3
+++ aclocal.m4 3 Nov 2005 19:41:00 -0000 1.4
@@ -1,6 +1,6 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11,4389 +11,6935 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Do all the work for Automake. -*- Autoconf -*-
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+# serial 47 AC_PROG_LIBTOOL
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [m4_define([AC_PROVIDE_IFELSE],
+ [m4_ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
-# 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.
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [AC_LIBTOOL_CXX],
+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+ ])])
+dnl And a similar setup for Fortran 77 support
+ AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [AC_LIBTOOL_F77],
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [ifdef([AC_PROG_GCJ],
+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([A][M_PROG_GCJ],
+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([LT_AC_PROG_GCJ],
+ [define([LT_AC_PROG_GCJ],
+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-# serial 8
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
-AC_PREREQ([2.52])
-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
[...10421 lines suppressed...]
- if test x"$enable_ltdl_install" = x"yes"; then
- ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- else
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
- LTDLINCL=
- fi
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])
+# 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.
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+# serial 1
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_executable_p="test -f"
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
- fi
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
done
- done
-done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
-} ||
-{
- tmp=$TMPDIR/sed$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
-{
- echo "$me: cannot create a temporary directory in $TMPDIR" >&2
- { (exit 1); exit 1; }
-}
- _max=0
- _count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
- # along with /bin/sed that truncates output.
- for _sed in $_sed_list /usr/xpg4/bin/sed; do
- test ! -f ${_sed} && break
- cat /dev/null > "$tmp/sed.in"
- _count=0
- echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
- # Check for GNU sed and select it if it is found.
- if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
- lt_cv_path_SED=${_sed}
- break
- fi
- while true; do
- cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
- mv "$tmp/sed.tmp" "$tmp/sed.in"
- cp "$tmp/sed.in" "$tmp/sed.nl"
- echo >>"$tmp/sed.nl"
- ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
- cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
- # 40000 chars as input seems more than enough
- test $_count -gt 10 && break
- _count=`expr $_count + 1`
- if test $_count -gt $_max; then
- _max=$_count
- lt_cv_path_SED=$_sed
- fi
- done
- done
- rm -rf "$tmp"
-])
-if test "X$SED" != "X"; then
- lt_cv_path_SED=$SED
-else
- SED=$lt_cv_path_SED
-fi
-AC_MSG_RESULT([$SED])
-])
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_nss/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure 26 Sep 2005 20:01:25 -0000 1.7
+++ configure 3 Nov 2005 19:41:00 -0000 1.8
@@ -1,9 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -20,9 +19,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -41,7 +41,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -218,16 +218,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -240,17 +241,6 @@
$as_unset CDPATH
-# Find the correct PATH separator. Usually this is `:', but
-# DJGPP uses `;' like DOS.
-if test "X${PATH_SEPARATOR+set}" != Xset; then
- UNAME=${UNAME-`uname 2>/dev/null`}
- case X$UNAME in
- *-DOS) lt_cv_sys_path_separator=';' ;;
- *) lt_cv_sys_path_separator=':' ;;
- esac
- PATH_SEPARATOR=$lt_cv_sys_path_separator
-fi
-
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -269,7 +259,7 @@
elif test "X$1" = X--fallback-echo; then
# Avoid inline document here, it may be left over
:
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
# Yippee, $echo works!
:
else
@@ -281,7 +271,7 @@
# used as fallback echo
shift
cat </dev/null`" = 'X\t' &&
echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
@@ -325,7 +316,7 @@
break
fi
done
- IFS="$save_ifs"
+ IFS="$lt_save_ifs"
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
@@ -399,6 +390,11 @@
+
+tagnames=${tagnames+${tagnames},}CXX
+
+tagnames=${tagnames+${tagnames},}F77
+
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
@@ -466,7 +462,7 @@
# include
#endif"
-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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT SSL2_TRUE SSL2_FALSE APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib nss_inc nss_lib nspr_dir nss_dir LIBOBJS 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB!
LEX_OUTPUT_ROOT SSL2_TRUE SSL2_FALSE APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib nss_inc nss_lib nspr_dir nss_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -825,7 +821,7 @@
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -865,10 +861,10 @@
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -927,6 +923,26 @@
ac_env_CPP_value=$CPP
ac_cv_env_CPP_set=${CPP+set}
ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
+ac_env_F77_set=${F77+set}
+ac_env_F77_value=$F77
+ac_cv_env_F77_set=${F77+set}
+ac_cv_env_F77_value=$F77
+ac_env_FFLAGS_set=${FFLAGS+set}
+ac_env_FFLAGS_value=$FFLAGS
+ac_cv_env_FFLAGS_set=${FFLAGS+set}
+ac_cv_env_FFLAGS_value=$FFLAGS
#
# Report the --help message.
@@ -960,9 +976,9 @@
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
[...19472 lines suppressed...]
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
_ACEOF
@@ -9896,16 +21394,41 @@
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_dest" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
ac_builddir=.
if test "$ac_dir" != .; then
@@ -9931,12 +21454,45 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -9954,10 +21510,10 @@
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`(dirname "$mf") 2>/dev/null ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -9967,36 +21523,30 @@
else
continue
fi
- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`(dirname "$file") 2>/dev/null ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -10012,10 +21562,10 @@
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
Index: missing
===================================================================
RCS file: /cvs/dirsec/mod_nss/missing,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- missing 17 May 2005 14:49:47 -0000 1.1.1.1
+++ missing 3 Nov 2005 19:41:00 -0000 1.2
@@ -1,7 +1,11 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
-# Franc,ois Pinard , 1996.
+
+scriptversion=2004-09-07.08
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard , 1996.
# 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
@@ -18,20 +22,44 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
+run=:
+
# In the cases where this matters, `missing' is being run in the
# srcdir already.
-if test -f configure.in; then
+if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
@@ -43,6 +71,7 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
@@ -51,13 +80,19 @@
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit 0
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing $scriptversion (GNU Automake)"
+ exit 0
;;
-*)
@@ -66,10 +101,45 @@
exit 1
;;
- aclocal)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`$configure_ac'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@@ -77,8 +147,8 @@
autoconf)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`$configure_ac'. You might want to install the
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@@ -86,11 +156,11 @@
autoheader)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`$configure_ac'. You might want
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -103,10 +173,10 @@
touch $touch_files
;;
- automake)
+ automake*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -114,9 +184,32 @@
while read f; do touch "$f"; done
;;
+ autom4te)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -146,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -167,9 +260,29 @@
fi
;;
+ help2man)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
makeinfo)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
@@ -183,12 +296,47 @@
touch $file
;;
+ tar)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -196,3 +344,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
From fedora-directory-commits at redhat.com Thu Nov 3 19:46:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 14:46:31 -0500
Subject: [Fedora-directory-commits] mod_nss aclocal.m4, 1.4, 1.5 configure,
1.8, 1.9 missing, 1.2, 1.3 Makefile.in, 1.11, 1.12
Message-ID: <200511031946.jA3JkWxP027793@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27774
Modified Files:
aclocal.m4 configure missing Makefile.in
Log Message:
had to recreate these on rhel3 because I nuked them on rhel4
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/mod_nss/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aclocal.m4 3 Nov 2005 19:41:00 -0000 1.4
+++ aclocal.m4 3 Nov 2005 19:46:24 -0000 1.5
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11,6935 +11,4389 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-
+# Do all the work for Automake. -*- Autoconf -*-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
+# 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.
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
+# serial 8
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
+AC_PREREQ([2.52])
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
[...10424 lines suppressed...]
+ else
+ enable_ltdl_install=yes
+ fi
+ ])
+ if test x"$enable_ltdl_install" = x"yes"; then
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ LTDLINCL=
+ fi
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
+])
-# serial 1
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible. Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_executable_p="test -f"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
+ fi
done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
- fi
+ done
done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
+ # Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+} ||
+{
+ tmp=$TMPDIR/sed$$-$RANDOM
+ (umask 077 && mkdir $tmp)
+} ||
+{
+ echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+ { (exit 1); exit 1; }
+}
+ _max=0
+ _count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for _sed in $_sed_list /usr/xpg4/bin/sed; do
+ test ! -f ${_sed} && break
+ cat /dev/null > "$tmp/sed.in"
+ _count=0
+ echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
+ # Check for GNU sed and select it if it is found.
+ if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
+ lt_cv_path_SED=${_sed}
+ break
+ fi
+ while true; do
+ cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
+ mv "$tmp/sed.tmp" "$tmp/sed.in"
+ cp "$tmp/sed.in" "$tmp/sed.nl"
+ echo >>"$tmp/sed.nl"
+ ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
+ cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
+ # 40000 chars as input seems more than enough
+ test $_count -gt 10 && break
+ _count=`expr $_count + 1`
+ if test $_count -gt $_max; then
+ _max=$_count
+ lt_cv_path_SED=$_sed
+ fi
+ done
+ done
+ rm -rf "$tmp"
+])
+if test "X$SED" != "X"; then
+ lt_cv_path_SED=$SED
+else
+ SED=$lt_cv_path_SED
+fi
+AC_MSG_RESULT([$SED])
+])
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 configure
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_nss/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure 3 Nov 2005 19:41:00 -0000 1.8
+++ configure 3 Nov 2005 19:46:24 -0000 1.9
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.57.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -19,10 +20,9 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
-DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -41,7 +41,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -218,17 +218,16 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
- test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
@@ -241,6 +240,17 @@
$as_unset CDPATH
+# Find the correct PATH separator. Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+ UNAME=${UNAME-`uname 2>/dev/null`}
+ case X$UNAME in
+ *-DOS) lt_cv_sys_path_separator=';' ;;
+ *) lt_cv_sys_path_separator=':' ;;
+ esac
+ PATH_SEPARATOR=$lt_cv_sys_path_separator
+fi
+
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -259,7 +269,7 @@
elif test "X$1" = X--fallback-echo; then
# Avoid inline document here, it may be left over
:
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
# Yippee, $echo works!
:
else
@@ -271,7 +281,7 @@
# used as fallback echo
shift
cat </dev/null`" = 'X\t' &&
echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
@@ -316,7 +325,7 @@
break
fi
done
- IFS="$lt_save_ifs"
+ IFS="$save_ifs"
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
@@ -390,11 +399,6 @@
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
@@ -462,7 +466,7 @@
# include
#endif"
-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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB!
LEX_OUTPUT_ROOT SSL2_TRUE SSL2_FALSE APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib nss_inc nss_lib nspr_dir nss_dir LIBOBJS 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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT SSL2_TRUE SSL2_FALSE APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib nss_inc nss_lib nspr_dir nss_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -821,7 +825,7 @@
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -861,10 +865,10 @@
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -923,26 +927,6 @@
ac_env_CPP_value=$CPP
ac_cv_env_CPP_set=${CPP+set}
ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
#
# Report the --help message.
@@ -976,9 +960,9 @@
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
[...20556 lines suppressed...]
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
_ACEOF
@@ -21394,41 +9896,16 @@
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_dest" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
ac_builddir=.
if test "$ac_dir" != .; then
@@ -21454,45 +9931,12 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -21510,10 +9954,10 @@
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`(dirname "$mf") 2>/dev/null ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21523,30 +9967,36 @@
else
continue
fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+ # Extract the definition of DEP_FILES from the Makefile without
+ # running `make'.
+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ U=`sed -n -e '/^U = / s///p' < "$mf"`
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+ # We invoke sed twice because it is the simplest approach to
+ # changing $(DEPDIR) to its actual value in the expansion.
+ for file in `sed -n -e '
+ /^DEP_FILES = .*\\\\$/ {
+ s/^DEP_FILES = //
+ :loop
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`(dirname "$file") 2>/dev/null ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21562,10 +10012,10 @@
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
Index: missing
===================================================================
RCS file: /cvs/dirsec/mod_nss/missing,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- missing 3 Nov 2005 19:41:00 -0000 1.2
+++ missing 3 Nov 2005 19:46:24 -0000 1.3
@@ -1,10 +1,6 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2004-09-07.08
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -42,24 +38,18 @@
configure_ac=configure.in
fi
-msg="missing on your system"
-
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -84,15 +74,11 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to ."
- exit 0
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
- exit 0
+ echo "missing 0.4 - GNU automake"
;;
-*)
@@ -101,44 +87,14 @@
exit 1
;;
-esac
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
+ aclocal*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
fi
- ;;
-esac
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
- aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -146,8 +102,13 @@
;;
autoconf)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -155,8 +116,13 @@
;;
autoheader)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -174,8 +140,13 @@
;;
automake*)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -185,11 +156,16 @@
;;
autom4te)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
+ You can get \`$1Help2man' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
@@ -209,7 +185,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -239,7 +215,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -261,8 +237,13 @@
;;
help2man)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -281,8 +262,13 @@
;;
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
@@ -298,6 +284,10 @@
tar)
shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -333,10 +323,10 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
+ it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -344,10 +334,3 @@
esac
exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_nss/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 3 Nov 2005 19:41:00 -0000 1.11
+++ Makefile.in 3 Nov 2005 19:46:24 -0000 1.12
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,290 +13,225 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
-
-SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
+host_alias = @host_alias@
host_triplet = @host@
-bin_PROGRAMS = nss_pcache$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/gencert.in \
- $(srcdir)/nss.conf.in $(top_srcdir)/configure AUTHORS COPYING \
- ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
- install-sh ltmain.sh missing mkinstalldirs nss_expr_parse.c \
- nss_expr_scan.c
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = nss.conf gencert
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libmodnss_la_LIBADD =
-am_libmodnss_la_OBJECTS = mod_nss.lo nss_engine_config.lo \
- nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \
- nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \
- nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo \
- nss_expr_scan.lo nss_util.lo nss_engine_rand.lo
-libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_nss_pcache_OBJECTS = nss_pcache.$(OBJEXT)
-nss_pcache_OBJECTS = $(am_nss_pcache_OBJECTS)
-nss_pcache_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
- $(AM_YFLAGS)
-SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
-DIST_SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
APR_CONFIG = @APR_CONFIG@
APXS = @APXS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
+AS = @AS@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SSL2_FALSE = @SSL2_FALSE@
-SSL2_TRUE = @SSL2_TRUE@
STRIP = @STRIP@
VERSION = @VERSION@
YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
apache_bin = @apache_bin@
apache_conf = @apache_conf@
apache_inc = @apache_inc@
apache_prefix = @apache_prefix@
apr_inc = @apr_inc@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
nspr_dir = @nspr_dir@
nspr_inc = @nspr_inc@
nspr_lib = @nspr_lib@
nss_dir = @nss_dir@
nss_inc = @nss_inc@
nss_lib = @nss_lib@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
lib_LTLIBRARIES = libmodnss.la
+
+bin_PROGRAMS = nss_pcache
+
nss_pcache_SOURCES = nss_pcache.c
+
libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c nss_engine_rand.c
+
INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@
+LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4
@SSL2_TRUE at AM_CFLAGS = -DWANT_SSL2
+
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
+
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = nss.conf gencert
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+libmodnss_la_LDFLAGS =
+libmodnss_la_LIBADD =
+am_libmodnss_la_OBJECTS = mod_nss.lo nss_engine_config.lo \
+ nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \
+ nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \
+ nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo nss_expr_scan.lo \
+ nss_util.lo nss_engine_rand.lo
+libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS)
+bin_PROGRAMS = nss_pcache$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_nss_pcache_OBJECTS = nss_pcache.$(OBJEXT)
+nss_pcache_OBJECTS = $(am_nss_pcache_OBJECTS)
+nss_pcache_LDADD = $(LDADD)
+nss_pcache_DEPENDENCIES =
+nss_pcache_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES = -I. -I$(srcdir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_nss.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_config.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_init.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_io.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_kernel.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_log.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_pphrase.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_rand.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_vars.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_eval.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_parse.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_scan.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/nss_pcache.Po ./$(DEPDIR)/nss_util.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+CFLAGS = @CFLAGS@
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+DIST_SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS TODO aclocal.m4 config.guess config.sub \
+ configure configure.in depcomp gencert.in install-sh ltmain.sh \
+ missing mkinstalldirs nss.conf.in nss_expr_parse.c \
+ nss_expr_scan.c
+SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES)
+
all: all-am
.SUFFIXES:
.SUFFIXES: .c .l .lo .o .obj .y
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+
+$(ACLOCAL_M4): configure.in
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-nss.conf: $(top_builddir)/config.status $(srcdir)/nss.conf.in
+nss.conf: $(top_builddir)/config.status nss.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-gencert: $(top_builddir)/config.status $(srcdir)/gencert.in
+gencert: $(top_builddir)/config.status gencert.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+libLTLIBRARIES_INSTALL = $(INSTALL)
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
+ test -z "$dir" && dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libmodnss.la: $(libmodnss_la_OBJECTS) $(libmodnss_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libmodnss_la_LDFLAGS) $(libmodnss_la_OBJECTS) $(libmodnss_la_LIBADD) $(LIBS)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
done
clean-binPROGRAMS:
@@ -310,7 +245,7 @@
$(LINK) $(nss_pcache_LDFLAGS) $(nss_pcache_OBJECTS) $(nss_pcache_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT)
+ -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
@@ -331,40 +266,42 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_pcache.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_util.Plo at am__quote@
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
+
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
.c.lo:
- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CCDEPMODE = @CCDEPMODE@
.l.c:
- $(LEXCOMPILE) $<
+ $(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
rm -f $(LEX_OUTPUT_ROOT).c
.y.c:
- $(YACCCOMPILE) $<
+ $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+ sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@
+ rm -f y.tab.c
if test -f y.tab.h; then \
to=`echo "$*_H" | sed \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
- sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
- y.tab.h >$*.ht; \
+ sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \
rm -f y.tab.h; \
if cmp -s $*.ht $*.h; then \
rm -f $*.ht ;\
@@ -375,8 +312,6 @@
if test -f y.output; then \
mv y.output $*.output; \
fi
- sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
- rm -f y.tab.c
mostlyclean-libtool:
-rm -f *.lo
@@ -388,6 +323,11 @@
-rm -f libtool
uninstall-info-am:
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -396,7 +336,6 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
-tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -408,24 +347,8 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
GTAGS:
@@ -434,24 +357,30 @@
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/.
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ $(mkinstalldirs) $(distdir)/.
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -472,54 +401,26 @@
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ && cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -527,40 +428,23 @@
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
+ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ find $$dc_install_base -type f -print ; \
+ exit 1; } >&2 ) \
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
+ if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
+ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
@@ -568,10 +452,10 @@
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
install-binPROGRAMS: install-libLTLIBRARIES
+
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -583,7 +467,7 @@
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -591,13 +475,12 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -rm -f nss_expr_parse.c
- -rm -f nss_expr_scan.c
+ -test -z "nss_expr_parse.cnss_expr_scan.c" || rm -f nss_expr_parse.c nss_expr_scan.c
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
@@ -605,17 +488,13 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-tags
dvi: dvi-am
dvi-am:
-html: html-am
-
info: info-am
info-am:
@@ -632,9 +511,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
+ -rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -642,30 +519,20 @@
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
uninstall-libLTLIBRARIES
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
- clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libLTLIBRARIES clean-libtool dist dist-all \
+ dist-gzip distcheck distclean distclean-compile \
+ distclean-depend distclean-generic distclean-libtool \
+ distclean-tags distcleancheck distdir dvi dvi-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-libLTLIBRARIES install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-info-am uninstall-libLTLIBRARIES
From fedora-directory-commits at redhat.com Thu Nov 3 20:14:11 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 15:14:11 -0500
Subject: [Fedora-directory-commits] mod_nss mod_nss.spec,1.1,1.2
Message-ID: <200511032014.jA3KEBIC029411@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29395
Modified Files:
mod_nss.spec
Log Message:
removed empty flavor from spec
Index: mod_nss.spec
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_nss.spec 3 Nov 2005 19:41:00 -0000 1.1
+++ mod_nss.spec 3 Nov 2005 20:14:04 -0000 1.2
@@ -16,7 +16,6 @@
# All rights reserved.
# END COPYRIGHT BLOCK
%define product fedora
-%define flavor
%define _build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.%{flavor}.rpm
Summary: mod_nss
Name: mod_nss
From fedora-directory-commits at redhat.com Thu Nov 3 20:14:41 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 15:14:41 -0500
Subject: [Fedora-directory-commits] mod_admserv mod_admserv.spec,1.1,1.2
Message-ID: <200511032014.jA3KEfpd029434@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29418
Modified Files:
mod_admserv.spec
Log Message:
removed empty flavor from spec
Index: mod_admserv.spec
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_admserv.spec 3 Nov 2005 18:57:43 -0000 1.1
+++ mod_admserv.spec 3 Nov 2005 20:14:33 -0000 1.2
@@ -16,7 +16,6 @@
# All rights reserved.
# END COPYRIGHT BLOCK
%define product fedora
-%define flavor
%define _build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.%{flavor}.rpm
Summary: mod_admserv
Name: mod_admserv
From fedora-directory-commits at redhat.com Thu Nov 3 23:20:56 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 18:20:56 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
admserv.conf, 1.8, 1.9 httpd.conf, 1.5, 1.6
Message-ID: <200511032320.jA3NKuu5003004@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952/adminserver/admserv/cfgstuff
Modified Files:
admserv.conf httpd.conf
Log Message:
Bug(s) fixed: 172402
Bug Description: Add support for mod_restartd - remove Apache module
packaging
Reviewed by: Noriko (Thanks!)
Fix Description: Add support for mod_restartd to the Admin Server
httpd.conf and admserv.conf. This just allows root to run the stop,
start, and restart CGIs. In addition to the regex in admserv.conf that
restricts CGI access, the code in mod_restartd itself restricts CGIs to
only those matching this pattern - all others get passed on to the
regular CGI handling module. Since our 3 Apache modules are all Apache
licensed, they cannot be included in our rpm/tarball packaging for
distribution. They will have to be separate rpms/tarballs that the
customer will have to download and install.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- admserv.conf 28 Oct 2005 22:43:23 -0000 1.8
+++ admserv.conf 3 Nov 2005 23:20:49 -0000 1.9
@@ -71,7 +71,7 @@
Require valid-user
-# Handle Console tasks
+# Handle Other Console tasks
AuthUserFile %%%sroot%%%/admin-serv/config/admpw
AuthType basic
@@ -98,3 +98,15 @@
AuthName "Admin Server"
Require valid-user
+
+# Handle Stop, Start, Restart - invoke mod_restartd
+
+ AuthUserFile /home/rich/72srv/admin-serv/config/admpw
+ AuthType basic
+ AuthName "Admin Server"
+ Require valid-user
+## turn off the password pipe when using mod_restartd
+ AdminSDK off
+ Options +ExecCGI
+ RetainPerms on
+
Index: httpd.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd.conf 18 Aug 2005 18:58:18 -0000 1.5
+++ httpd.conf 3 Nov 2005 23:20:49 -0000 1.6
@@ -147,6 +147,7 @@
LoadModule file_cache_module %%%module_dir%%%/modules/mod_file_cache.so
LoadModule mem_cache_module %%%module_dir%%%/modules/mod_mem_cache.so
LoadModule cgi_module %%%module_dir%%%/modules/mod_cgi.so
+LoadModule restartd_module %%%sroot%%%/bin/admin/lib/libmodrestartd.so
LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so
LoadModule nss_module %%%sroot%%%/bin/admin/lib/libmodnss.so
From fedora-directory-commits at redhat.com Thu Nov 3 23:20:46 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 18:20:46 -0500
Subject: [Fedora-directory-commits] adminserver Makefile, 1.15,
1.16 buildpaths.mk, 1.3, 1.4 components.mk, 1.38,
1.39 internal_buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.17, 1.18
Message-ID: <200511032321.jA3NLGjA003010@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952/adminserver
Modified Files:
Makefile buildpaths.mk components.mk internal_buildpaths.mk
nsconfig.mk
Log Message:
Bug(s) fixed: 172402
Bug Description: Add support for mod_restartd - remove Apache module
packaging
Reviewed by: Noriko (Thanks!)
Fix Description: Add support for mod_restartd to the Admin Server
httpd.conf and admserv.conf. This just allows root to run the stop,
start, and restart CGIs. In addition to the regex in admserv.conf that
restricts CGI access, the code in mod_restartd itself restricts CGIs to
only those matching this pattern - all others get passed on to the
regular CGI handling module. Since our 3 Apache modules are all Apache
licensed, they cannot be included in our rpm/tarball packaging for
distribution. They will have to be separate rpms/tarballs that the
customer will have to download and install.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 28 Oct 2005 22:43:18 -0000 1.15
+++ Makefile 3 Nov 2005 23:20:38 -0000 1.16
@@ -67,7 +67,7 @@
if test ! -d $(NSPLATFORM_DIR); then mkdir $(NSPLATFORM_DIR); fi;
$(PERL5) buildnum.pl -p $(NSPLATFORM_DIR)
-nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU) $(SETUPUTIL) $(ADMDOC) $(MOD_ADMSERV) $(MOD_NSS) end_time
+nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU) $(SETUPUTIL) $(ADMDOC) end_time
#
# Notice that BUILD_MODULE is not supplied directly on this target.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildpaths.mk 7 Oct 2005 21:49:29 -0000 1.3
+++ buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.4
@@ -84,12 +84,6 @@
SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-MOD_NSS_SOURCE_DIR = $(BUILD_ROOT)/../mod_nss
-#MOD_NSS_BUILD_DIR = $(NSCP_COMPDIR)/mod_nss/$(NSOBJDIR_NAME)
-
-MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
-#MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
-
CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- components.mk 28 Oct 2005 22:43:18 -0000 1.38
+++ components.mk 3 Nov 2005 23:20:38 -0000 1.39
@@ -418,41 +418,3 @@
endif
###########################################################
-
-# mod_admserv #############################################
-MOD_ADMSERV_RELDATE = 20051028
-
-#BASE_MOD_ADMSERV = $(COMPONENTS_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
-BASE_MOD_ADMSERV = $(FED_COMPONENTS_DIR)/mod_admserv/1.0/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
-
-MOD_ADMSERV = $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX)
-
-$(MOD_ADMSERV):
-ifdef INTERNAL_BUILD
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) \
- -objdir $(MOD_ADMSERV_BUILD_DIR) \
- -componentdir $(BASE_MOD_ADMSERV) -files lib
-else # INTERNAL_BUILD
- @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
-endif
-
-###########################################################
-
-# mod_nss #############################################
-MOD_NSS_RELDATE = 20050819
-
-#BASE_MOD_NSS = $(COMPONENTS_DIR)/mod_nss/$(MOD_NSS_RELDATE)/$(NSOBJDIR_NAME)
-BASE_MOD_NSS = $(INT_DIR)/mod_nss/$(MOD_NSS_RELDATE)/$(NSOBJDIR_NAME)
-
-MOD_NSS = $(MOD_NSS_LIBPATH)/libmodnss.$(DLL_SUFFIX)
-
-$(MOD_NSS):
-ifdef INTERNAL_BUILD
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) \
- -objdir $(MOD_NSS_BUILD_DIR) \
- -componentdir $(BASE_MOD_NSS) -files lib,bin
-else # INTERNAL_BUILD
- @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
-endif
-
-###########################################################
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- internal_buildpaths.mk 6 Oct 2005 03:12:57 -0000 1.2
+++ internal_buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.3
@@ -91,16 +91,6 @@
SETUPUTIL_BUILD_DIR = $(NSCP_COMPDIR)/setuputil/$(NSOBJDIR_NAME)
endif # SETUPUTIL_SOURCE_ROOT
-#MOD_NSS_SOURCE_DIR = $(BUILD_ROOT)/../mod_nss
-ifndef MOD_NSS_SOURCE_DIR
-MOD_NSS_BUILD_DIR = $(NSCP_COMPDIR)/mod_nss/$(NSOBJDIR_NAME)
-endif
-
-#MOD_ADMSERV_SOURCE_DIR = $(BUILD_ROOT)/../mod_admserv
-ifndef MOD_ADMSERV_SOURCE_DIR
-MOD_ADMSERV_BUILD_DIR = $(NSCP_COMPDIR)/mod_admserv/$(NSOBJDIR_NAME)
-endif
-
ifndef JSS_SOURCE_DIR
JSS_BUILD_DIR = $(NSCP_COMPDIR)/jss/$(NSOBJDIR_NAME)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nsconfig.mk 28 Oct 2005 22:43:18 -0000 1.17
+++ nsconfig.mk 3 Nov 2005 23:20:38 -0000 1.18
@@ -845,28 +845,6 @@
NMCJDK_JARS = base.jar mcc$(NMCJDK_JAR_VERSION).jar mcc$(NMCJDK_JAR_VERSION)_en.jar nmclf$(NMCJDK_JAR_VERSION).jar nmclf$(NMCJDK_JAR_VERSION)_en.jar
#########################################
-# MOD_NSS
-#########################################
-
-ifdef MOD_NSS_SOURCE_DIR
- MOD_NSS_LIBPATH = $(MOD_NSS_SOURCE_DIR)/.libs
- MOD_NSS_BINPATH = $(MOD_NSS_SOURCE_DIR)
-else
- MOD_NSS_LIBPATH = $(MOD_NSS_BUILD_DIR)/lib
- MOD_NSS_BINPATH = $(MOD_NSS_BUILD_DIR)/bin
-endif
-
-#########################################
-# MOD_ADMSERV
-#########################################
-
-ifdef MOD_ADMSERV_SOURCE_DIR
- MOD_ADMSERV_LIBPATH = $(MOD_ADMSERV_SOURCE_DIR)/.libs
-else
- MOD_ADMSERV_LIBPATH = $(MOD_ADMSERV_BUILD_DIR)/lib
-endif
-
-#########################################
# LDAPJDK
#########################################
From fedora-directory-commits at redhat.com Thu Nov 3 23:20:51 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 3 Nov 2005 18:20:51 -0500
Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.28,
1.29
Message-ID: <200511032321.jA3NLLto003014@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
Bug(s) fixed: 172402
Bug Description: Add support for mod_restartd - remove Apache module
packaging
Reviewed by: Noriko (Thanks!)
Fix Description: Add support for mod_restartd to the Admin Server
httpd.conf and admserv.conf. This just allows root to run the stop,
start, and restart CGIs. In addition to the regex in admserv.conf that
restricts CGI access, the code in mod_restartd itself restricts CGIs to
only those matching this pattern - all others get passed on to the
regular CGI handling module. Since our 3 Apache modules are all Apache
licensed, they cannot be included in our rpm/tarball packaging for
distribution. They will have to be separate rpms/tarballs that the
customer will have to download and install.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pkgadmin.mk 6 Oct 2005 03:13:20 -0000 1.28
+++ pkgadmin.mk 3 Nov 2005 23:20:44 -0000 1.29
@@ -285,11 +285,6 @@
(cd $(ADMIN_DIR)/manual; $(UNZIP) -o $(ADMDOC_PATH)/$(ADMDOC_ADMONLINEHELP))
endif
- cp $(MOD_ADMSERV_LIBPATH)/*.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
- cp $(MOD_NSS_LIBPATH)/*.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
- cp $(MOD_NSS_BINPATH)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
- chmod +x $(ADMIN_DIR)/bin/admin/admin/bin/nss_pcache
-
# cat $(ADMSERV_OBJDIR)/ldif/tasks.ldif $(ADMSERV_OBJDIR)/ldif/unixtasks.ldif > $(ADMIN_DIR)/admin-serv/ldif/tasks.ldif
cp -p $(ADMSERV_OBJDIR)/ldif/tasks.ldif $(ADMIN_DIR)/admin-serv/ldif
cp -p $(ADMSERV_OBJDIR)/ldif/global.ldif $(ADMIN_DIR)/admin-serv/ldif
From fedora-directory-commits at redhat.com Fri Nov 4 02:45:28 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 3 Nov 2005 21:45:28 -0500
Subject: [Fedora-directory-commits] ldapserver components.mk, 1.35,
1.36 internal_comp_deps.mk, 1.31, 1.32
Message-ID: <200511040245.jA42jSmF008573@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8545
Modified Files:
components.mk internal_comp_deps.mk
Log Message:
[172411] Use system SASL on RHEL
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- components.mk 31 Oct 2005 15:55:24 -0000 1.35
+++ components.mk 4 Nov 2005 02:45:20 -0000 1.36
@@ -354,14 +354,17 @@
### SASL package ##########################################
-ifdef SASL_SOURCE_ROOT
- SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
- SASL_BINPATH = $(SASL_SOURCE_ROOT)/bin
- SASL_INCDIR = $(SASL_SOURCE_ROOT)/include
-else
- SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
- SASL_BINPATH = $(SASL_BUILD_DIR)/bin
- SASL_INCDIR = $(SASL_BUILD_DIR)/include
+ifeq ($(ARCH), Linux)
+ SASL_LIBPATH = /usr/lib
+ SASL_INCDIR = /usr/include/sasl
+else
+ ifdef SASL_SOURCE_ROOT
+ SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
+ SASL_INCDIR = $(SASL_SOURCE_ROOT)/include
+ else
+ SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
+ SASL_INCDIR = $(SASL_BUILD_DIR)/include
+ endif
endif
SASL_INCLUDE = $(SASL_INCDIR)
@@ -374,7 +377,7 @@
SASL_LIB_ROOT_NAME = sasl2
SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
ifeq ($(ARCH), Linux)
- GSSAPI_LIBS=-L/usr/kerberos/lib -lgssapi_krb5
+ GSSAPI_LIBS=-lgssapi_krb5
endif
ifeq ($(ARCH), SOLARIS)
GSSAPI_LIBS=-lgss
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- internal_comp_deps.mk 1 Nov 2005 23:00:05 -0000 1.31
+++ internal_comp_deps.mk 4 Nov 2005 02:45:20 -0000 1.32
@@ -244,6 +244,7 @@
endif # LDAPSDK_SOURCE_ROOT
ifndef SASL_SOURCE_ROOT
+ifneq ($(ARCH), Linux)
#SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
SASL_DEP = $(SASL_INCLUDE)/sasl.h
@@ -255,14 +256,12 @@
ifdef COMPONENT_DEPS
$(FTP_PULL) -method $(SASL_PULL_METHOD) \
-objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
- -files include
- $(FTP_PULL) -method $(SASL_PULL_METHOD) \
- -objdir $(SASL_BUILD_DIR)/lib -componentdir $(SASL_RELEASE)/lib \
- -files $(SASL_LIBS)
+ -files include,lib
endif
- at if [ ! -f $@ ] ; \
then echo "Error: could not get component SASL file $@" ; \
fi
+endif # not Linux
endif # SASL_SOURCE_ROOT
ifndef ICU_SOURCE_ROOT
From fedora-directory-commits at redhat.com Fri Nov 4 18:57:56 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 4 Nov 2005 13:57:56 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd saslbind.c, 1.9.2.2, 1.9.2.3
Message-ID: <200511041857.jA4Ivu3T006777@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6761
Modified Files:
Tag: Directory71RtmBranch
saslbind.c
Log Message:
Fixed the build: removed __attribute__ from the previous checkin.
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- saslbind.c 3 Nov 2005 15:36:19 -0000 1.9.2.2
+++ saslbind.c 4 Nov 2005 18:57:48 -0000 1.9.2.3
@@ -108,11 +108,11 @@
* entry from the internal database, at the same time we get any other
* properties we need - it's more efficient that way.
*/
-static void ids_auxprop_lookup(void *glob_context __attribute__((unused)),
- sasl_server_params_t *sparams __attribute__((unused)),
- unsigned flags __attribute__((unused)),
- const char *user __attribute__((unused)),
- unsigned ulen __attribute__((unused)))
+static void ids_auxprop_lookup(void *glob_context,
+ sasl_server_params_t *sparams,
+ unsigned flags,
+ const char *user,
+ unsigned ulen)
{
/* do nothing - we don't need auxprops - we just do this to avoid
sasldb_auxprop_lookup */
@@ -128,11 +128,11 @@
NULL /* auxprop_store */
};
-int ids_auxprop_plug_init(const sasl_utils_t *utils __attribute__((unused)),
+int ids_auxprop_plug_init(const sasl_utils_t *utils,
int max_version,
int *out_version,
sasl_auxprop_plug_t **plug,
- const char *plugname __attribute__((unused)))
+ const char *plugname)
{
if(!out_version || !plug) return SASL_BADPARAM;
From fedora-directory-commits at redhat.com Fri Nov 4 19:03:24 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 4 Nov 2005 14:03:24 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd saslbind.c, 1.11, 1.12
Message-ID: <200511041903.jA4J3OxC008307@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6825
Modified Files:
saslbind.c
Log Message:
Fixed the build: removed __attribute__ from the previous checkin.
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- saslbind.c 3 Nov 2005 15:31:38 -0000 1.11
+++ saslbind.c 4 Nov 2005 19:02:57 -0000 1.12
@@ -108,11 +108,11 @@
* entry from the internal database, at the same time we get any other
* properties we need - it's more efficient that way.
*/
-static void ids_auxprop_lookup(void *glob_context __attribute__((unused)),
- sasl_server_params_t *sparams __attribute__((unused)),
- unsigned flags __attribute__((unused)),
- const char *user __attribute__((unused)),
- unsigned ulen __attribute__((unused)))
+static void ids_auxprop_lookup(void *glob_context,
+ sasl_server_params_t *sparams,
+ unsigned flags,
+ const char *user,
+ unsigned ulen)
{
/* do nothing - we don't need auxprops - we just do this to avoid
sasldb_auxprop_lookup */
@@ -128,11 +128,11 @@
NULL /* auxprop_store */
};
-int ids_auxprop_plug_init(const sasl_utils_t *utils __attribute__((unused)),
+int ids_auxprop_plug_init(const sasl_utils_t *utils,
int max_version,
int *out_version,
sasl_auxprop_plug_t **plug,
- const char *plugname __attribute__((unused)))
+ const char *plugname)
{
if(!out_version || !plug) return SASL_BADPARAM;
From fedora-directory-commits at redhat.com Fri Nov 4 20:03:40 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 4 Nov 2005 15:03:40 -0500
Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.12,
1.13
Message-ID: <200511042003.jA4K3eLA010214@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8712
Modified Files:
ldapserver.spec.tmpl
Log Message:
[172411] Use system SASL on RHEL
Added "cyrus-sasl >= 2.1.19" to the spec file:
+Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.19
Note: this diff contains the upgrade pre operaton to shutdown the servers before unpacking the files.
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ldapserver.spec.tmpl 14 Sep 2005 21:39:42 -0000 1.12
+++ ldapserver.spec.tmpl 4 Nov 2005 20:03:01 -0000 1.13
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl,java-1.4.2-ibm
+Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.19
Prefix: /opt/%{name}
%description
@@ -90,6 +90,32 @@
# files in different places, we won't be able to do this anymore
%defattr(-,root,root,-)
%{prefix}
+# don't update admin server configuration files.
+# note: if there's somes change b/w 2 versions, on-disk file is put w/ .rpmsave
+%config %{prefix}/admin-serv/config/*
+
+%pre
+# in case upgrade, need to shutdown the servers before the installation
+ls $RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+ for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*`
+ do
+ if [ -f $instance/logs/pid ]; then
+ pid=`cat $instance/logs/pid`
+ psval=`ps -ef | egrep $pid`
+ if [ "$psval" != "" ]; then
+ $instance/stop-slapd
+ fi
+ fi
+ done
+fi
+if [ -f $RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
+ pid=`cat $RPM_INSTALL_PREFIX/admin-serv/logs/pid`
+ psval=`ps -ef | egrep $pid`
+ if [ "$psval" != "" ]; then
+ $RPM_INSTALL_PREFIX/stop-admin
+ fi
+fi
%post
echo ""
@@ -109,6 +135,9 @@
fi
%changelog
+* Fri Nov 04 2005 Noriko Hosoi 7.1-2
+- Added a dependency: cyrus-sasl >= 2.1.19
+
* Wed Sep 14 2005 Nathan Kinder 7.1-2
- Added a dependency on the java-1.4.2-ibm package
From fedora-directory-commits at redhat.com Fri Nov 4 22:43:38 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Fri, 4 Nov 2005 17:43:38 -0500
Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.13,
1.14
Message-ID: <200511042243.jA4Mhcpv015285@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15222
Modified Files:
ldapserver.spec.tmpl
Log Message:
[172411] Use system SASL on RHEL
Back off "%config line", which is not needed on DS7.2.
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ldapserver.spec.tmpl 4 Nov 2005 20:03:01 -0000 1.13
+++ ldapserver.spec.tmpl 4 Nov 2005 22:43:31 -0000 1.14
@@ -90,9 +90,6 @@
# files in different places, we won't be able to do this anymore
%defattr(-,root,root,-)
%{prefix}
-# don't update admin server configuration files.
-# note: if there's somes change b/w 2 versions, on-disk file is put w/ .rpmsave
-%config %{prefix}/admin-serv/config/*
%pre
# in case upgrade, need to shutdown the servers before the installation
From fedora-directory-commits at redhat.com Tue Nov 8 15:58:29 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 8 Nov 2005 10:58:29 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd saslbind.c, 1.12, 1.13
Message-ID: <200511081558.jA8FwTun018396@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/ldapserver/ldap/servers/slapd
Modified Files:
saslbind.c
Log Message:
Bug(s) fixed: 172672
Bug Description: sasl code needs to accomodate older versions of sasl
Reviewed by: Noriko (Thanks!)
Fix Description: 1) Change build to use -L/usr/kerberos/lib on RHEL3
since that's where gssapi_krb5 is on that platform 2) ifdef out the use
of SASL_AUX_PASSWORD_PROP - if it's not defined, we don't need to use it.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- saslbind.c 4 Nov 2005 19:02:57 -0000 1.12
+++ saslbind.c 8 Nov 2005 15:58:22 -0000 1.13
@@ -498,11 +498,14 @@
clear = pw;
if (clear) {
+/* older versions of sasl do not have SASL_AUX_PASSWORD_PROP, so omit it */
+#ifdef SASL_AUX_PASSWORD_PROP
if (prop_set(propctx, SASL_AUX_PASSWORD_PROP, clear, -1) != 0) {
/* Failure is benign here because some mechanisms don't support this property */
/*LDAPDebug(LDAP_DEBUG_TRACE, "prop_set(userpassword) failed\n", 0, 0, 0);
goto fail */ ;
}
+#endif /* SASL_AUX_PASSWORD_PROP */
if (prop_set(propctx, SASL_AUX_PASSWORD, clear, -1) != 0) {
/* Failure is benign here because some mechanisms don't support this property */
/*LDAPDebug(LDAP_DEBUG_TRACE, "prop_set(userpassword) failed\n", 0, 0, 0);
From fedora-directory-commits at redhat.com Tue Nov 8 15:58:24 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 8 Nov 2005 10:58:24 -0500
Subject: [Fedora-directory-commits] ldapserver components.mk,1.36,1.37
Message-ID: <200511081558.jA8FwsV7018401@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18364/ldapserver
Modified Files:
components.mk
Log Message:
Bug(s) fixed: 172672
Bug Description: sasl code needs to accomodate older versions of sasl
Reviewed by: Noriko (Thanks!)
Fix Description: 1) Change build to use -L/usr/kerberos/lib on RHEL3
since that's where gssapi_krb5 is on that platform 2) ifdef out the use
of SASL_AUX_PASSWORD_PROP - if it's not defined, we don't need to use it.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- components.mk 4 Nov 2005 02:45:20 -0000 1.36
+++ components.mk 8 Nov 2005 15:58:16 -0000 1.37
@@ -355,7 +355,11 @@
### SASL package ##########################################
ifeq ($(ARCH), Linux)
- SASL_LIBPATH = /usr/lib
+ ifeq ($(BUILD_ARCH), RHEL3)
+ SASL_LIBPATH = /usr/kerberos/lib
+ else
+ SASL_LIBPATH = /usr/lib
+ endif
SASL_INCDIR = /usr/include/sasl
else
ifdef SASL_SOURCE_ROOT
From fedora-directory-commits at redhat.com Tue Nov 8 18:21:55 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 8 Nov 2005 13:21:55 -0500
Subject: [Fedora-directory-commits] adminutil nsperl.mk,1.1.1.1,1.2
Message-ID: <200511081821.jA8ILtnO023693@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23677
Modified Files:
nsperl.mk
Log Message:
make PERL5 use perl from PATH on Linux
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsperl.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsperl.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ nsperl.mk 8 Nov 2005 18:21:47 -0000 1.2
@@ -76,18 +76,6 @@
ifeq ($(OSVER), HP-UXB.11.11)
PERL5=/u/robobld/nsperl/hpux/nsperl
endif
-ifeq ($(OSVER), Linux2.1)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), Linux2.2)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), Linux2.4)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), RHEL3)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), RHEL4)
-PERL5=/usr/bin/perl
+ifeq ($(BUILD_ARCH), Linux)
+PERL5=perl
endif
From fedora-directory-commits at redhat.com Wed Nov 9 01:56:21 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 8 Nov 2005 20:56:21 -0500
Subject: [Fedora-directory-commits] setuputil nsconfig.mk, 1.1.1.1,
1.2 nsdefs.mk, 1.3, 1.4
Message-ID: <200511090156.jA91uLnH002970@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2952/setuputil
Modified Files:
nsconfig.mk nsdefs.mk
Log Message:
setuputil was using something wacky (we really ought to have standardized make/shell code that generates the same objdir name across all components/platforms, but I suppose this won't be a problem after we convert to automake for everything).
Before: Linux2.6.13_i686_glibc_PTH_OPT.OBJ
After: Linux2.6_x86_glibc_PTH_OPT.OBJ
Same as the other components.
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsconfig.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ nsconfig.mk 9 Nov 2005 01:56:12 -0000 1.2
@@ -44,7 +44,9 @@
ifeq ($(NSOS_ARCH),Linux)
ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
+ NSOS_TMP := x86
+ else
+ NSOS_TMP := $(NSOS_TEST1)
endif
ifeq ($(USE_LIBC),1)
LIBC_VERSION = _libc
@@ -52,7 +54,7 @@
LIBC_VERSION = _glibc
endif
PTHREAD_TAG = _PTH
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(LIBC_VERSION)$(PTHREAD_TAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
NSCONFIG_NOTAG = $(NSCONFIG)
NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
else
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsdefs.mk 26 Oct 2005 16:38:09 -0000 1.3
+++ nsdefs.mk 9 Nov 2005 01:56:12 -0000 1.4
@@ -170,6 +170,13 @@
NSOS_RELEASE = 4
# Always use gcc on RHEL
GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
+ else
+# generic Linux
+ NSOS_ARCH := Linux
+# just keep major.minor release version e.g.
+# 2.6.13-1.1532_FC4 -> 2.6
+# also 10.11.4444 -> 10.11
+ NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
endif
endif
endif
From fedora-directory-commits at redhat.com Wed Nov 9 07:16:48 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 9 Nov 2005 02:16:48 -0500
Subject: [Fedora-directory-commits]
adminutil/lib/libadminutil Makefile, 1.2, 1.3
Message-ID: <200511090716.jA97GmRS012729@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12673
Modified Files:
Makefile
Log Message:
libadminutil##. should not link SSL related ldapsdk libraries.
(libssldap50.so and libprldap50.so)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 21 Jul 2005 21:57:26 -0000 1.2
+++ Makefile 9 Nov 2005 07:16:40 -0000 1.3
@@ -60,7 +60,7 @@
LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES))
endif
-DEPLIBS += $(NSPRLINK) $(LDAPLINK) $(ICULINK)
+DEPLIBS += $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK)
ifeq ($(ARCH), SOLARIS)
ifeq ($(NS_USE_NATIVE), 1)
From fedora-directory-commits at redhat.com Wed Nov 9 21:10:51 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 16:10:51 -0500
Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.14,
1.15
Message-ID: <200511092110.jA9LApCD004950@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4933
Modified Files:
ldapserver.spec.tmpl
Log Message:
Changed cyrus-sasl rpm dependency to >=2.1.15 for RHEL3 compatibility
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ldapserver.spec.tmpl 4 Nov 2005 22:43:31 -0000 1.14
+++ ldapserver.spec.tmpl 9 Nov 2005 21:10:44 -0000 1.15
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.19
+Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
Prefix: /opt/%{name}
%description
@@ -132,6 +132,9 @@
fi
%changelog
+* Wed Nov 09 2005 Nathan Kinder 7.1-2
+- Changed cyrus-sasl dependency to >= 2.1.15 for RHEL3 compatibility
+
* Fri Nov 04 2005 Noriko Hosoi 7.1-2
- Added a dependency: cyrus-sasl >= 2.1.19
From fedora-directory-commits at redhat.com Wed Nov 9 23:23:02 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 18:23:02 -0500
Subject: [Fedora-directory-commits] adminserver/base Makefile,1.14,1.15
Message-ID: <200511092323.jA9NN2Yl008948@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918/base
Modified Files:
Makefile
Log Message:
172812 - Don't overwrite ANT_HOME on on external builds. Also don't package ant jarfiles in the console java directory.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/base/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 6 Oct 2005 03:13:42 -0000 1.14
+++ Makefile 9 Nov 2005 23:22:55 -0000 1.15
@@ -185,6 +185,8 @@
(cd $(CONSOLE_JAR_DIR); \
cp -p -R * $(CLIENT_DIR)/$(JAVA_DIR))
rm -f $(CLIENT_DIR)/$(JAVA_DIR)/startconsole
+ rm -f $(CLIENT_DIR)/$(JAVA_DIR)/ant*
+ rm -f $(CLIENT_DIR)/$(JAVA_DIR)/xpclass.jar
# Copy startconsole
(cd $(CONSOLE_BASE_DIR); cp -p startconsole $(CLIENT_DIR)/)
From fedora-directory-commits at redhat.com Wed Nov 9 23:22:57 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 18:22:57 -0500
Subject: [Fedora-directory-commits] adminserver components.mk,1.39,1.40
Message-ID: <200511092323.jA9NNRju008952@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8918
Modified Files:
components.mk
Log Message:
172812 - Don't overwrite ANT_HOME on on external builds. Also don't package ant jarfiles in the console java directory.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- components.mk 3 Nov 2005 23:20:38 -0000 1.39
+++ components.mk 9 Nov 2005 23:22:50 -0000 1.40
@@ -396,7 +396,11 @@
ANTLAUNCHERJAR = ant-launcher.jar
ANT_FILES = $(ANTJAR) $(ANTLAUNCHERJAR)
ANT_RELEASE = $(COMPONENTS_DIR)
-ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
+ifdef INTERNAL_BUILD
+ ifndef GET_ANT_FROM_PATH
+ ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
+ endif
+endif
ANT_DIR = $(ANT_HOME)/lib
ANT_DEP = $(addprefix $(CLASS_DEST)/, $(ANT_FILES))
ANT_CP = $(subst $(SPACE),$(PATH_SEP),$(ANT_DEP))
From fedora-directory-commits at redhat.com Thu Nov 10 00:04:07 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:04:07 -0500
Subject: [Fedora-directory-commits] winsync winsync.mak,NONE,1.1
Message-ID: <200511100004.jAA047Lv011025@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005
Added Files:
winsync.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE winsync.mak ---
#
# 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) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for Windows Sync components
#
ALL : PASSSYNC NTDS
CLEAN_ALL : CLEAN
if exist components rmdir /S/Q components
CLEAN :
if exist built rmdir /S/Q built
if exist dist rmdir /S/Q dist
PASSSYNC :
cd passwordsync
build.bat
cd ..
NTDS :
cd usersync
build.bat
cd ..
From fedora-directory-commits at redhat.com Thu Nov 10 00:05:01 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:05:01 -0500
Subject: [Fedora-directory-commits] winsync/usersync build.bat, NONE,
1.1 package.mak, NONE, 1.1
Message-ID: <200511100005.jAA051tT011082@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/usersync
Added Files:
build.bat package.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE build.bat ---
@rem //
@rem // BEGIN COPYRIGHT BLOCK
@rem // This Program is free software; you can redistribute it and/or modify it under
@rem // the terms of the GNU General Public License as published by the Free Software
@rem // Foundation; version 2 of the License.
@rem //
@rem // This Program is distributed in the hope that it will be useful, but WITHOUT
@rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@rem //
@rem // You should have received a copy of the GNU General Public License along with
@rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
@rem // Place, Suite 330, Boston, MA 02111-1307 USA.
@rem //
@rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
@rem // right to link the code of this Program with code not covered under the GNU
@rem // General Public License ("Non-GPL Code") and to distribute linked combinations
@rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
@rem // permitted under this exception must only link to the code of this Program
@rem // through those well defined interfaces identified in the file named EXCEPTION
@rem // found in the source code files (the "Approved Interfaces"). The files of
@rem // Non-GPL Code may instantiate templates or use macros or inline functions from
@rem // the Approved Interfaces without causing the resulting work to be covered by
@rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
@rem // additions to the list of Approved Interfaces. You must obey the GNU General
@rem // Public License in all respects for all of the Program code and other code used
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
@rem // provide this exception without modification, you must delete this exception
@rem // statement from your version and license this file solely under the GPL without
@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2005 Red Hat, Inc.
@rem // All rights reserved.
@rem // END COPYRIGHT BLOCK
@rem //
@echo off
if [%BUILD_DEBUG%] == [optimize] (
set FLAVOR=WINNT5.0_OPT.OBJ
) else (
set FLAVOR=WINNT5.0_DBG.OBJ
)
rem ======== Set Various Build Directories ========
set OBJDEST=..\built\%FLAVOR%
rem ------ Convert OBJEST to absolute ------
call :relative %OBJDEST% OBJDEST
set LIBROOT=..\components\%FLAVOR%
rem ------ Convert LIBROOT to absolute ------
call :relative %LIBROOT% LIBROOT
mkdir %LIBROOT%
set PKGDIR=%OBJDEST%\package\ntds
mkdir %PKGDIR%
set DISTDIR=..\dist\%FLAVOR%
rem ------ Convert DISTDIR to absolute ------
call :relative %DISTDIR% DISTDIR
mkdir %DISTDIR%
set WXSDIR=%CD%\wix
rem ======== Fetch Components ========
if [%INTERNAL_BUILD%] == [1] (
set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
) else (
set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
)
rem ------ ApacheDS ------
set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
if NOT EXIST %LIBROOT%\apacheds (
pushd %CD%
mkdir %LIBROOT%\apacheds
cd %LIBROOT%\apacheds
echo %APACHEDS_LOCATION% > version.txt
wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
popd
)
rem ------ Wrapper ------
set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
if NOT EXIST %LIBROOT%\wrapper (
pushd %CD%
mkdir %LIBROOT%\wrapper
cd %LIBROOT%\wrapper
echo %WRAPPER_LOCATION% > version.txt
wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
unzip -q wrapper_win32_3.1.2.zip
popd
)
set OK=0
pushd %CD%
rem ======== Build ========
rem ------ Netman ------
cd netman
echo -------- Beginning Netman Build --------
nmake /f netman.mak
set /a OK=%OK% + %ERRORLEVEL%
if [%OK%] GTR [1] (
echo -------- Netman Build Failed! --------
goto :END
) else (
echo -------- Netman Build Successful! --------
)
rem ------ ApacheDS ------
cd ..\apacheds
echo -------- Beginning ApacheDS Build --------
nmake /f apacheds.mak
set /a OK=%OK% + %ERRORLEVEL%
if [%OK%] GTR [1] (
echo -------- ApacheDS Build Failed! --------
goto :END
) else (
echo -------- ApacheDS Build Successful! --------
)
rem ======== Package ========
cd ..
echo -------- Beginning Packaging --------
nmake /f package.mak
set /a OK=%OK% + %ERRORLEVEL%
if EXIST %PKGDIR%\ntds.msi (
copy /Y %PKGDIR%\ntds.msi %DISTDIR%
set /a OK=%OK% + %ERRORLEVEL%
)
if [%OK%] GTR [1] (
echo -------- Packaging Failed! --------
goto :END
) else (
echo -------- Packaging Successful! --------
)
:END
popd
if [%OK%] GTR [1] (
echo -------- Build Failed! --------
set OK=1
) else (
echo -------- Build Successful! --------
)
exit %OK%
:relative
rem ======== Converts relative path to absolute path ========
rem ------ %1 is the path, %2 is the variable to be set ------
set %2=%~f1
goto :EOF
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for ntds.msi
#
ALL : ntds.msi
LAYOUT :
mkdir "$(PKGDIR)\bin"
copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
mkdir "$(PKGDIR)\conf"
copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
mkdir "$(PKGDIR)\lib"
copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
mkdir "$(PKGDIR)\logs"
ntds.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\ntds.wxs"
light ntds.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 00:05:22 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:05:22 -0500
Subject: [Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak,
NONE, 1.1
Message-ID: <200511100005.jAA05MKr011099@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/usersync/apacheds
Added Files:
apacheds.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE apacheds.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for usersync.jar
#
OUTDIR=$(OBJDEST)\apacheds
USERSYNCJAR=$(OUTDIR)\usersync.jar
CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
ALL : "$(USERSYNCJAR)"
$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
copy project.properties "$(APACHEDSSOURCE)\core"
copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
$(OUTDIR) :
if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
From fedora-directory-commits at redhat.com Thu Nov 10 00:06:11 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:06:11 -0500
Subject: [Fedora-directory-commits]
winsync/usersync/netman netman.dep, NONE, 1.1 netman.mak, NONE, 1.1
Message-ID: <200511100006.jAA06BZc011113@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/netman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/usersync/netman
Added Files:
netman.dep netman.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE netman.dep ---
#
# 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) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Microsoft Developer Studio Generated Dependency File, included by netman.mak
.\netman.cpp : \
".\netman.h"\
--- NEW FILE netman.mak ---
#
# 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) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for jnetman.dll and jnetman.jar
#
!IF "$(CFG)" == ""
CFG=netman - Win32 Debug
!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "netman - Win32 Release"
OUTDIR=$(OBJDEST)\netman
INTDIR=$(OBJDEST)\netman
# Begin Custom Macros
OutDir=$(OBJDEST)\netman
# End Custom Macros
ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
CLEAN :
- at erase "$(INTDIR)\jnetman_wrap.cxx "
- at erase "$(INTDIR)\jnetman.dll"
- at erase "$(INTDIR)\jnetman.lib"
- at erase "$(INTDIR)\*.obj"
- at erase "$(INTDIR)\*.java"
- at erase "$(INTDIR)\jnetman.jar"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
BSC32_SBRS= \
SWIG=swig.exe
SWIG_OPTS=-v -outdir "$(OUTDIR)"
LINK32=link.exe
LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
LINK32_OBJS= \
"$(INTDIR)\netman.obj" \
"$(INTDIR)\jnetman_wrap.obj"
"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
$(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
move jnetman_wrap.cxx $(OUTDIR)
"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
$(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
!ELSEIF "$(CFG)" == "netman - Win32 Debug"
OUTDIR=$(OBJDEST)\netman
INTDIR=$(OBJDEST)\netman
# Begin Custom Macros
OutDir=$(OBJDEST)\netman
# End Custom Macros
ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
CLEAN :
- at erase "$(INTDIR)\jnetman_wrap.cxx "
- at erase "$(INTDIR)\jnetman.dll"
- at erase "$(INTDIR)\jnetman.lib"
- at erase "$(INTDIR)\*.obj"
- at erase "$(INTDIR)\*.java"
- at erase "$(INTDIR)\jnetman.jar"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
BSC32_SBRS= \
SWIG=swig.exe
SWIG_OPTS=-v -outdir "$(OUTDIR)"
LINK32=link.exe
LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
LINK32_OBJS= \
"$(INTDIR)\netman.obj" \
"$(INTDIR)\jnetman_wrap.obj"
"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
$(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
move jnetman_wrap.cxx "$(OUTDIR)"
"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
$(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
!ENDIF
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("netman.dep")
!INCLUDE "netman.dep"
!ELSE
!MESSAGE Warning: cannot find "netman.dep"
!ENDIF
!ENDIF
!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
SOURCE=.\netman.cpp
"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
javac -d $(OUTDIR) $(OUTDIR)\*.java
(cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
!ENDIF
From fedora-directory-commits at redhat.com Thu Nov 10 00:04:14 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:04:14 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync package.mak, NONE,
1.1 build.bat, 1.9, 1.10
Message-ID: <200511100006.jAA06Wf6011119@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/passwordsync
Modified Files:
build.bat
Added Files:
package.mak
Log Message:
Initial drop of new stand-alone winsync build-system
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for PassSync.msi
ALL : PassSync.msi
LAYOUT :
copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
PassSync.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\PassSync.wxs"
light PassSync.wixobj
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/build.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.bat 12 Oct 2005 23:26:52 -0000 1.9
+++ build.bat 10 Nov 2005 00:04:05 -0000 1.10
@@ -39,101 +39,149 @@
@echo off
-pushd
-
-rem Convert %OBJEST% to absolute.
-call :relative %OBJDEST%
-
if [%BUILD_DEBUG%] == [optimize] (
- set LIBROOT=..\..\..\..\dist\WINNT5.0_OPT.OBJ
+ set FLAVOR=WINNT5.0_OPT.OBJ
) else (
- set LIBROOT=..\..\..\..\dist\WINNT5.0_DBG.OBJ
+ set FLAVOR=WINNT5.0_DBG.OBJ
)
-echo %LIBROOT%
+rem ======== Set Various Build Directories ========
+set OBJDEST=..\built\%FLAVOR%
+rem ------ Convert OBJEST to absolute ------
+call :relative %OBJDEST% OBJDEST
+
+set LIBROOT=..\components\%FLAVOR%
+rem ------ Convert LIBROOT to absolute ------
+call :relative %LIBROOT% LIBROOT
+mkdir %LIBROOT%
+
+set PKGDIR=%OBJDEST%\package\passsync
+mkdir %PKGDIR%
+
+set DISTDIR=..\dist\%FLAVOR%
+rem ------ Convert DISTDIR to absolute ------
+call :relative %DISTDIR% DISTDIR
+mkdir %DISTDIR%
set WXSDIR=%CD%\wix
-set INCLUDE=%INCLUDE%;%CD%\%LIBROOT%\ldapsdk\include;%CD%\%LIBROOT%\nspr\include;%CD%\%LIBROOT%\nss\include
-set LIB=%LIB%;%CD%\%LIBROOT%\ldapsdk\lib;%CD%\%LIBROOT%\nspr\lib;%CD%\%LIBROOT%\nss\lib
-set PATH=%PATH%;%CD%\%LIBROOT%\wix
+rem ======== Fetch Components ========
+if [%INTERNAL_BUILD%] == [1] (
+ set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
+) else (
+ set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
+)
+
+rem ------ NSPR ------
+set NSPR_LOCATION=%COMPONENT_URL%/nspr/v4.6
+if NOT EXIST %LIBROOT%\nspr (
+ pushd %CD%
+ mkdir %LIBROOT%\nspr
+ cd %LIBROOT%\nspr
+ echo %NSPR_LOCATION%/%FLAVOR% > version.txt
+ wget --no-directories %NSPR_LOCATION%/%FLAVOR%/mdbinary.jar
+ wget --no-directories -Pinclude %NSPR_LOCATION%/%FLAVOR%/mdheader.jar
+ unzip -q mdbinary.jar
+ cd include
+ unzip -q mdheader.jar
+ popd
+)
+
+rem ------ NSS ------
+set NSS_LOCATION=%COMPONENT_URL%/nss/NSS_3_10_2_RTM
+if NOT EXIST %LIBROOT%\nss (
+ pushd %CD%
+ mkdir %LIBROOT%\nss
+ cd %LIBROOT%\nss
+ echo %NSS_LOCATION%/%FLAVOR% > version.txt
+ wget --no-directories %NSS_LOCATION%/%FLAVOR%/mdbinary.jar
+ wget --no-directories -Pinclude %NSS_LOCATION%/xpheader.jar
+ unzip -q mdbinary.jar
+ cd include
+ unzip -q xpheader.jar
+ popd
+)
+
+rem ------ LDAPSDK ------
+set LDAPSDK_LOCATION=%COMPONENT_URL%/ldapsdk50/v5.16
+if NOT EXIST %LIBROOT%\ldapsdk (
+ pushd %CD%
+ mkdir %LIBROOT%\ldapsdk
+ cd %LIBROOT%\ldapsdk
+ echo %LDAPSDK_LOCATION%/%FLAVOR% > version.txt
+ wget --no-directories %LDAPSDK_LOCATION%/%FLAVOR%/ldapcsdk516.zip
+ unzip -q ldapcsdk516.zip
+ popd
+)
set OK=0
+pushd %CD%
+
+rem ======== Build ========
+rem ------ Set Build Paths ------
+set INCLUDE=%INCLUDE%;%LIBROOT%\ldapsdk\include;%LIBROOT%\nspr\include;%LIBROOT%\nss\include
+set LIB=%LIB%;%LIBROOT%\ldapsdk\lib;%LIBROOT%\nspr\lib;%LIBROOT%\nss\lib
+
+rem ------ PassSync ------
cd passsync
-echo Entering %CD%
+echo -------- Beginning PassSync Build --------
-:BUILD
-nmake passsync.mak
+nmake /f passsync.mak
set /a OK=%OK% + %ERRORLEVEL%
-copy /Y %OBJDEST%\passsync\passsync.exe %OBJDEST%\
-set /a OK=%OK% + %ERRORLEVEL%
+if [%OK%] GTR [1] (
+ echo -------- PassSync Build Failed! --------
+ goto :END
+) else (
+ echo -------- PassSync Build Successful! --------
+)
+rem ------ Passhook ------
cd ..\passhook
-echo Entering %CD%
-
-nmake passhook.mak
-set /a OK=%OK% + %ERRORLEVEL%
+echo -------- Beginning Passhook Build --------
-copy /Y %OBJDEST%\passhook\passhook.dll %OBJDEST%\
+nmake /f passhook.mak
set /a OK=%OK% + %ERRORLEVEL%
-:PKG
-
-if EXIST ..\%LIBROOT%\ldapsdk\lib\nsldap32v50.dll (
- copy /Y ..\%LIBROOT%\ldapsdk\lib\nsldap32v50.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\ldapsdk\lib\nsldapssl32v50.dll (
- copy /Y ..\%LIBROOT%\ldapsdk\lib\nsldapssl32v50.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\ldapsdk\lib\nsldappr32v50.dll (
- copy /Y ..\%LIBROOT%\ldapsdk\lib\nsldappr32v50.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nspr\lib\libnspr4.dll (
- copy /Y ..\%LIBROOT%\nspr\lib\libnspr4.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nspr\lib\libplds4.dll (
- copy /Y ..\%LIBROOT%\nspr\lib\libplds4.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nspr\lib\libplc4.dll (
- copy /Y ..\%LIBROOT%\nspr\lib\libplc4.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\nss3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\nss3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\ssl3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\ssl3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\softokn3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\softokn3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\lib\smime3.dll (
- copy /Y ..\%LIBROOT%\nss\lib\smime3.dll %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\bin\certutil.exe (
- copy /Y ..\%LIBROOT%\nss\bin\certutil.exe %OBJDEST%\
-)
-if EXIST ..\%LIBROOT%\nss\bin\pk12util.exe (
- copy /Y ..\%LIBROOT%\nss\bin\pk12util.exe %OBJDEST%\
+if [%OK%] GTR [1] (
+ echo -------- Passhook Build Failed! --------
+ goto :END
+) else (
+ echo -------- Passhook Build Successful! --------
)
-xcopy /E /Y /I %WXSDIR%\Binary %OBJDEST%\Binary
-
-cd %OBJDEST%
-echo Entering %CD%
+rem ======== Package ========
+cd ..
+echo -------- Beginning Packaging --------
-candle %WXSDIR%\PassSync.wxs
+nmake /f package.mak
set /a OK=%OK% + %ERRORLEVEL%
-light PassSync.wixobj
-set /a OK=%OK% + %ERRORLEVEL%
+if EXIST %PKGDIR%\PassSync.msi (
+ copy /Y %PKGDIR%\PassSync.msi %DISTDIR%
+ set /a OK=%OK% + %ERRORLEVEL%
+)
-:relative
-set OBJDEST=%~f1
-goto :EOF
+if [%OK%] GTR [1] (
+ echo -------- Packaging Failed! --------
+ goto :END
+) else (
+ echo -------- Packaging Successful! --------
+)
:END
popd
-if %OK% GTR 1 (set OK=1)
+if [%OK%] GTR [1] (
+ echo -------- Build Failed! --------
+ set OK=1
+) else (
+ echo -------- Build Successful! --------
+)
exit %OK%
+
+:relative
+rem ======== Converts relative path to absolute path ========
+rem ------ %1 is the path, %2 is the variable to be set ------
+set %2=%~f1
+goto :EOF
From fedora-directory-commits at redhat.com Thu Nov 10 00:04:35 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:04:35 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync/passhook
passhook.mak, 1.7, 1.8
Message-ID: <200511100006.jAA06dAQ011125@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/passwordsync/passhook
Modified Files:
passhook.mak
Log Message:
Initial drop of new stand-alone winsync build-system
Index: passhook.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- passhook.mak 16 May 2005 19:41:38 -0000 1.7
+++ passhook.mak 10 Nov 2005 00:04:12 -0000 1.8
@@ -1,245 +1,246 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Microsoft Developer Studio Generated NMAKE File, Based on passhook.dsp
-!IF "$(CFG)" == ""
-CFG=passhook - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "passhook - Win32 Release"
-
-OUTDIR=$(OBJDEST)\passhook
-INTDIR=$(OBJDEST)\passhook
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passhook
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passhook.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\passhook.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(OUTDIR)\passhook.dll"
- - at erase "$(OUTDIR)\passhook.exp"
- - at erase "$(OUTDIR)\passhook.lib"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
-DEF_FILE= \
- ".\passhook.def"
-LINK32_OBJS= \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\passhook.obj"
-
-"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "passhook - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\passhook
-INTDIR=$(OBJDEST)\passhook
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passhook
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passhook.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\passhook.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(OUTDIR)\passhook.dll"
- - at erase "$(OUTDIR)\passhook.exp"
- - at erase "$(OUTDIR)\passhook.ilk"
- - at erase "$(OUTDIR)\passhook.lib"
- - at erase "$(OUTDIR)\passhook.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib" /pdbtype:sept
-DEF_FILE= \
- ".\passhook.def"
-LINK32_OBJS= \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\passhook.obj"
-
-"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("passhook.dep")
-!INCLUDE "passhook.dep"
-!ELSE
-!MESSAGE Warning: cannot find "passhook.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passhook.cpp
-
-"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for passhook.dll
+#
+!IF "$(CFG)" == ""
+CFG=passhook - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "passhook - Win32 Release"
+
+OUTDIR=$(OBJDEST)\passhook
+INTDIR=$(OBJDEST)\passhook
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passhook
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passhook.dll"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\passhook.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(OUTDIR)\passhook.dll"
+ - at erase "$(OUTDIR)\passhook.exp"
+ - at erase "$(OUTDIR)\passhook.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
+DEF_FILE= \
+ ".\passhook.def"
+LINK32_OBJS= \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\passhook.obj"
+
+"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "passhook - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\passhook
+INTDIR=$(OBJDEST)\passhook
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passhook
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passhook.dll"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\passhook.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(INTDIR)\vc60.pdb"
+ - at erase "$(OUTDIR)\passhook.dll"
+ - at erase "$(OUTDIR)\passhook.exp"
+ - at erase "$(OUTDIR)\passhook.ilk"
+ - at erase "$(OUTDIR)\passhook.lib"
+ - at erase "$(OUTDIR)\passhook.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
+DEF_FILE= \
+ ".\passhook.def"
+LINK32_OBJS= \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\passhook.obj"
+
+"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("passhook.dep")
+!INCLUDE "passhook.dep"
+!ELSE
+!MESSAGE Warning: cannot find "passhook.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
+SOURCE=..\passhand.cpp
+
+"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\passhook.cpp
+
+"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF
+
From fedora-directory-commits at redhat.com Thu Nov 10 00:04:44 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:04:44 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync/passsync
passsync.mak, 1.4, 1.5
Message-ID: <200511100006.jAA06W3Y011120@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/passwordsync/passsync
Modified Files:
passsync.mak
Log Message:
Initial drop of new stand-alone winsync build-system
Index: passsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- passsync.mak 16 May 2005 19:41:38 -0000 1.4
+++ passsync.mak 10 Nov 2005 00:04:33 -0000 1.5
@@ -1,222 +1,261 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on passsync.dsp
-!IF "$(CFG)" == ""
-CFG=passsync - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "passsync - Win32 Release"
-
-OUTDIR=$(OBJDEST)\passsync
-INTDIR=$(OBJDEST)\passsync
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passsync
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passsync.exe"
-
-
-CLEAN :
- - at erase "$(INTDIR)\ntservice.obj"
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\service.obj"
- - at erase "$(INTDIR)\subuniutil.obj"
- - at erase "$(INTDIR)\syncserv.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(OUTDIR)\passsync.exe"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe"
-LINK32_OBJS= \
- "$(INTDIR)\ntservice.obj" \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\service.obj" \
- "$(INTDIR)\subuniutil.obj" \
- "$(INTDIR)\syncserv.obj"
-
-"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "passsync - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\passsync
-INTDIR=$(OBJDEST)\passsync
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passsync
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passsync.exe"
-
-
-CLEAN :
- - at erase "$(INTDIR)\ntservice.obj"
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\service.obj"
- - at erase "$(INTDIR)\subuniutil.obj"
- - at erase "$(INTDIR)\syncserv.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(OUTDIR)\passsync.exe"
- - at erase "$(OUTDIR)\passsync.ilk"
- - at erase "$(OUTDIR)\passsync.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe" /pdbtype:sept
-LINK32_OBJS= \
- "$(INTDIR)\ntservice.obj" \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\service.obj" \
- "$(INTDIR)\subuniutil.obj" \
- "$(INTDIR)\syncserv.obj"
-
-"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("passsync.dep")
-!INCLUDE "passsync.dep"
-!ELSE
-!MESSAGE Warning: cannot find "passsync.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
-SOURCE=.\ntservice.cpp
-
-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\service.cpp
-
-"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\subuniutil.cpp
-
-"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\syncserv.cpp
-
-"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for passsync.exe
+#
+!IF "$(CFG)" == ""
+CFG=passsync - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "passsync - Win32 Release"
+
+OUTDIR=$(OBJDEST)\passsync
+INTDIR=$(OBJDEST)\passsync
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passsync
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passsync.exe"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\ntservice.obj"
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\service.obj"
+ - at erase "$(INTDIR)\subuniutil.obj"
+ - at erase "$(INTDIR)\syncserv.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(OUTDIR)\passsync.exe"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\ntservice.obj" \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\service.obj" \
+ "$(INTDIR)\subuniutil.obj" \
+ "$(INTDIR)\syncserv.obj"
+
+"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "passsync - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\passsync
+INTDIR=$(OBJDEST)\passsync
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passsync
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passsync.exe"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\ntservice.obj"
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\service.obj"
+ - at erase "$(INTDIR)\subuniutil.obj"
+ - at erase "$(INTDIR)\syncserv.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(INTDIR)\vc60.pdb"
+ - at erase "$(OUTDIR)\passsync.exe"
+ - at erase "$(OUTDIR)\passsync.ilk"
+ - at erase "$(OUTDIR)\passsync.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\ntservice.obj" \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\service.obj" \
+ "$(INTDIR)\subuniutil.obj" \
+ "$(INTDIR)\syncserv.obj"
+
+"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("passsync.dep")
+!INCLUDE "passsync.dep"
+!ELSE
+!MESSAGE Warning: cannot find "passsync.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
+SOURCE=.\ntservice.cpp
+
+"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=..\passhand.cpp
+
+"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\service.cpp
+
+"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\subuniutil.cpp
+
+"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\syncserv.cpp
+
+"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF
+
From fedora-directory-commits at redhat.com Thu Nov 10 00:37:09 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:37:09 -0500
Subject: [Fedora-directory-commits] winsync/usersync/netman netman.mak, 1.1,
1.2
Message-ID: <200511100037.jAA0b9wN011402@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/netman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/usersync/netman
Modified Files:
netman.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: netman.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/netman/netman.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netman.mak 10 Nov 2005 00:05:20 -0000 1.1
+++ netman.mak 10 Nov 2005 00:37:02 -0000 1.2
@@ -1,249 +1,249 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for jnetman.dll and jnetman.jar
-#
-!IF "$(CFG)" == ""
-CFG=netman - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "netman - Win32 Release"
-
-OUTDIR=$(OBJDEST)\netman
-INTDIR=$(OBJDEST)\netman
-# Begin Custom Macros
-OutDir=$(OBJDEST)\netman
-# End Custom Macros
-
-ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
-
-
-CLEAN :
- - at erase "$(INTDIR)\jnetman_wrap.cxx "
- - at erase "$(INTDIR)\jnetman.dll"
- - at erase "$(INTDIR)\jnetman.lib"
- - at erase "$(INTDIR)\*.obj"
- - at erase "$(INTDIR)\*.java"
- - at erase "$(INTDIR)\jnetman.jar"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
-BSC32_SBRS= \
-
-SWIG=swig.exe
-SWIG_OPTS=-v -outdir "$(OUTDIR)"
-
-LINK32=link.exe
-LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
-LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
-LINK32_OBJS= \
- "$(INTDIR)\netman.obj" \
- "$(INTDIR)\jnetman_wrap.obj"
-
-"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
- $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
- move jnetman_wrap.cxx $(OUTDIR)
-
-"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
- $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
-
-!ELSEIF "$(CFG)" == "netman - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\netman
-INTDIR=$(OBJDEST)\netman
-# Begin Custom Macros
-OutDir=$(OBJDEST)\netman
-# End Custom Macros
-
-ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
-
-
-CLEAN :
- - at erase "$(INTDIR)\jnetman_wrap.cxx "
- - at erase "$(INTDIR)\jnetman.dll"
- - at erase "$(INTDIR)\jnetman.lib"
- - at erase "$(INTDIR)\*.obj"
- - at erase "$(INTDIR)\*.java"
- - at erase "$(INTDIR)\jnetman.jar"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
-BSC32_SBRS= \
-
-SWIG=swig.exe
-SWIG_OPTS=-v -outdir "$(OUTDIR)"
-
-LINK32=link.exe
-LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
-LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
-LINK32_OBJS= \
- "$(INTDIR)\netman.obj" \
- "$(INTDIR)\jnetman_wrap.obj"
-
-"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
- $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
- move jnetman_wrap.cxx "$(OUTDIR)"
-
-"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
- $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("netman.dep")
-!INCLUDE "netman.dep"
-!ELSE
-!MESSAGE Warning: cannot find "netman.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
-
-SOURCE=.\netman.cpp
-
-"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
-
-"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
-
-$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
- javac -d $(OUTDIR) $(OUTDIR)\*.java
- (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
-
-!ENDIF
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for jnetman.dll and jnetman.jar
+#
+!IF "$(CFG)" == ""
+CFG=netman - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "netman - Win32 Release"
+
+OUTDIR=$(OBJDEST)\netman
+INTDIR=$(OBJDEST)\netman
+# Begin Custom Macros
+OutDir=$(OBJDEST)\netman
+# End Custom Macros
+
+ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\jnetman_wrap.cxx "
+ - at erase "$(INTDIR)\jnetman.dll"
+ - at erase "$(INTDIR)\jnetman.lib"
+ - at erase "$(INTDIR)\*.obj"
+ - at erase "$(INTDIR)\*.java"
+ - at erase "$(INTDIR)\jnetman.jar"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
+BSC32_SBRS= \
+
+SWIG=swig.exe
+SWIG_OPTS=-v -outdir "$(OUTDIR)"
+
+LINK32=link.exe
+LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
+LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
+LINK32_OBJS= \
+ "$(INTDIR)\netman.obj" \
+ "$(INTDIR)\jnetman_wrap.obj"
+
+"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
+ $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
+ move jnetman_wrap.cxx $(OUTDIR)
+
+"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
+
+!ELSEIF "$(CFG)" == "netman - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\netman
+INTDIR=$(OBJDEST)\netman
+# Begin Custom Macros
+OutDir=$(OBJDEST)\netman
+# End Custom Macros
+
+ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\jnetman_wrap.cxx "
+ - at erase "$(INTDIR)\jnetman.dll"
+ - at erase "$(INTDIR)\jnetman.lib"
+ - at erase "$(INTDIR)\*.obj"
+ - at erase "$(INTDIR)\*.java"
+ - at erase "$(INTDIR)\jnetman.jar"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
+BSC32_SBRS= \
+
+SWIG=swig.exe
+SWIG_OPTS=-v -outdir "$(OUTDIR)"
+
+LINK32=link.exe
+LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
+LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
+LINK32_OBJS= \
+ "$(INTDIR)\netman.obj" \
+ "$(INTDIR)\jnetman_wrap.obj"
+
+"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
+ $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
+ move jnetman_wrap.cxx "$(OUTDIR)"
+
+"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("netman.dep")
+!INCLUDE "netman.dep"
+!ELSE
+!MESSAGE Warning: cannot find "netman.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
+
+SOURCE=.\netman.cpp
+
+"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
+
+"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
+
+$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
+ javac -d $(OUTDIR) $(OUTDIR)\*.java
+ (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
+
+!ENDIF
From fedora-directory-commits at redhat.com Thu Nov 10 00:36:42 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:36:42 -0500
Subject: [Fedora-directory-commits] winsync winsync.mak,1.1,1.2
Message-ID: <200511100037.jAA0bCMg011405@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302
Modified Files:
winsync.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: winsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/winsync.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- winsync.mak 10 Nov 2005 00:03:46 -0000 1.1
+++ winsync.mak 10 Nov 2005 00:36:34 -0000 1.2
@@ -1,59 +1,59 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for Windows Sync components
-#
-
-ALL : PASSSYNC NTDS
-
-CLEAN_ALL : CLEAN
- if exist components rmdir /S/Q components
-
-CLEAN :
- if exist built rmdir /S/Q built
- if exist dist rmdir /S/Q dist
-
-PASSSYNC :
- cd passwordsync
- build.bat
- cd ..
-
-NTDS :
- cd usersync
- build.bat
- cd ..
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for Windows Sync components
+#
+
+ALL : PASSSYNC NTDS
+
+CLEAN_ALL : CLEAN
+ if exist components rmdir /S/Q components
+
+CLEAN :
+ if exist built rmdir /S/Q built
+ if exist dist rmdir /S/Q dist
+
+PASSSYNC :
+ cd passwordsync
+ build.bat
+ cd ..
+
+NTDS :
+ cd usersync
+ build.bat
+ cd ..
From fedora-directory-commits at redhat.com Thu Nov 10 00:36:47 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:36:47 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync package.mak, 1.1,
1.2
Message-ID: <200511100037.jAA0bHh3011409@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/passwordsync
Modified Files:
package.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/package.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.mak 10 Nov 2005 00:04:05 -0000 1.1
+++ package.mak 10 Nov 2005 00:36:40 -0000 1.2
@@ -1,65 +1,65 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for PassSync.msi
-
-ALL : PassSync.msi
-
-LAYOUT :
- copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
- copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
-
-PassSync.msi : LAYOUT
- mkdir "$(PKGDIR)\Binary"
- copy /Y wix\Binary "$(PKGDIR)\Binary"
- cd "$(PKGDIR)"
- candle "$(WXSDIR)\PassSync.wxs"
- light PassSync.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for PassSync.msi
+
+ALL : PassSync.msi
+
+LAYOUT :
+ copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
+ copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
+
+PassSync.msi : LAYOUT
+ mkdir "$(PKGDIR)\Binary"
+ copy /Y wix\Binary "$(PKGDIR)\Binary"
+ cd "$(PKGDIR)"
+ candle "$(WXSDIR)\PassSync.wxs"
+ light PassSync.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 00:36:52 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:36:52 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync/passhook
passhook.mak, 1.8, 1.9
Message-ID: <200511100037.jAA0bNMH011412@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/passwordsync/passhook
Modified Files:
passhook.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: passhook.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- passhook.mak 10 Nov 2005 00:04:12 -0000 1.8
+++ passhook.mak 10 Nov 2005 00:36:45 -0000 1.9
@@ -1,246 +1,246 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for passhook.dll
-#
-!IF "$(CFG)" == ""
-CFG=passhook - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "passhook - Win32 Release"
-
-OUTDIR=$(OBJDEST)\passhook
-INTDIR=$(OBJDEST)\passhook
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passhook
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passhook.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\passhook.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(OUTDIR)\passhook.dll"
- - at erase "$(OUTDIR)\passhook.exp"
- - at erase "$(OUTDIR)\passhook.lib"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
-DEF_FILE= \
- ".\passhook.def"
-LINK32_OBJS= \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\passhook.obj"
-
-"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "passhook - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\passhook
-INTDIR=$(OBJDEST)\passhook
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passhook
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passhook.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\passhook.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(OUTDIR)\passhook.dll"
- - at erase "$(OUTDIR)\passhook.exp"
- - at erase "$(OUTDIR)\passhook.ilk"
- - at erase "$(OUTDIR)\passhook.lib"
- - at erase "$(OUTDIR)\passhook.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
-DEF_FILE= \
- ".\passhook.def"
-LINK32_OBJS= \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\passhook.obj"
-
-"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("passhook.dep")
-!INCLUDE "passhook.dep"
-!ELSE
-!MESSAGE Warning: cannot find "passhook.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passhook.cpp
-
-"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for passhook.dll
+#
+!IF "$(CFG)" == ""
+CFG=passhook - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "passhook - Win32 Release"
+
+OUTDIR=$(OBJDEST)\passhook
+INTDIR=$(OBJDEST)\passhook
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passhook
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passhook.dll"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\passhook.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(OUTDIR)\passhook.dll"
+ - at erase "$(OUTDIR)\passhook.exp"
+ - at erase "$(OUTDIR)\passhook.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
+DEF_FILE= \
+ ".\passhook.def"
+LINK32_OBJS= \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\passhook.obj"
+
+"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "passhook - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\passhook
+INTDIR=$(OBJDEST)\passhook
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passhook
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passhook.dll"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\passhook.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(INTDIR)\vc60.pdb"
+ - at erase "$(OUTDIR)\passhook.dll"
+ - at erase "$(OUTDIR)\passhook.exp"
+ - at erase "$(OUTDIR)\passhook.ilk"
+ - at erase "$(OUTDIR)\passhook.lib"
+ - at erase "$(OUTDIR)\passhook.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
+DEF_FILE= \
+ ".\passhook.def"
+LINK32_OBJS= \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\passhook.obj"
+
+"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("passhook.dep")
+!INCLUDE "passhook.dep"
+!ELSE
+!MESSAGE Warning: cannot find "passhook.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
+SOURCE=..\passhand.cpp
+
+"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\passhook.cpp
+
+"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF
+
From fedora-directory-commits at redhat.com Thu Nov 10 00:36:53 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:36:53 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync/passsync
passsync.mak, 1.5, 1.6
Message-ID: <200511100037.jAA0bNsI011415@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/passwordsync/passsync
Modified Files:
passsync.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: passsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- passsync.mak 10 Nov 2005 00:04:33 -0000 1.5
+++ passsync.mak 10 Nov 2005 00:36:50 -0000 1.6
@@ -1,261 +1,261 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for passsync.exe
-#
-!IF "$(CFG)" == ""
-CFG=passsync - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "passsync - Win32 Release"
-
-OUTDIR=$(OBJDEST)\passsync
-INTDIR=$(OBJDEST)\passsync
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passsync
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passsync.exe"
-
-
-CLEAN :
- - at erase "$(INTDIR)\ntservice.obj"
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\service.obj"
- - at erase "$(INTDIR)\subuniutil.obj"
- - at erase "$(INTDIR)\syncserv.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(OUTDIR)\passsync.exe"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe"
-LINK32_OBJS= \
- "$(INTDIR)\ntservice.obj" \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\service.obj" \
- "$(INTDIR)\subuniutil.obj" \
- "$(INTDIR)\syncserv.obj"
-
-"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "passsync - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\passsync
-INTDIR=$(OBJDEST)\passsync
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passsync
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passsync.exe"
-
-
-CLEAN :
- - at erase "$(INTDIR)\ntservice.obj"
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\service.obj"
- - at erase "$(INTDIR)\subuniutil.obj"
- - at erase "$(INTDIR)\syncserv.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(OUTDIR)\passsync.exe"
- - at erase "$(OUTDIR)\passsync.ilk"
- - at erase "$(OUTDIR)\passsync.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe"
-LINK32_OBJS= \
- "$(INTDIR)\ntservice.obj" \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\service.obj" \
- "$(INTDIR)\subuniutil.obj" \
- "$(INTDIR)\syncserv.obj"
-
-"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("passsync.dep")
-!INCLUDE "passsync.dep"
-!ELSE
-!MESSAGE Warning: cannot find "passsync.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
-SOURCE=.\ntservice.cpp
-
-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\service.cpp
-
-"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\subuniutil.cpp
-
-"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\syncserv.cpp
-
-"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for passsync.exe
+#
+!IF "$(CFG)" == ""
+CFG=passsync - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "passsync - Win32 Release"
+
+OUTDIR=$(OBJDEST)\passsync
+INTDIR=$(OBJDEST)\passsync
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passsync
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passsync.exe"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\ntservice.obj"
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\service.obj"
+ - at erase "$(INTDIR)\subuniutil.obj"
+ - at erase "$(INTDIR)\syncserv.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(OUTDIR)\passsync.exe"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\ntservice.obj" \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\service.obj" \
+ "$(INTDIR)\subuniutil.obj" \
+ "$(INTDIR)\syncserv.obj"
+
+"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "passsync - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\passsync
+INTDIR=$(OBJDEST)\passsync
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passsync
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passsync.exe"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\ntservice.obj"
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\service.obj"
+ - at erase "$(INTDIR)\subuniutil.obj"
+ - at erase "$(INTDIR)\syncserv.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(INTDIR)\vc60.pdb"
+ - at erase "$(OUTDIR)\passsync.exe"
+ - at erase "$(OUTDIR)\passsync.ilk"
+ - at erase "$(OUTDIR)\passsync.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\ntservice.obj" \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\service.obj" \
+ "$(INTDIR)\subuniutil.obj" \
+ "$(INTDIR)\syncserv.obj"
+
+"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("passsync.dep")
+!INCLUDE "passsync.dep"
+!ELSE
+!MESSAGE Warning: cannot find "passsync.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
+SOURCE=.\ntservice.cpp
+
+"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=..\passhand.cpp
+
+"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\service.cpp
+
+"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\subuniutil.cpp
+
+"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\syncserv.cpp
+
+"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF
+
From fedora-directory-commits at redhat.com Thu Nov 10 00:36:58 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:36:58 -0500
Subject: [Fedora-directory-commits] winsync/usersync package.mak,1.1,1.2
Message-ID: <200511100037.jAA0bSkF011418@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/usersync
Modified Files:
package.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/package.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.mak 10 Nov 2005 00:04:42 -0000 1.1
+++ package.mak 10 Nov 2005 00:36:51 -0000 1.2
@@ -1,72 +1,72 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for ntds.msi
-#
-
-ALL : ntds.msi
-
-LAYOUT :
- mkdir "$(PKGDIR)\bin"
- copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
- copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
- copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
- copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
- copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
- copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
- copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
-
- mkdir "$(PKGDIR)\conf"
- copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
- copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
-
- mkdir "$(PKGDIR)\lib"
- copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
- copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
- copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
-
- mkdir "$(PKGDIR)\logs"
-
-
-ntds.msi : LAYOUT
- mkdir "$(PKGDIR)\Binary"
- copy /Y wix\Binary "$(PKGDIR)\Binary"
- cd "$(PKGDIR)"
- candle "$(WXSDIR)\ntds.wxs"
- light ntds.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for ntds.msi
+#
+
+ALL : ntds.msi
+
+LAYOUT :
+ mkdir "$(PKGDIR)\bin"
+ copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
+ copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
+ copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
+ copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
+ copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
+ copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
+ copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
+
+ mkdir "$(PKGDIR)\conf"
+ copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
+ copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
+
+ mkdir "$(PKGDIR)\lib"
+ copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
+ copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
+ copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
+
+ mkdir "$(PKGDIR)\logs"
+
+
+ntds.msi : LAYOUT
+ mkdir "$(PKGDIR)\Binary"
+ copy /Y wix\Binary "$(PKGDIR)\Binary"
+ cd "$(PKGDIR)"
+ candle "$(WXSDIR)\ntds.wxs"
+ light ntds.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 00:37:04 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 19:37:04 -0500
Subject: [Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak,
1.1, 1.2
Message-ID: <200511100037.jAA0bYRk011421@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/usersync/apacheds
Modified Files:
apacheds.mak
Log Message:
Changed unix style line endings to DOS style for nmake makefiles
Index: apacheds.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/apacheds/apacheds.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apacheds.mak 10 Nov 2005 00:04:59 -0000 1.1
+++ apacheds.mak 10 Nov 2005 00:36:56 -0000 1.2
@@ -1,62 +1,62 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for usersync.jar
-#
-
-OUTDIR=$(OBJDEST)\apacheds
-USERSYNCJAR=$(OUTDIR)\usersync.jar
-CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
-
-ALL : "$(USERSYNCJAR)"
-
-
-$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
- copy project.properties "$(APACHEDSSOURCE)\core"
- copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
- maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
- javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
- javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
-
-$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
- ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
- move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
-
-$(OUTDIR) :
- if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for usersync.jar
+#
+
+OUTDIR=$(OBJDEST)\apacheds
+USERSYNCJAR=$(OUTDIR)\usersync.jar
+CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
+
+ALL : "$(USERSYNCJAR)"
+
+
+$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
+ copy project.properties "$(APACHEDSSOURCE)\core"
+ copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
+ maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
+ javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
+ javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
+
+$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
+ ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
+ move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
+
+$(OUTDIR) :
+ if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
From fedora-directory-commits at redhat.com Thu Nov 10 01:13:07 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 9 Nov 2005 20:13:07 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
ux-update.cc, 1.13, 1.14
Message-ID: <200511100113.jAA1D7mT013110@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048/adminserver/admserv/newinst/src
Modified Files:
ux-update.cc
Log Message:
Bug(s) fixed: 172816
Bug Description: use system perl for AS PERL5; make files owned by AS uid
Reviewed by: Noriko (Thanks!)
Fix Description: 1) I made a similar fix to adminutil to use the system
perl for the PERL5 macro on all Linux systems. 2) The files admpw,
adm.conf, and console.conf are read and/or written by the httpd process,
which is owned by the SSuser (default nobody), so they must be owned by
that user.
Platforms tested: FC4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ux-update.cc 28 Oct 2005 22:44:18 -0000 1.13
+++ ux-update.cc 10 Nov 2005 01:12:59 -0000 1.14
@@ -441,6 +441,24 @@
}
void
+chown_file(const char *user, const char *group, const char *file)
+{
+ /* only do this if we are root */
+ uid_t my_uid = geteuid();
+
+ if (my_uid == 0) {
+ char tmp[BIG_BUF];
+
+ snprintf(tmp, sizeof(tmp), CHOWN_CMD, user, file);
+ tmp[sizeof(tmp)-1] = 0;
+ system(tmp);
+ snprintf(tmp, sizeof(tmp), CHGRP_CMD, group, file);
+ tmp[sizeof(tmp)-1] = 0;
+ system(tmp);
+ }
+}
+
+void
create_admserv(char *hn, const char *sroot)
{
char httpuser[SML_BUF], httppw[SML_BUF];
@@ -599,7 +617,7 @@
fprintf(f, "%s:{SHA}%s", httpuser, pw);
fclose(f);
chmod(tstr, S_IRUSR | S_IWUSR);
-
+ chown_file(SSuser, SSgroup, tstr);
logUninstallInfo(sroot, "admin", "admin", tstr);
/* create admin-serv/modules directory */
@@ -1032,7 +1050,7 @@
admConf.setFormat(2);
admConf.write(tstr);
chmod(tstr, S_IRUSR | S_IWUSR);
-
+ chown_file(SSuser, SSgroup, tstr);
logUninstallInfo(sroot, "admin", "admin", tstr);
// Mark to remove the following guys which are
@@ -1127,6 +1145,7 @@
snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot);
replaceTokensInFile(src, tstr, consolearray);
chmod(tstr, S_IRUSR | S_IWUSR);
+ chown_file(SSuser, SSgroup, tstr);
logUninstallInfo(sroot, "admin", "admin", tstr);
snprintf(tstr, sizeof(tstr), "%s/start-admin", sroot);
From fedora-directory-commits at redhat.com Thu Nov 10 01:13:01 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 9 Nov 2005 20:13:01 -0500
Subject: [Fedora-directory-commits] adminserver nsperl.mk,1.4,1.5
Message-ID: <200511100113.jAA1DVG9013122@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048/adminserver
Modified Files:
nsperl.mk
Log Message:
Bug(s) fixed: 172816
Bug Description: use system perl for AS PERL5; make files owned by AS uid
Reviewed by: Noriko (Thanks!)
Fix Description: 1) I made a similar fix to adminutil to use the system
perl for the PERL5 macro on all Linux systems. 2) The files admpw,
adm.conf, and console.conf are read and/or written by the httpd process,
which is owned by the SSuser (default nobody), so they must be owned by
that user.
Platforms tested: FC4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsperl.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsperl.mk 18 Aug 2005 18:57:33 -0000 1.4
+++ nsperl.mk 10 Nov 2005 01:12:54 -0000 1.5
@@ -80,18 +80,6 @@
ifeq ($(OSVER), HP-UXB.10.10)
PERL5=/u/robobld/nsperl/hpux/nsperl
endif
-ifeq ($(OSVER), Linux2.1)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), Linux2.2)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), Linux2.4)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), RHEL3)
-PERL5=/usr/bin/perl
-endif
-ifeq ($(OSVER), RHEL4)
-PERL5=/usr/bin/perl
+ifeq ($(BUILD_ARCH), Linux)
+PERL5=perl
endif
From fedora-directory-commits at redhat.com Thu Nov 10 01:35:58 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 9 Nov 2005 20:35:58 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.40,1.41
Message-ID: <200511100135.jAA1Zwuc013280@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13247/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 172818
Bug Description: Allow ldapserver rpm to be made externally
Reviewed by: Noriko (Thanks!)
Fix Description: Just use a simple sed command to replace the tokens in
the spec.tmpl file. Just assume Fedora branding for this. For some
reason, on FC4, the setup -b step does not work unless I added a second
echo yes to the command. The tar command used by the rpmbuild step must
have all of the command line arguments before the directory to tar. I
moved some things around to make the rpm build process more dsbuild
friendly.
Platforms tested: FC4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile 31 Oct 2005 15:55:29 -0000 1.40
+++ Makefile 10 Nov 2005 01:35:50 -0000 1.41
@@ -712,10 +712,12 @@
startdir=`pwd` ; cd $(BUILD_ROOT) ; builddir=`pwd` ; \
cd $$startdir ; cd $(INSTDIR)/.. ; \
if [ ! -f $(RPM_FILE_BASE).tar.gz ] ; then \
- if [ ! -f $(RPM_FILE_BASE) ] ; then \
+ if [ ! -d $(RPM_FILE_BASE) -a ! -f $(RPM_FILE_BASE) ] ; then \
ln -s $$builddir $(RPM_FILE_BASE) ; \
- fi ; tar cfh - --exclude \*/built --exclude \*/CVS $(RPM_FILE_BASE) --exclude \*/branding --exclude \*/RHEL* | gzip > $(RPM_FILE_BASE).tar.gz ; \
- rm $(RPM_FILE_BASE) ; \
+ fi ; tar cfh - --exclude \*/built --exclude \*/CVS --exclude \*/branding --exclude \*/RHEL* $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz ; \
+ if [ -h $(RPM_FILE_BASE) ] ; then \
+ rm $(RPM_FILE_BASE) ; \
+ fi ; \
fi
# execute the RPM build
rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) $(RPM_REQUIRES) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec
From fedora-directory-commits at redhat.com Thu Nov 10 01:35:52 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 9 Nov 2005 20:35:52 -0500
Subject: [Fedora-directory-commits] ldapserver Makefile, 1.27,
1.28 ldapserver.spec.tmpl, 1.15, 1.16
Message-ID: <200511100136.jAA1aNhB013289@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13247/ldapserver
Modified Files:
Makefile ldapserver.spec.tmpl
Log Message:
Bug(s) fixed: 172818
Bug Description: Allow ldapserver rpm to be made externally
Reviewed by: Noriko (Thanks!)
Fix Description: Just use a simple sed command to replace the tokens in
the spec.tmpl file. Just assume Fedora branding for this. For some
reason, on FC4, the setup -b step does not work unless I added a second
echo yes to the command. The tar command used by the rpmbuild step must
have all of the command line arguments before the directory to tar. I
moved some things around to make the rpm build process more dsbuild
friendly.
Platforms tested: FC4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile 29 Oct 2005 02:25:50 -0000 1.27
+++ Makefile 10 Nov 2005 01:35:45 -0000 1.28
@@ -346,7 +346,18 @@
$(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat $@
mv $@ $(OBJDIR)
+ifdef INTERNAL_BUILD
fedora-ds.spec: ldapserver.spec.tmpl branding/fedora/brandver.dat $(RELTOOLSPATH)/brandver.pl
sed -e s/@PLATFORM@/$(BUILD_ARCH)/g ldapserver.spec.tmpl > $@
$(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat $@
mv $@ $(OBJDIR)
+else
+fedora-ds.spec: ldapserver.spec.tmpl
+ sed -e s/@PLATFORM@/$(BUILD_ARCH)/g \
+ -e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
+ -e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
+ -e 's/@GEN-VERSION@/1.0/g' \
+ -e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
+ ldapserver.spec.tmpl > $@
+ mv $@ $(OBJDIR)
+endif # INTERNAL_BUILD
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ldapserver.spec.tmpl 9 Nov 2005 21:10:44 -0000 1.15
+++ ldapserver.spec.tmpl 10 Nov 2005 01:35:45 -0000 1.16
@@ -76,7 +76,8 @@
# all we do here is run setup -b to unpack the binaries
# into the BuildRoot
# the echo yes is for dsktune to continue
-echo yes | ./setup -b $RPM_BUILD_ROOT/%{prefix}
+# the second echo yes is for some platforms that need it
+(echo yes ; echo yes) | ./setup -b $RPM_BUILD_ROOT/%{prefix}
%clean
if [ -z "$RPM_INSTALL_PREFIX" ]; then
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:33 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:33 -0500
Subject: [Fedora-directory-commits] winsync/usersync/netman netman.dep, 1.1,
1.2 netman.mak, 1.2, 1.3
Message-ID: <200511100418.jAA4IX4l018239@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/netman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync/netman
Modified Files:
netman.dep netman.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: netman.dep
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/netman/netman.dep,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netman.dep 10 Nov 2005 00:05:20 -0000 1.1
+++ netman.dep 10 Nov 2005 04:18:26 -0000 1.2
@@ -1,44 +1,44 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Microsoft Developer Studio Generated Dependency File, included by netman.mak
-
-.\netman.cpp : \
- ".\netman.h"\
-
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Microsoft Developer Studio Generated Dependency File, included by netman.mak
+
+.\netman.cpp : \
+ ".\netman.h"\
+
+
Index: netman.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/netman/netman.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netman.mak 10 Nov 2005 00:37:02 -0000 1.2
+++ netman.mak 10 Nov 2005 04:18:26 -0000 1.3
@@ -1,249 +1,249 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for jnetman.dll and jnetman.jar
-#
-!IF "$(CFG)" == ""
-CFG=netman - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "netman - Win32 Release"
-
-OUTDIR=$(OBJDEST)\netman
-INTDIR=$(OBJDEST)\netman
-# Begin Custom Macros
-OutDir=$(OBJDEST)\netman
-# End Custom Macros
-
-ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
-
-
-CLEAN :
- - at erase "$(INTDIR)\jnetman_wrap.cxx "
- - at erase "$(INTDIR)\jnetman.dll"
- - at erase "$(INTDIR)\jnetman.lib"
- - at erase "$(INTDIR)\*.obj"
- - at erase "$(INTDIR)\*.java"
- - at erase "$(INTDIR)\jnetman.jar"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
-BSC32_SBRS= \
-
-SWIG=swig.exe
-SWIG_OPTS=-v -outdir "$(OUTDIR)"
-
-LINK32=link.exe
-LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
-LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
-LINK32_OBJS= \
- "$(INTDIR)\netman.obj" \
- "$(INTDIR)\jnetman_wrap.obj"
-
-"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
- $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
- move jnetman_wrap.cxx $(OUTDIR)
-
-"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
- $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
-
-!ELSEIF "$(CFG)" == "netman - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\netman
-INTDIR=$(OBJDEST)\netman
-# Begin Custom Macros
-OutDir=$(OBJDEST)\netman
-# End Custom Macros
-
-ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
-
-
-CLEAN :
- - at erase "$(INTDIR)\jnetman_wrap.cxx "
- - at erase "$(INTDIR)\jnetman.dll"
- - at erase "$(INTDIR)\jnetman.lib"
- - at erase "$(INTDIR)\*.obj"
- - at erase "$(INTDIR)\*.java"
- - at erase "$(INTDIR)\jnetman.jar"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
-BSC32_SBRS= \
-
-SWIG=swig.exe
-SWIG_OPTS=-v -outdir "$(OUTDIR)"
-
-LINK32=link.exe
-LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
-LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
-LINK32_OBJS= \
- "$(INTDIR)\netman.obj" \
- "$(INTDIR)\jnetman_wrap.obj"
-
-"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
- $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
- move jnetman_wrap.cxx "$(OUTDIR)"
-
-"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
- $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("netman.dep")
-!INCLUDE "netman.dep"
-!ELSE
-!MESSAGE Warning: cannot find "netman.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
-
-SOURCE=.\netman.cpp
-
-"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
-
-"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
-
-$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
- javac -d $(OUTDIR) $(OUTDIR)\*.java
- (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
-
-!ENDIF
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for jnetman.dll and jnetman.jar
+#
+!IF "$(CFG)" == ""
+CFG=netman - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "netman - Win32 Release"
+
+OUTDIR=$(OBJDEST)\netman
+INTDIR=$(OBJDEST)\netman
+# Begin Custom Macros
+OutDir=$(OBJDEST)\netman
+# End Custom Macros
+
+ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\jnetman_wrap.cxx "
+ - at erase "$(INTDIR)\jnetman.dll"
+ - at erase "$(INTDIR)\jnetman.lib"
+ - at erase "$(INTDIR)\*.obj"
+ - at erase "$(INTDIR)\*.java"
+ - at erase "$(INTDIR)\jnetman.jar"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
+BSC32_SBRS= \
+
+SWIG=swig.exe
+SWIG_OPTS=-v -outdir "$(OUTDIR)"
+
+LINK32=link.exe
+LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
+LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
+LINK32_OBJS= \
+ "$(INTDIR)\netman.obj" \
+ "$(INTDIR)\jnetman_wrap.obj"
+
+"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
+ $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
+ move jnetman_wrap.cxx $(OUTDIR)
+
+"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
+
+!ELSEIF "$(CFG)" == "netman - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\netman
+INTDIR=$(OBJDEST)\netman
+# Begin Custom Macros
+OutDir=$(OBJDEST)\netman
+# End Custom Macros
+
+ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\jnetman_wrap.cxx "
+ - at erase "$(INTDIR)\jnetman.dll"
+ - at erase "$(INTDIR)\jnetman.lib"
+ - at erase "$(INTDIR)\*.obj"
+ - at erase "$(INTDIR)\*.java"
+ - at erase "$(INTDIR)\jnetman.jar"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
+BSC32_SBRS= \
+
+SWIG=swig.exe
+SWIG_OPTS=-v -outdir "$(OUTDIR)"
+
+LINK32=link.exe
+LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
+LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
+LINK32_OBJS= \
+ "$(INTDIR)\netman.obj" \
+ "$(INTDIR)\jnetman_wrap.obj"
+
+"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
+ $(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
+ move jnetman_wrap.cxx "$(OUTDIR)"
+
+"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("netman.dep")
+!INCLUDE "netman.dep"
+!ELSE
+!MESSAGE Warning: cannot find "netman.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
+
+SOURCE=.\netman.cpp
+
+"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
+
+"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
+
+$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
+ javac -d $(OUTDIR) $(OUTDIR)\*.java
+ (cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
+
+!ENDIF
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:06 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:06 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync package.mak, 1.2,
1.3
Message-ID: <200511100418.jAA4IaIo018242@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/passwordsync
Modified Files:
package.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/package.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.mak 10 Nov 2005 00:36:40 -0000 1.2
+++ package.mak 10 Nov 2005 04:17:59 -0000 1.3
@@ -1,65 +1,65 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for PassSync.msi
-
-ALL : PassSync.msi
-
-LAYOUT :
- copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
- copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
- copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
-
-PassSync.msi : LAYOUT
- mkdir "$(PKGDIR)\Binary"
- copy /Y wix\Binary "$(PKGDIR)\Binary"
- cd "$(PKGDIR)"
- candle "$(WXSDIR)\PassSync.wxs"
- light PassSync.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for PassSync.msi
+
+ALL : PassSync.msi
+
+LAYOUT :
+ copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
+ copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
+ copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
+
+PassSync.msi : LAYOUT
+ mkdir "$(PKGDIR)\Binary"
+ copy /Y wix\Binary "$(PKGDIR)\Binary"
+ cd "$(PKGDIR)"
+ candle "$(WXSDIR)\PassSync.wxs"
+ light PassSync.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:17 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:17 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync/passsync
passsync.mak, 1.6, 1.7
Message-ID: <200511100418.jAA4Ilp2018250@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/passwordsync/passsync
Modified Files:
passsync.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: passsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- passsync.mak 10 Nov 2005 00:36:50 -0000 1.6
+++ passsync.mak 10 Nov 2005 04:18:09 -0000 1.7
@@ -1,261 +1,261 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for passsync.exe
-#
-!IF "$(CFG)" == ""
-CFG=passsync - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "passsync - Win32 Release"
-
-OUTDIR=$(OBJDEST)\passsync
-INTDIR=$(OBJDEST)\passsync
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passsync
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passsync.exe"
-
-
-CLEAN :
- - at erase "$(INTDIR)\ntservice.obj"
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\service.obj"
- - at erase "$(INTDIR)\subuniutil.obj"
- - at erase "$(INTDIR)\syncserv.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(OUTDIR)\passsync.exe"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe"
-LINK32_OBJS= \
- "$(INTDIR)\ntservice.obj" \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\service.obj" \
- "$(INTDIR)\subuniutil.obj" \
- "$(INTDIR)\syncserv.obj"
-
-"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "passsync - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\passsync
-INTDIR=$(OBJDEST)\passsync
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passsync
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passsync.exe"
-
-
-CLEAN :
- - at erase "$(INTDIR)\ntservice.obj"
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\service.obj"
- - at erase "$(INTDIR)\subuniutil.obj"
- - at erase "$(INTDIR)\syncserv.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(OUTDIR)\passsync.exe"
- - at erase "$(OUTDIR)\passsync.ilk"
- - at erase "$(OUTDIR)\passsync.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe"
-LINK32_OBJS= \
- "$(INTDIR)\ntservice.obj" \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\service.obj" \
- "$(INTDIR)\subuniutil.obj" \
- "$(INTDIR)\syncserv.obj"
-
-"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("passsync.dep")
-!INCLUDE "passsync.dep"
-!ELSE
-!MESSAGE Warning: cannot find "passsync.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
-SOURCE=.\ntservice.cpp
-
-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\service.cpp
-
-"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\subuniutil.cpp
-
-"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\syncserv.cpp
-
-"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for passsync.exe
+#
+!IF "$(CFG)" == ""
+CFG=passsync - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to passsync - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "passsync - Win32 Release" && "$(CFG)" != "passsync - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "passsync.mak" CFG="passsync - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "passsync - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "passsync - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "passsync - Win32 Release"
+
+OUTDIR=$(OBJDEST)\passsync
+INTDIR=$(OBJDEST)\passsync
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passsync
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passsync.exe"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\ntservice.obj"
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\service.obj"
+ - at erase "$(INTDIR)\subuniutil.obj"
+ - at erase "$(INTDIR)\syncserv.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(OUTDIR)\passsync.exe"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\passsync.pdb" /machine:I386 /out:"$(OUTDIR)\passsync.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\ntservice.obj" \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\service.obj" \
+ "$(INTDIR)\subuniutil.obj" \
+ "$(INTDIR)\syncserv.obj"
+
+"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "passsync - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\passsync
+INTDIR=$(OBJDEST)\passsync
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passsync
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passsync.exe"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\ntservice.obj"
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\service.obj"
+ - at erase "$(INTDIR)\subuniutil.obj"
+ - at erase "$(INTDIR)\syncserv.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(INTDIR)\vc60.pdb"
+ - at erase "$(OUTDIR)\passsync.exe"
+ - at erase "$(OUTDIR)\passsync.ilk"
+ - at erase "$(OUTDIR)\passsync.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passsync.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=nss3.lib libplc4.lib libnspr4.lib nsldappr32v50.lib nsldapssl32v50.lib nsldap32v50.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\passsync.pdb" /debug /machine:I386 /out:"$(OUTDIR)\passsync.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\ntservice.obj" \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\service.obj" \
+ "$(INTDIR)\subuniutil.obj" \
+ "$(INTDIR)\syncserv.obj"
+
+"$(OUTDIR)\passsync.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("passsync.dep")
+!INCLUDE "passsync.dep"
+!ELSE
+!MESSAGE Warning: cannot find "passsync.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
+SOURCE=.\ntservice.cpp
+
+"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=..\passhand.cpp
+
+"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\service.cpp
+
+"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\subuniutil.cpp
+
+"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\syncserv.cpp
+
+"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF
+
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:11 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:11 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync/passhook
passhook.mak, 1.9, 1.10
Message-ID: <200511100418.jAA4IgMi018247@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/passwordsync/passhook
Modified Files:
passhook.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: passhook.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- passhook.mak 10 Nov 2005 00:36:45 -0000 1.9
+++ passhook.mak 10 Nov 2005 04:18:04 -0000 1.10
@@ -1,246 +1,246 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for passhook.dll
-#
-!IF "$(CFG)" == ""
-CFG=passhook - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-!IF "$(CFG)" == "passhook - Win32 Release"
-
-OUTDIR=$(OBJDEST)\passhook
-INTDIR=$(OBJDEST)\passhook
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passhook
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passhook.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\passhook.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(OUTDIR)\passhook.dll"
- - at erase "$(OUTDIR)\passhook.exp"
- - at erase "$(OUTDIR)\passhook.lib"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
-DEF_FILE= \
- ".\passhook.def"
-LINK32_OBJS= \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\passhook.obj"
-
-"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF "$(CFG)" == "passhook - Win32 Debug"
-
-OUTDIR=$(OBJDEST)\passhook
-INTDIR=$(OBJDEST)\passhook
-# Begin Custom Macros
-OutDir=$(OBJDEST)\passhook
-# End Custom Macros
-
-ALL : "$(OUTDIR)\passhook.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\passhand.obj"
- - at erase "$(INTDIR)\passhook.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(OUTDIR)\passhook.dll"
- - at erase "$(OUTDIR)\passhook.exp"
- - at erase "$(OUTDIR)\passhook.ilk"
- - at erase "$(OUTDIR)\passhook.lib"
- - at erase "$(OUTDIR)\passhook.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
-DEF_FILE= \
- ".\passhook.def"
-LINK32_OBJS= \
- "$(INTDIR)\passhand.obj" \
- "$(INTDIR)\passhook.obj"
-
-"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("passhook.dep")
-!INCLUDE "passhook.dep"
-!ELSE
-!MESSAGE Warning: cannot find "passhook.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passhook.cpp
-
-"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for passhook.dll
+#
+!IF "$(CFG)" == ""
+CFG=passhook - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to passhook - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "passhook - Win32 Release" && "$(CFG)" != "passhook - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "passhook.mak" CFG="passhook - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "passhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "passhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "passhook - Win32 Release"
+
+OUTDIR=$(OBJDEST)\passhook
+INTDIR=$(OBJDEST)\passhook
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passhook
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passhook.dll"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\passhook.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(OUTDIR)\passhook.dll"
+ - at erase "$(OUTDIR)\passhook.exp"
+ - at erase "$(OUTDIR)\passhook.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\passhook.pdb" /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
+DEF_FILE= \
+ ".\passhook.def"
+LINK32_OBJS= \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\passhook.obj"
+
+"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "passhook - Win32 Debug"
+
+OUTDIR=$(OBJDEST)\passhook
+INTDIR=$(OBJDEST)\passhook
+# Begin Custom Macros
+OutDir=$(OBJDEST)\passhook
+# End Custom Macros
+
+ALL : "$(OUTDIR)\passhook.dll"
+
+
+CLEAN :
+ - at erase "$(INTDIR)\passhand.obj"
+ - at erase "$(INTDIR)\passhook.obj"
+ - at erase "$(INTDIR)\vc60.idb"
+ - at erase "$(INTDIR)\vc60.pdb"
+ - at erase "$(OUTDIR)\passhook.dll"
+ - at erase "$(OUTDIR)\passhook.exp"
+ - at erase "$(OUTDIR)\passhook.ilk"
+ - at erase "$(OUTDIR)\passhook.lib"
+ - at erase "$(OUTDIR)\passhook.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PASSHOOK_EXPORTS" /Fp"$(INTDIR)\passhook.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+MTL=midl.exe
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\passhook.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=nss3.lib libnspr4.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\passhook.pdb" /debug /machine:I386 /def:".\passhook.def" /out:"$(OUTDIR)\passhook.dll" /implib:"$(OUTDIR)\passhook.lib"
+DEF_FILE= \
+ ".\passhook.def"
+LINK32_OBJS= \
+ "$(INTDIR)\passhand.obj" \
+ "$(INTDIR)\passhook.obj"
+
+"$(OUTDIR)\passhook.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("passhook.dep")
+!INCLUDE "passhook.dep"
+!ELSE
+!MESSAGE Warning: cannot find "passhook.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
+SOURCE=..\passhand.cpp
+
+"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\passhook.cpp
+
+"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
+
+
+
+!ENDIF
+
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:22 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:22 -0500
Subject: [Fedora-directory-commits] winsync/usersync build.bat, 1.1,
1.2 package.mak, 1.2, 1.3
Message-ID: <200511100418.jAA4Iqka018254@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync
Modified Files:
build.bat package.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 10 Nov 2005 00:04:42 -0000 1.1
+++ build.bat 10 Nov 2005 04:18:15 -0000 1.2
@@ -1,169 +1,169 @@
- at rem //
- at rem // BEGIN COPYRIGHT BLOCK
- at rem // This Program is free software; you can redistribute it and/or modify it under
- at rem // the terms of the GNU General Public License as published by the Free Software
- at rem // Foundation; version 2 of the License.
- at rem //
- at rem // This Program is distributed in the hope that it will be useful, but WITHOUT
- at rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- at rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- at rem //
- at rem // You should have received a copy of the GNU General Public License along with
- at rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- at rem // Place, Suite 330, Boston, MA 02111-1307 USA.
- at rem //
- at rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
- at rem // right to link the code of this Program with code not covered under the GNU
- at rem // General Public License ("Non-GPL Code") and to distribute linked combinations
- at rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
- at rem // permitted under this exception must only link to the code of this Program
- at rem // through those well defined interfaces identified in the file named EXCEPTION
- at rem // found in the source code files (the "Approved Interfaces"). The files of
- at rem // Non-GPL Code may instantiate templates or use macros or inline functions from
- at rem // the Approved Interfaces without causing the resulting work to be covered by
- at rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
- at rem // additions to the list of Approved Interfaces. You must obey the GNU General
- at rem // Public License in all respects for all of the Program code and other code used
- at rem // in conjunction with the Program except the Non-GPL Code covered by this
- at rem // exception. If you modify this file, you may extend this exception to your
- at rem // version of the file, but you are not obligated to do so. If you do not wish to
- at rem // provide this exception without modification, you must delete this exception
- at rem // statement from your version and license this file solely under the GPL without
- at rem // exception.
- at rem //
- at rem //
- at rem // Copyright (C) 2005 Red Hat, Inc.
- at rem // All rights reserved.
- at rem // END COPYRIGHT BLOCK
- at rem //
-
- at echo off
-
-if [%BUILD_DEBUG%] == [optimize] (
- set FLAVOR=WINNT5.0_OPT.OBJ
-) else (
- set FLAVOR=WINNT5.0_DBG.OBJ
-)
-
-rem ======== Set Various Build Directories ========
-set OBJDEST=..\built\%FLAVOR%
-rem ------ Convert OBJEST to absolute ------
-call :relative %OBJDEST% OBJDEST
-
-set LIBROOT=..\components\%FLAVOR%
-rem ------ Convert LIBROOT to absolute ------
-call :relative %LIBROOT% LIBROOT
-mkdir %LIBROOT%
-
-set PKGDIR=%OBJDEST%\package\ntds
-mkdir %PKGDIR%
-
-set DISTDIR=..\dist\%FLAVOR%
-rem ------ Convert DISTDIR to absolute ------
-call :relative %DISTDIR% DISTDIR
-mkdir %DISTDIR%
-
-set WXSDIR=%CD%\wix
-
-rem ======== Fetch Components ========
-if [%INTERNAL_BUILD%] == [1] (
- set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
-) else (
- set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
-)
-
-rem ------ ApacheDS ------
-set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
-set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
-set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
-if NOT EXIST %LIBROOT%\apacheds (
- pushd %CD%
- mkdir %LIBROOT%\apacheds
- cd %LIBROOT%\apacheds
- echo %APACHEDS_LOCATION% > version.txt
- wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
- unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
- wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
- popd
-)
-
-rem ------ Wrapper ------
-set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
-set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
-if NOT EXIST %LIBROOT%\wrapper (
- pushd %CD%
- mkdir %LIBROOT%\wrapper
- cd %LIBROOT%\wrapper
- echo %WRAPPER_LOCATION% > version.txt
- wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
- unzip -q wrapper_win32_3.1.2.zip
- popd
-)
-
-set OK=0
-
-pushd %CD%
-
-rem ======== Build ========
-rem ------ Netman ------
-cd netman
-echo -------- Beginning Netman Build --------
-
-nmake /f netman.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if [%OK%] GTR [1] (
- echo -------- Netman Build Failed! --------
- goto :END
-) else (
- echo -------- Netman Build Successful! --------
-)
-
-rem ------ ApacheDS ------
-cd ..\apacheds
-echo -------- Beginning ApacheDS Build --------
-
-nmake /f apacheds.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if [%OK%] GTR [1] (
- echo -------- ApacheDS Build Failed! --------
- goto :END
-) else (
- echo -------- ApacheDS Build Successful! --------
-)
-
-rem ======== Package ========
-cd ..
-echo -------- Beginning Packaging --------
-
-nmake /f package.mak
-set /a OK=%OK% + %ERRORLEVEL%
-
-if EXIST %PKGDIR%\ntds.msi (
- copy /Y %PKGDIR%\ntds.msi %DISTDIR%
- set /a OK=%OK% + %ERRORLEVEL%
-)
-
-if [%OK%] GTR [1] (
- echo -------- Packaging Failed! --------
- goto :END
-) else (
- echo -------- Packaging Successful! --------
-)
-
-:END
-popd
-if [%OK%] GTR [1] (
- echo -------- Build Failed! --------
- set OK=1
-) else (
- echo -------- Build Successful! --------
-)
-exit %OK%
-
-:relative
-rem ======== Converts relative path to absolute path ========
-rem ------ %1 is the path, %2 is the variable to be set ------
-set %2=%~f1
-goto :EOF
+ at rem //
+ at rem // BEGIN COPYRIGHT BLOCK
+ at rem // This Program is free software; you can redistribute it and/or modify it under
+ at rem // the terms of the GNU General Public License as published by the Free Software
+ at rem // Foundation; version 2 of the License.
+ at rem //
+ at rem // This Program is distributed in the hope that it will be useful, but WITHOUT
+ at rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ at rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ at rem //
+ at rem // You should have received a copy of the GNU General Public License along with
+ at rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ at rem // Place, Suite 330, Boston, MA 02111-1307 USA.
+ at rem //
+ at rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
+ at rem // right to link the code of this Program with code not covered under the GNU
+ at rem // General Public License ("Non-GPL Code") and to distribute linked combinations
+ at rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
+ at rem // permitted under this exception must only link to the code of this Program
+ at rem // through those well defined interfaces identified in the file named EXCEPTION
+ at rem // found in the source code files (the "Approved Interfaces"). The files of
+ at rem // Non-GPL Code may instantiate templates or use macros or inline functions from
+ at rem // the Approved Interfaces without causing the resulting work to be covered by
+ at rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
+ at rem // additions to the list of Approved Interfaces. You must obey the GNU General
+ at rem // Public License in all respects for all of the Program code and other code used
+ at rem // in conjunction with the Program except the Non-GPL Code covered by this
+ at rem // exception. If you modify this file, you may extend this exception to your
+ at rem // version of the file, but you are not obligated to do so. If you do not wish to
+ at rem // provide this exception without modification, you must delete this exception
+ at rem // statement from your version and license this file solely under the GPL without
+ at rem // exception.
+ at rem //
+ at rem //
+ at rem // Copyright (C) 2005 Red Hat, Inc.
+ at rem // All rights reserved.
+ at rem // END COPYRIGHT BLOCK
+ at rem //
+
+ at echo off
+
+if [%BUILD_DEBUG%] == [optimize] (
+ set FLAVOR=WINNT5.0_OPT.OBJ
+) else (
+ set FLAVOR=WINNT5.0_DBG.OBJ
+)
+
+rem ======== Set Various Build Directories ========
+set OBJDEST=..\built\%FLAVOR%
+rem ------ Convert OBJEST to absolute ------
+call :relative %OBJDEST% OBJDEST
+
+set LIBROOT=..\components\%FLAVOR%
+rem ------ Convert LIBROOT to absolute ------
+call :relative %LIBROOT% LIBROOT
+mkdir %LIBROOT%
+
+set PKGDIR=%OBJDEST%\package\ntds
+mkdir %PKGDIR%
+
+set DISTDIR=..\dist\%FLAVOR%
+rem ------ Convert DISTDIR to absolute ------
+call :relative %DISTDIR% DISTDIR
+mkdir %DISTDIR%
+
+set WXSDIR=%CD%\wix
+
+rem ======== Fetch Components ========
+if [%INTERNAL_BUILD%] == [1] (
+ set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
+) else (
+ set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
+)
+
+rem ------ ApacheDS ------
+set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
+set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
+set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
+if NOT EXIST %LIBROOT%\apacheds (
+ pushd %CD%
+ mkdir %LIBROOT%\apacheds
+ cd %LIBROOT%\apacheds
+ echo %APACHEDS_LOCATION% > version.txt
+ wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
+ unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
+ wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
+ popd
+)
+
+rem ------ Wrapper ------
+set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
+set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
+if NOT EXIST %LIBROOT%\wrapper (
+ pushd %CD%
+ mkdir %LIBROOT%\wrapper
+ cd %LIBROOT%\wrapper
+ echo %WRAPPER_LOCATION% > version.txt
+ wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
+ unzip -q wrapper_win32_3.1.2.zip
+ popd
+)
+
+set OK=0
+
+pushd %CD%
+
+rem ======== Build ========
+rem ------ Netman ------
+cd netman
+echo -------- Beginning Netman Build --------
+
+nmake /f netman.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if [%OK%] GTR [1] (
+ echo -------- Netman Build Failed! --------
+ goto :END
+) else (
+ echo -------- Netman Build Successful! --------
+)
+
+rem ------ ApacheDS ------
+cd ..\apacheds
+echo -------- Beginning ApacheDS Build --------
+
+nmake /f apacheds.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if [%OK%] GTR [1] (
+ echo -------- ApacheDS Build Failed! --------
+ goto :END
+) else (
+ echo -------- ApacheDS Build Successful! --------
+)
+
+rem ======== Package ========
+cd ..
+echo -------- Beginning Packaging --------
+
+nmake /f package.mak
+set /a OK=%OK% + %ERRORLEVEL%
+
+if EXIST %PKGDIR%\ntds.msi (
+ copy /Y %PKGDIR%\ntds.msi %DISTDIR%
+ set /a OK=%OK% + %ERRORLEVEL%
+)
+
+if [%OK%] GTR [1] (
+ echo -------- Packaging Failed! --------
+ goto :END
+) else (
+ echo -------- Packaging Successful! --------
+)
+
+:END
+popd
+if [%OK%] GTR [1] (
+ echo -------- Build Failed! --------
+ set OK=1
+) else (
+ echo -------- Build Successful! --------
+)
+exit %OK%
+
+:relative
+rem ======== Converts relative path to absolute path ========
+rem ------ %1 is the path, %2 is the variable to be set ------
+set %2=%~f1
+goto :EOF
Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/package.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.mak 10 Nov 2005 00:36:51 -0000 1.2
+++ package.mak 10 Nov 2005 04:18:15 -0000 1.3
@@ -1,72 +1,72 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for ntds.msi
-#
-
-ALL : ntds.msi
-
-LAYOUT :
- mkdir "$(PKGDIR)\bin"
- copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
- copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
- copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
- copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
- copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
- copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
- copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
-
- mkdir "$(PKGDIR)\conf"
- copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
- copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
-
- mkdir "$(PKGDIR)\lib"
- copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
- copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
- copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
-
- mkdir "$(PKGDIR)\logs"
-
-
-ntds.msi : LAYOUT
- mkdir "$(PKGDIR)\Binary"
- copy /Y wix\Binary "$(PKGDIR)\Binary"
- cd "$(PKGDIR)"
- candle "$(WXSDIR)\ntds.wxs"
- light ntds.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for ntds.msi
+#
+
+ALL : ntds.msi
+
+LAYOUT :
+ mkdir "$(PKGDIR)\bin"
+ copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
+ copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
+ copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
+ copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
+ copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
+ copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
+ copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
+
+ mkdir "$(PKGDIR)\conf"
+ copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
+ copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
+
+ mkdir "$(PKGDIR)\lib"
+ copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
+ copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
+ copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
+
+ mkdir "$(PKGDIR)\logs"
+
+
+ntds.msi : LAYOUT
+ mkdir "$(PKGDIR)\Binary"
+ copy /Y wix\Binary "$(PKGDIR)\Binary"
+ cd "$(PKGDIR)"
+ candle "$(WXSDIR)\ntds.wxs"
+ light ntds.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:28 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:28 -0500
Subject: [Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak,
1.2, 1.3
Message-ID: <200511100418.jAA4Iw4G018257@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135/usersync/apacheds
Modified Files:
apacheds.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: apacheds.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/apacheds/apacheds.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apacheds.mak 10 Nov 2005 00:36:56 -0000 1.2
+++ apacheds.mak 10 Nov 2005 04:18:20 -0000 1.3
@@ -1,62 +1,62 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for usersync.jar
-#
-
-OUTDIR=$(OBJDEST)\apacheds
-USERSYNCJAR=$(OUTDIR)\usersync.jar
-CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
-
-ALL : "$(USERSYNCJAR)"
-
-
-$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
- copy project.properties "$(APACHEDSSOURCE)\core"
- copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
- maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
- javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
- javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
-
-$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
- ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
- move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
-
-$(OUTDIR) :
- if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for usersync.jar
+#
+
+OUTDIR=$(OBJDEST)\apacheds
+USERSYNCJAR=$(OUTDIR)\usersync.jar
+CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
+
+ALL : "$(USERSYNCJAR)"
+
+
+$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
+ copy project.properties "$(APACHEDSSOURCE)\core"
+ copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
+ maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
+ javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
+ javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
+
+$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
+ ( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
+ move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
+
+$(OUTDIR) :
+ if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
From fedora-directory-commits at redhat.com Thu Nov 10 04:18:01 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Wed, 9 Nov 2005 23:18:01 -0500
Subject: [Fedora-directory-commits] winsync winsync.mak,1.2,1.3
Message-ID: <200511100419.jAA4J1Ic018260@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18135
Modified Files:
winsync.mak
Log Message:
Remove carriage returns from nmake makefiles
Index: winsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/winsync.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- winsync.mak 10 Nov 2005 00:36:34 -0000 1.2
+++ winsync.mak 10 Nov 2005 04:17:52 -0000 1.3
@@ -1,59 +1,59 @@
-#
-# 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) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# nmake Makefile for Windows Sync components
-#
-
-ALL : PASSSYNC NTDS
-
-CLEAN_ALL : CLEAN
- if exist components rmdir /S/Q components
-
-CLEAN :
- if exist built rmdir /S/Q built
- if exist dist rmdir /S/Q dist
-
-PASSSYNC :
- cd passwordsync
- build.bat
- cd ..
-
-NTDS :
- cd usersync
- build.bat
- cd ..
+#
+# 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) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# nmake Makefile for Windows Sync components
+#
+
+ALL : PASSSYNC NTDS
+
+CLEAN_ALL : CLEAN
+ if exist components rmdir /S/Q components
+
+CLEAN :
+ if exist built rmdir /S/Q built
+ if exist dist rmdir /S/Q dist
+
+PASSSYNC :
+ cd passwordsync
+ build.bat
+ cd ..
+
+NTDS :
+ cd usersync
+ build.bat
+ cd ..
From fedora-directory-commits at redhat.com Thu Nov 10 19:28:47 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 10 Nov 2005 14:28:47 -0500
Subject: [Fedora-directory-commits] winsync winsync.mak,NONE,1.1
Message-ID: <200511101928.jAAJSlUH014821@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742
Added Files:
winsync.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE winsync.mak ---
#
# 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) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for Windows Sync components
#
ALL : PASSSYNC NTDS
CLEAN_ALL : CLEAN
if exist components rmdir /S/Q components
CLEAN :
if exist built rmdir /S/Q built
if exist dist rmdir /S/Q dist
PASSSYNC :
cd passwordsync
build.bat
cd ..
NTDS :
cd usersync
build.bat
cd ..
From fedora-directory-commits at redhat.com Thu Nov 10 19:28:53 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 10 Nov 2005 14:28:53 -0500
Subject: [Fedora-directory-commits] winsync/passwordsync package.mak, NONE,
1.1
Message-ID: <200511101928.jAAJSrwm014878@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/passwordsync
Added Files:
package.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for PassSync.msi
ALL : PassSync.msi
LAYOUT :
copy /Y "$(OBJDEST)\passsync\passsync.exe" "$(PKGDIR)"
copy /Y "$(OBJDEST)\passhook\passhook.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldap32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldapssl32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\ldapsdk\lib\nsldappr32v50.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libnspr4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplds4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nspr\lib\libplc4.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\nss3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\ssl3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\softokn3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\lib\smime3.dll" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\certutil.exe" "$(PKGDIR)"
copy /Y "$(LIBROOT)\nss\bin\pk12util.exe" "$(PKGDIR)"
PassSync.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\PassSync.wxs"
light PassSync.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 19:28:53 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 10 Nov 2005 14:28:53 -0500
Subject: [Fedora-directory-commits] winsync/usersync build.bat, NONE,
1.1 package.mak, NONE, 1.1
Message-ID: <200511101928.jAAJSrR3014883@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/usersync
Added Files:
build.bat package.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE build.bat ---
@rem //
@rem // BEGIN COPYRIGHT BLOCK
@rem // This Program is free software; you can redistribute it and/or modify it under
@rem // the terms of the GNU General Public License as published by the Free Software
@rem // Foundation; version 2 of the License.
@rem //
@rem // This Program is distributed in the hope that it will be useful, but WITHOUT
@rem // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@rem // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@rem //
@rem // You should have received a copy of the GNU General Public License along with
@rem // this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
@rem // Place, Suite 330, Boston, MA 02111-1307 USA.
@rem //
@rem // In addition, as a special exception, Red Hat, Inc. gives You the additional
@rem // right to link the code of this Program with code not covered under the GNU
@rem // General Public License ("Non-GPL Code") and to distribute linked combinations
@rem // including the two, subject to the limitations in this paragraph. Non-GPL Code
@rem // permitted under this exception must only link to the code of this Program
@rem // through those well defined interfaces identified in the file named EXCEPTION
@rem // found in the source code files (the "Approved Interfaces"). The files of
@rem // Non-GPL Code may instantiate templates or use macros or inline functions from
@rem // the Approved Interfaces without causing the resulting work to be covered by
@rem // the GNU General Public License. Only Red Hat, Inc. may make changes or
@rem // additions to the list of Approved Interfaces. You must obey the GNU General
@rem // Public License in all respects for all of the Program code and other code used
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
@rem // provide this exception without modification, you must delete this exception
@rem // statement from your version and license this file solely under the GPL without
@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2005 Red Hat, Inc.
@rem // All rights reserved.
@rem // END COPYRIGHT BLOCK
@rem //
@echo off
if [%BUILD_DEBUG%] == [optimize] (
set FLAVOR=WINNT5.0_OPT.OBJ
) else (
set FLAVOR=WINNT5.0_DBG.OBJ
)
rem ======== Set Various Build Directories ========
set OBJDEST=..\built\%FLAVOR%
rem ------ Convert OBJEST to absolute ------
call :relative %OBJDEST% OBJDEST
set LIBROOT=..\components\%FLAVOR%
rem ------ Convert LIBROOT to absolute ------
call :relative %LIBROOT% LIBROOT
mkdir %LIBROOT%
set PKGDIR=%OBJDEST%\package\ntds
mkdir %PKGDIR%
set DISTDIR=..\dist\%FLAVOR%
rem ------ Convert DISTDIR to absolute ------
call :relative %DISTDIR% DISTDIR
mkdir %DISTDIR%
set WXSDIR=%CD%\wix
rem ======== Fetch Components ========
if [%INTERNAL_BUILD%] == [1] (
set COMPONENT_URL=http://ftp-rel.sfbay.redhat.com/share/builds/components
) else (
set COMPONENT_URL=http://directory.fedora.redhat.com/built/components
)
rem ------ ApacheDS ------
set APACHEDS_LOCATION=%COMPONENT_URL%/apacheds/0.9
set APACHEDSSOURCE=%OBJDEST%\apacheds\apacheds-0.9
set APACHEDS_FILE=%LIBROOT%\apacheds\apacheds-main-0.9.jar
if NOT EXIST %LIBROOT%\apacheds (
pushd %CD%
mkdir %LIBROOT%\apacheds
cd %LIBROOT%\apacheds
echo %APACHEDS_LOCATION% > version.txt
wget --no-directories %APACHEDS_LOCATION%/apacheds-0.9-src.zip
unzip -q -d%OBJDEST%\apacheds apacheds-0.9-src.zip
wget --no-directories %APACHEDS_LOCATION%/apacheds-main-0.9.jar
popd
)
rem ------ Wrapper ------
set WRAPPER_LOCATION=%COMPONENT_URL%/wrapper/3.1.2
set WRAPPER_FILES=%LIBROOT%\wrapper\wrapper_win32_3.1.2
if NOT EXIST %LIBROOT%\wrapper (
pushd %CD%
mkdir %LIBROOT%\wrapper
cd %LIBROOT%\wrapper
echo %WRAPPER_LOCATION% > version.txt
wget --no-directories %WRAPPER_LOCATION%/wrapper_win32_3.1.2.zip
unzip -q wrapper_win32_3.1.2.zip
popd
)
set OK=0
pushd %CD%
rem ======== Build ========
rem ------ Netman ------
cd netman
echo -------- Beginning Netman Build --------
nmake /f netman.mak
set /a OK=%OK% + %ERRORLEVEL%
if [%OK%] GTR [1] (
echo -------- Netman Build Failed! --------
goto :END
) else (
echo -------- Netman Build Successful! --------
)
rem ------ ApacheDS ------
cd ..\apacheds
echo -------- Beginning ApacheDS Build --------
nmake /f apacheds.mak
set /a OK=%OK% + %ERRORLEVEL%
if [%OK%] GTR [1] (
echo -------- ApacheDS Build Failed! --------
goto :END
) else (
echo -------- ApacheDS Build Successful! --------
)
rem ======== Package ========
cd ..
echo -------- Beginning Packaging --------
nmake /f package.mak
set /a OK=%OK% + %ERRORLEVEL%
if EXIST %PKGDIR%\ntds.msi (
copy /Y %PKGDIR%\ntds.msi %DISTDIR%
set /a OK=%OK% + %ERRORLEVEL%
)
if [%OK%] GTR [1] (
echo -------- Packaging Failed! --------
goto :END
) else (
echo -------- Packaging Successful! --------
)
:END
popd
if [%OK%] GTR [1] (
echo -------- Build Failed! --------
set OK=1
) else (
echo -------- Build Successful! --------
)
exit %OK%
:relative
rem ======== Converts relative path to absolute path ========
rem ------ %1 is the path, %2 is the variable to be set ------
set %2=%~f1
goto :EOF
--- NEW FILE package.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Packaging nmake Makefile for ntds.msi
#
ALL : ntds.msi
LAYOUT :
mkdir "$(PKGDIR)\bin"
copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
mkdir "$(PKGDIR)\conf"
copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
mkdir "$(PKGDIR)\lib"
copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
mkdir "$(PKGDIR)\logs"
ntds.msi : LAYOUT
mkdir "$(PKGDIR)\Binary"
copy /Y wix\Binary "$(PKGDIR)\Binary"
cd "$(PKGDIR)"
candle "$(WXSDIR)\ntds.wxs"
light ntds.wixobj
From fedora-directory-commits at redhat.com Thu Nov 10 19:29:04 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 10 Nov 2005 14:29:04 -0500
Subject: [Fedora-directory-commits]
winsync/usersync/netman netman.dep, NONE, 1.1 netman.mak, NONE, 1.1
Message-ID: <200511101929.jAAJT4uH014917@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/netman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/usersync/netman
Added Files:
netman.dep netman.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE netman.dep ---
#
# 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) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# Microsoft Developer Studio Generated Dependency File, included by netman.mak
.\netman.cpp : \
".\netman.h"\
--- NEW FILE netman.mak ---
#
# 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) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for jnetman.dll and jnetman.jar
#
!IF "$(CFG)" == ""
CFG=netman - Win32 Debug
!MESSAGE No configuration specified. Defaulting to netman - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "netman - Win32 Release" && "$(CFG)" != "netman - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "netman.mak" CFG="netman - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "netman - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "netman - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "netman - Win32 Release"
OUTDIR=$(OBJDEST)\netman
INTDIR=$(OBJDEST)\netman
# Begin Custom Macros
OutDir=$(OBJDEST)\netman
# End Custom Macros
ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
CLEAN :
- at erase "$(INTDIR)\jnetman_wrap.cxx "
- at erase "$(INTDIR)\jnetman.dll"
- at erase "$(INTDIR)\jnetman.lib"
- at erase "$(INTDIR)\*.obj"
- at erase "$(INTDIR)\*.java"
- at erase "$(INTDIR)\jnetman.jar"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
BSC32_SBRS= \
SWIG=swig.exe
SWIG_OPTS=-v -outdir "$(OUTDIR)"
LINK32=link.exe
LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /out:"$(OUTDIR)\jnetman.dll"
LINK32_OBJS= \
"$(INTDIR)\netman.obj" \
"$(INTDIR)\jnetman_wrap.obj"
"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
$(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
move jnetman_wrap.cxx $(OUTDIR)
"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
$(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
!ELSEIF "$(CFG)" == "netman - Win32 Debug"
OUTDIR=$(OBJDEST)\netman
INTDIR=$(OBJDEST)\netman
# Begin Custom Macros
OutDir=$(OBJDEST)\netman
# End Custom Macros
ALL : "$(OUTDIR)\jnetman_wrap.cxx" "$(OUTDIR)\jnetman.dll" "$(OUTDIR)\jnetman.jar"
CLEAN :
- at erase "$(INTDIR)\jnetman_wrap.cxx "
- at erase "$(INTDIR)\jnetman.dll"
- at erase "$(INTDIR)\jnetman.lib"
- at erase "$(INTDIR)\*.obj"
- at erase "$(INTDIR)\*.java"
- at erase "$(INTDIR)\jnetman.jar"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\netman.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\netman.bsc"
BSC32_SBRS= \
SWIG=swig.exe
SWIG_OPTS=-v -outdir "$(OUTDIR)"
LINK32=link.exe
LINK32_LIBS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib netapi32.lib
LINK32_FLAGS=/nologo /DLL /SUBSYSTEM:WINDOWS /pdb:"$(OUTDIR)\jnetman.pdb" /debug /out:"$(OUTDIR)\jnetman.dll"
LINK32_OBJS= \
"$(INTDIR)\netman.obj" \
"$(INTDIR)\jnetman_wrap.obj"
"$(OUTDIR)\jnetman_wrap.cxx" : "$(OUTDIR)"
$(SWIG) $(SWIG_OPTS) -java -package org.bpi.jnetman -c++ jnetman.i
move jnetman_wrap.cxx "$(OUTDIR)"
"$(OUTDIR)\jnetman.dll" : "$(OUTDIR)\netman.obj" "$(OUTDIR)\jnetman_wrap.obj"
$(LINK32) $(LINK32_FLAGS) $(LINK32_LIBS) $(LINK32_OBJS)
!ENDIF
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("netman.dep")
!INCLUDE "netman.dep"
!ELSE
!MESSAGE Warning: cannot find "netman.dep"
!ENDIF
!ENDIF
!IF "$(CFG)" == "netman - Win32 Release" || "$(CFG)" == "netman - Win32 Debug"
SOURCE=.\netman.cpp
"$(INTDIR)\netman.obj" : $(SOURCE) "$(INTDIR)"
SOURCE="$(OUTDIR)\jnetman_wrap.cxx"
"$(INTDIR)\jnetman_wrap.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) /I"$(JAVA_HOME)\include" /I"$(JAVA_HOME)\include\win32" /I. $(SOURCE)
$(OUTDIR)\jnetman.jar : $(SOURCE) "$(OUTDIR)"
javac -d $(OUTDIR) $(OUTDIR)\*.java
(cd $(OUTDIR) && jar cf $(OUTDIR)\jnetman.jar org)
!ENDIF
From fedora-directory-commits at redhat.com Thu Nov 10 19:28:58 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Thu, 10 Nov 2005 14:28:58 -0500
Subject: [Fedora-directory-commits] winsync/usersync/apacheds apacheds.mak,
NONE, 1.1
Message-ID: <200511101928.jAAJSweE014905@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/usersync/apacheds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14742/usersync/apacheds
Added Files:
apacheds.mak
Log Message:
Initial checkin of stand-alone winsync build-system
--- NEW FILE apacheds.mak ---
#
# BEGIN COPYRIGHT BLOCK
# This Program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; version 2 of the License.
#
# This Program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
#
# In addition, as a special exception, Red Hat, Inc. gives You the additional
# right to link the code of this Program with code not covered under the GNU
# General Public License ("Non-GPL Code") and to distribute linked combinations
# including the two, subject to the limitations in this paragraph. Non-GPL Code
# permitted under this exception must only link to the code of this Program
# through those well defined interfaces identified in the file named EXCEPTION
# found in the source code files (the "Approved Interfaces"). The files of
# Non-GPL Code may instantiate templates or use macros or inline functions from
# the Approved Interfaces without causing the resulting work to be covered by
# the GNU General Public License. Only Red Hat, Inc. may make changes or
# additions to the list of Approved Interfaces. You must obey the GNU General
# Public License in all respects for all of the Program code and other code used
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
# provide this exception without modification, you must delete this exception
# statement from your version and license this file solely under the GPL without
# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
# nmake Makefile for usersync.jar
#
OUTDIR=$(OBJDEST)\apacheds
USERSYNCJAR=$(OUTDIR)\usersync.jar
CLASSPATH=$(APACHEDS_FILE);$(OBJDEST)\netman\jnetman.jar
ALL : "$(USERSYNCJAR)"
$(APACHEDSSOURCE)\core\target : "$(OBJDEST)\netman\jnetman.jar" "$(OUTDIR)"
copy project.properties "$(APACHEDSSOURCE)\core"
copy usersync.schema "$(APACHEDSSOURCE)\core\src\main\schema"
maven -b -d "$(APACHEDSSOURCE)\core" -e directory:schema
javac -classpath "$(CLASSPATH)" $(APACHEDSSOURCE)\core\target\schema\org\apache\ldap\server\schema\bootstrap\*.java
javac -classpath "$(CLASSPATH)" -d "$(APACHEDSSOURCE)\core\target\schema" org\apache\ldap\server\*.java
$(USERSYNCJAR) : "$(APACHEDSSOURCE)\core\target"
( cd "$(APACHEDSSOURCE)\core\target\schema" && jar cf usersync.jar org)
move "$(APACHEDSSOURCE)\core\target\schema\usersync.jar" "$(USERSYNCJAR)"
$(OUTDIR) :
if not exist "$(OUTDIR)" mkdir "$(OUTDIR)"
From fedora-directory-commits at redhat.com Thu Nov 10 22:38:01 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 10 Nov 2005 17:38:01 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd saslbind.c, 1.13, 1.14
Message-ID: <200511102238.jAAMc1Od022272@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/ldap/servers/slapd
Modified Files:
saslbind.c
Log Message:
[172824] Link SASL library dynamically
i1) For non-RHEL platforms, package cyrus sasl library and the supported plugins.
2) by default, cyrus sasl expects to see the plugins in /usr/lib/sasl2.
Instead, tell sasl to search "../../../lib/sasl2" (relative path from ns-slapd)
for the plugins.
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- saslbind.c 8 Nov 2005 15:58:22 -0000 1.13
+++ saslbind.c 10 Nov 2005 22:37:54 -0000 1.14
@@ -551,7 +551,18 @@
return returnvalue;
}
-static sasl_callback_t ids_sasl_callbacks[5] =
+#ifdef CYRUS_SASL
+#if !defined(LINUX)
+static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path)
+{
+ static char *pluginpath = "../../../lib/sasl2";
+ *path = pluginpath;
+ return SASL_OK;
+}
+#endif
+#endif
+
+static sasl_callback_t ids_sasl_callbacks[] =
{
{
SASL_CB_GETOPT,
@@ -577,6 +588,19 @@
(IFP) ids_sasl_canon_user,
NULL
},
+#ifdef CYRUS_SASL
+ /* On Linux: we use system sasl and plugins are found in the default path
+ * /usr/lib/sasl2
+ * On other platforms: we need to tell cyrus sasl where they are localted.
+ */
+#if !defined(LINUX)
+ {
+ SASL_CB_GETPATH,
+ (IFP) ids_sasl_getpluginpath,
+ NULL
+ },
+#endif
+#endif
{
SASL_CB_LIST_END,
(IFP) NULL,
From fedora-directory-commits at redhat.com Thu Nov 10 22:37:56 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 10 Nov 2005 17:37:56 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.41,1.42
Message-ID: <200511102238.jAAMcRnA022275@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22242/ldap/cm
Modified Files:
Makefile
Log Message:
[172824] Link SASL library dynamically
i1) For non-RHEL platforms, package cyrus sasl library and the supported plugins.
2) by default, cyrus sasl expects to see the plugins in /usr/lib/sasl2.
Instead, tell sasl to search "../../../lib/sasl2" (relative path from ns-slapd)
for the plugins.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile 10 Nov 2005 01:35:50 -0000 1.41
+++ Makefile 10 Nov 2005 22:37:49 -0000 1.42
@@ -423,6 +423,14 @@
endif
endif
+# if not Linux, we need package sasl library and supported plugins
+ifneq ($(ARCH), Linux)
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/lib
+ -mkdir $(RELDIR)/lib/sasl2
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(RELDIR)/lib/sasl2
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(RELDIR)/lib/sasl2
+endif
+
# the plugin API
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin.h $(RELDIR)/plugins/slapd/slapi/include
$(INSTALL) -m 644 $(NSPR_INCDIR)/*.h $(RELDIR)/plugins/slapd/slapi/include
From fedora-directory-commits at redhat.com Fri Nov 11 14:34:09 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 11 Nov 2005 09:34:09 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.42,1.43
Message-ID: <200511111434.jABEY94q018769@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18753/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Reviewed by Nathan (Thanks!)
Fix: Put the dsml gateway and command line jar files in a package called
extjava.tar.gz so that users can choose to deploy these separately if they
want dsml functionality.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile 10 Nov 2005 22:37:49 -0000 1.42
+++ Makefile 11 Nov 2005 14:34:01 -0000 1.43
@@ -234,6 +234,11 @@
NSDIST = $(BUILD_ROOT)/../dist
DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG)
+# this is the directory into which we place those java files and associated
+# web services files that are Apache or Java licensed - we cannot put them
+# in the same rpm/tarball as the directory server, so we create a separate
+# package for them, using the below macro as the staging area
+EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava
DS_JAR_DEST_PATH = java/jars
XMLTOOLS_JAR_FILE = xmltools.jar
@@ -336,29 +341,33 @@
done
# install the DSMLGW into the client directory
+# the following DSML files must be packaged separately:
+# web-app_2_3.dtd, activation.jar, saaj.jar - due to Sun license
+# jaxrpc-api.jar, jaxrpc.jar, xercesImpl.jar, xml-apis.jar, crimson.jar - due to Apache license
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
+ $(MKDIR) $(EXT_JAVA_RELDIR)/clients/dsmlgw
if [ -d $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis ] ; then \
- $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(EXT_JAVA_RELDIR)/clients/dsmlgw/ ; \
fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/server-config.wsdd $(RELDIR)/clients/dsmlgw/WEB-INF
- $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
+ $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(EXT_JAVA_RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
$(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
# if so, I'm not sure where to get the implementation
if [ -f $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar ] ; then \
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
fi
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
endif # USE_DSMLGW
# PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install
@@ -479,9 +488,9 @@
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(EXT_JAVA_RELDIR)/$(DS_JAR_DEST_PATH)
if [ -f $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) ] ; then \
- $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(EXT_JAVA_RELDIR)/$(DS_JAR_DEST_PATH) ; \
fi
endif
@@ -619,6 +628,10 @@
endif
endif
+ifeq ($(USE_DSMLGW), 1)
+ cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
+endif
+
ifeq ($(USE_CONSOLE),1)
# create the slapd-client.zip file, which only has the ds jar file for the console and
# the ldap client utility programs
From fedora-directory-commits at redhat.com Mon Nov 14 03:57:40 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Sun, 13 Nov 2005 22:57:40 -0500
Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.29,
1.30
Message-ID: <200511140357.jAE3ve9J008752@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8736/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
allow developers to build an adminserver with the 3 Apache modules included for convenience but not packaging
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pkgadmin.mk 3 Nov 2005 23:20:44 -0000 1.29
+++ pkgadmin.mk 14 Nov 2005 03:57:32 -0000 1.30
@@ -121,6 +121,21 @@
IZIP = $(ZIP) -ry9uT -n .gif
endif
+ifdef PKG_APACHE_MODULES
+ifndef MOD_ADMSERV_LIB_DIR
+ MOD_ADMSERV_LIB_DIR=$(BUILD_ROOT)/../mod_admserv/.libs
+endif
+ifndef MOD_RESTARTD_LIB_DIR
+ MOD_RESTARTD_LIB_DIR=$(BUILD_ROOT)/../mod_restartd/.libs
+endif
+ifndef MOD_NSS_LIB_DIR
+ MOD_NSS_LIB_DIR=$(BUILD_ROOT)/../mod_nss/.libs
+endif
+ifndef MOD_NSS_BIN_DIR
+ MOD_NSS_BIN_DIR=$(BUILD_ROOT)/../mod_nss
+endif
+endif
+
ifneq ($(strip $(ADM_VERSION)),)
all:
-if [ ! -d $(PKGTOP) ]; then \
@@ -295,6 +310,14 @@
# Copy shared configuration
cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config
+# The Apache modules, if present
+ifdef PKG_APACHE_MODULES
+ cp $(MOD_ADMSERV_LIB_DIR)/libmodadmserv.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_RESTARTD_LIB_DIR)/libmodrestartd.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_LIB_DIR)/libmodnss.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_BIN_DIR)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
+endif
+
#
# Cleanup before making distributable tar
#
From fedora-directory-commits at redhat.com Mon Nov 14 04:14:18 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Sun, 13 Nov 2005 23:14:18 -0500
Subject: [Fedora-directory-commits] directoryconsole build.xml,1.2,1.3
Message-ID: <200511140414.jAE4EIP8010362@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10346
Modified Files:
build.xml
Log Message:
allow the definition of the console location on the command line with different directory layouts than the default
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 28 Oct 2005 18:01:11 -0000 1.2
+++ build.xml 14 Nov 2005 04:14:11 -0000 1.3
@@ -79,10 +79,10 @@
-
-
-
-
+
+
+
+
From fedora-directory-commits at redhat.com Wed Nov 16 03:18:36 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 15 Nov 2005 22:18:36 -0500
Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.30,
1.31
Message-ID: <200511160318.jAG3IagD003687@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
put the Apache modules back into the packaging - the gpl is compatible with the apl in this specific instance - also enable using ant and java from PATH by default for external builds
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pkgadmin.mk 14 Nov 2005 03:57:32 -0000 1.30
+++ pkgadmin.mk 16 Nov 2005 03:18:29 -0000 1.31
@@ -121,6 +121,9 @@
IZIP = $(ZIP) -ry9uT -n .gif
endif
+# enable apache module packaging by default - apl is compatible with the gpl
+# in this specific instance
+PKG_APACHE_MODULES = 1
ifdef PKG_APACHE_MODULES
ifndef MOD_ADMSERV_LIB_DIR
MOD_ADMSERV_LIB_DIR=$(BUILD_ROOT)/../mod_admserv/.libs
From fedora-directory-commits at redhat.com Wed Nov 16 03:18:31 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 15 Nov 2005 22:18:31 -0500
Subject: [Fedora-directory-commits] adminserver nsconfig.mk,1.18,1.19
Message-ID: <200511160319.jAG3J1eF003690@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657/adminserver
Modified Files:
nsconfig.mk
Log Message:
put the Apache modules back into the packaging - the gpl is compatible with the apl in this specific instance - also enable using ant and java from PATH by default for external builds
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nsconfig.mk 3 Nov 2005 23:20:38 -0000 1.18
+++ nsconfig.mk 16 Nov 2005 03:18:24 -0000 1.19
@@ -30,12 +30,18 @@
ABS_ROOT := $(shell cd $(BUILD_ROOT)/..; pwd)
NSROOT = $(BUILD_ROOT)
+ifdef INTERNAL_BUILD
# the directory containing pre-built binary components for use during
# building and packaging, including Red Hat branded components
COMPONENTS_DIR = /share/builds/components
INT_DIR = /share/builds/sbsintegration
# these are Fedora branded components - only a few components are branded
FED_COMPONENTS_DIR = /fedora/components
+else
+# just set these by default
+GET_JAVA_FROM_PATH := 1
+GET_ANT_FROM_PATH := 1
+endif
include $(NSROOT)/nsdefs.mk
From fedora-directory-commits at redhat.com Wed Nov 16 03:31:14 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 15 Nov 2005 22:31:14 -0500
Subject: [Fedora-directory-commits] ldapserver nsconfig.mk,1.16,1.17
Message-ID: <200511160331.jAG3VERB003763@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3745
Modified Files:
nsconfig.mk
Log Message:
set defaults to build java code, and use java, ant, and perl from PATH for external builds
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nsconfig.mk 3 Oct 2005 19:53:40 -0000 1.16
+++ nsconfig.mk 16 Nov 2005 03:31:05 -0000 1.17
@@ -75,6 +75,10 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+ GET_JAVA_FROM_PATH := 1
+ GET_ANT_FROM_PATH := 1
+ USE_PERL_FROM_PATH := 1
+ BUILD_JAVA_CODE := 1
endif
include $(BUILD_ROOT)/nsdefs.mk
From fedora-directory-commits at redhat.com Wed Nov 16 03:32:35 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 15 Nov 2005 22:32:35 -0500
Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.16,
1.17
Message-ID: <200511160332.jAG3WZ9j003790@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3774
Modified Files:
ldapserver.spec.tmpl
Log Message:
added a dependency on httpd
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ldapserver.spec.tmpl 10 Nov 2005 01:35:45 -0000 1.16
+++ ldapserver.spec.tmpl 16 Nov 2005 03:32:27 -0000 1.17
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
+Requires: perl,httpd,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
Prefix: /opt/%{name}
%description
From fedora-directory-commits at redhat.com Wed Nov 16 03:53:14 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Tue, 15 Nov 2005 22:53:14 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.43,1.44
Message-ID: <200511160353.jAG3rEd6003877@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3853
Modified Files:
Makefile
Log Message:
add jar files back to the main package - even though the gpl and apl are not generally compatible, they are compatible for this specific case
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile 11 Nov 2005 14:34:01 -0000 1.43
+++ Makefile 16 Nov 2005 03:53:06 -0000 1.44
@@ -238,7 +238,9 @@
# web services files that are Apache or Java licensed - we cannot put them
# in the same rpm/tarball as the directory server, so we create a separate
# package for them, using the below macro as the staging area
-EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava
+#EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava
+# actually, we can - GPL is compatible with APL in this situation
+EXT_JAVA_RELDIR = $(RELDIR)
DS_JAR_DEST_PATH = java/jars
XMLTOOLS_JAR_FILE = xmltools.jar
@@ -629,7 +631,7 @@
endif
ifeq ($(USE_DSMLGW), 1)
- cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
+# cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz
endif
ifeq ($(USE_CONSOLE),1)
From fedora-directory-commits at redhat.com Wed Nov 16 17:40:42 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Wed, 16 Nov 2005 12:40:42 -0500
Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.17,
1.18
Message-ID: <200511161740.jAGHeg8A031302@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31286
Modified Files:
ldapserver.spec.tmpl
Log Message:
remove Requires for java - breaks non-RHEL platforms - we should either change the spec file to include the dependency only on RHEL, or just wait until gcj/classpath can run our stuff
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ldapserver.spec.tmpl 16 Nov 2005 03:32:27 -0000 1.17
+++ ldapserver.spec.tmpl 16 Nov 2005 17:40:35 -0000 1.18
@@ -58,7 +58,7 @@
# Don't automatically generate provides list
AutoProv: 0
# Without Requires: something, rpmbuild will abort!
-Requires: perl,httpd,java-1.4.2-ibm,cyrus-sasl >= 2.1.15
+Requires: perl,httpd,cyrus-sasl >= 2.1.15
Prefix: /opt/%{name}
%description
From fedora-directory-commits at redhat.com Wed Nov 16 18:45:19 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:45:19 -0500
Subject: [Fedora-directory-commits] adminutil/tests - New directory
Message-ID: <200511161845.jAGIjJKp000845@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831/tests
Log Message:
Directory /cvs/dirsec/adminutil/tests added to the repository
From fedora-directory-commits at redhat.com Wed Nov 16 18:50:28 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:50:28 -0500
Subject: [Fedora-directory-commits] adminutil/tests Makefile, NONE,
1.1 readme.txt, NONE, 1.1 retrieveSIE.c, NONE, 1.1
Message-ID: <200511161850.jAGIoSw7000952@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/tests
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/tests
Added Files:
Makefile readme.txt retrieveSIE.c
Log Message:
--- NEW FILE Makefile ---
#
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
BUILD_ROOT=..
include ../nsconfig.mk
OBJDEST:=$(OBJDIR)/tests
OBJS:=$(OBJDEST)/retrieveSIE
all: $(OBJDEST) $(OBJS)
$(OBJDEST)/retrieveSIE: retrieveSIE.c
$(CC) $(CFLAGS) $(MCC_INCLUDE) $< -o $@ $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) -L$(OBJDIR)/lib -ladminutil10
$(OBJDEST):
-mkdir $(OBJDEST)
run: $(OBJDEST) $(OBJS)
LD_LIBRARY_PATH=$(NSPR_LIBPATH):$(LDAPSDK_LIBPATH):$(ICU_LIBPATH):$(OBJDIR)/lib $(OBJDEST)/retrieveSIE $(SERVER_ROOT)
--- NEW FILE readme.txt ---
#
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
Test Case 1: test an api retrieveSIEs
How to run:
gmake [ INTERNAL_BUILD=1 ] run [ SERVER_ROOT= ]
default SERVER_ROOT: /opt/redhat-ds
Sample output:
$ gmake run SERVER_ROOT=/export/servers/ds72
Server Root: /export/servers/ds72
cn=slapd-laputa, cn=Fedora Directory Server, cn=Server Group, cn=laputa.sfbay.redhat.com, ou=sfbay.redhat.com, o=NetscapeRoot
SUCCESS: SIE is retrieved
--- NEW FILE retrieveSIE.c ---
/*
* BEGIN COPYRIGHT BLOCK
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version
* 2.1 of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* END COPYRIGHT BLOCK
*/
/*
* retireveSIE.c: test program to test an API getServerDNList
* Usage: retireveSIE [ ]
*/
#include
#include
#include
#include "libadminutil/admutil.h"
#include "libadminutil/srvutil.h"
main(int ac, char **av)
{
AdmldapInfo ldapInfo = NULL;
AttrNameList nameList = NULL;
char *svrroot = "/opt/redhat-ds";
char *admroot = NULL;
int len = 0;
int rval = 0;
char **p;
int siecnt = 0;
if (ac > 1) {
svrroot = strdup(*(av+1));
}
if (NULL == svrroot || 0 == strlen(svrroot)) {
fprintf(stderr, "ERROR: server root was not specified.\n");
exit(1);
} else {
fprintf(stdout, "%s: Server Root: %s\n", *av, svrroot);
}
len = strlen(svrroot) + 32;
admroot = (char *)malloc(len);
if (NULL == admroot) {
fprintf(stderr, "ERROR: failed to allocate %d bytes\n", len);
exit(1);
}
sprintf(admroot, "%s/admin-serv/config", svrroot);
/*
* get the LDAP information from admin server config info
*/
ldapInfo = admldapBuildInfo(admroot, &rval);
if (NULL == ldapInfo) {
fprintf(stderr, "ERROR: empty ldapInfo\n");
rval = 1;
goto done;
}
/*
* get servers' DNs belonging to the Admin Server
*/
nameList = getServerDNList(ldapInfo);
if (NULL == nameList) {
fprintf(stderr, "ERROR: empty nameList\n");
rval = 1;
goto done;
}
for (p = nameList; p && *p; p++) {
fprintf(stdout, "%s\n", *p);
if (0 == strncasecmp(*p, "cn=", 3)) {
siecnt++;
}
}
if (siecnt > 0) {
fprintf(stdout, "SUCCESS: SIE%s retrieved\n", siecnt>1?"S are":" is");
} else {
fprintf(stdout, "FAILURE: SIE is not retrieved\n");
}
done:
free(admroot);
exit(rval);
}
From fedora-directory-commits at redhat.com Wed Nov 16 18:50:06 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:50:06 -0500
Subject: [Fedora-directory-commits] adminutil Makefile, 1.1.1.1,
1.2 adminutil.spec.tmpl, 1.1.1.1, 1.2 nsdefs.mk, 1.3,
1.4 pkgadminutil.mk, 1.3, 1.4 fedora-adminutil.spec.tmpl,
1.1.1.1, NONE
Message-ID: <200511161850.jAGIoao3000957@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856
Modified Files:
Makefile adminutil.spec.tmpl nsdefs.mk pkgadminutil.mk
Removed Files:
fedora-adminutil.spec.tmpl
Log Message:
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ Makefile 16 Nov 2005 18:49:58 -0000 1.2
@@ -49,19 +49,14 @@
$(RELTOOLS):
cd $(ABS_ROOT_PARENT) ; cvs co RelToolsLite
-brandAdminUtil: $(RELTOOLS)
- @echo ==== Branding AdminUtil ==========
- $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/rh/brandver.dat -s redhat-adminutil.spec
- @echo ==== Finished Branding AdminUtil ==========
-
-debrandAdminUtil: $(RELTOOLS)
- @echo ==== Deranding AdminUtil ==========
- $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-adminutil.spec
- @echo ==== Finished Deranding AdminUtil ==========
+versionAdminUtil: $(RELTOOLS)
+ @echo ==== Versioning AdminUtil ==========
+ $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat
+ @echo ==== Finished Versioning AdminUtil ==========
normalizeAdminUtil: $(RELTOOLS)
@echo ==== Normalizing Admin Util ==========
- $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s fedora-adminutil.spec
+ $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat
@echo ==== Finished Normalizing Admin Util ==========
endif
@@ -97,13 +92,11 @@
@echo ==== Finished Admin Util Package ==========
@echo
-redhat-adminutil.spec: adminutil.spec.tmpl branding/rh/brandver.dat $(RELTOOLSPATH)/brandver.pl
- sed -e s/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g adminutil.spec.tmpl > $@
- $(RELTOOLSPATH)/brandver.pl -i branding/rh/spec.dat $@
- mv $@ $(OBJDIR)
-
-fedora-adminutil.spec:
- sed -e s/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g $@.tmpl > $@
- mv $@ $(OBJDIR)
-
-
+$(ADMINUTILSPEC):
+ sed -e 's/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g' \
+ -e 's/@GEN-VERSION@/1.0/g' \
+ -e 's/@GEN-VERSION-NODOT@/10/g' \
+ -e 's/@PRODUCT-NAME@/Admin Util/g' \
+ -e 's/@PRODUCT-SHORT-NAME@/adminutil/g' \
+ -e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
+ adminutil.spec.tmpl > $@
Index: adminutil.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec.tmpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- adminutil.spec.tmpl 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ adminutil.spec.tmpl 16 Nov 2005 18:49:58 -0000 1.2
@@ -6,12 +6,12 @@
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
-#
+#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -24,8 +24,8 @@
# don't bother stripping - we already do this for optimized, and we definitely
# want the symbols in the debug builds
%define __os_install_post %{nil}
-Summary: @COMPANY-PRODUCT-NAME@
-Name: @LCASE-COMPANY-NAME-NOSP at -adminutil-devel
+Summary: @PRODUCT-NAME@
+Name: @PRODUCT-SHORT-NAME@
Version: @GEN-VERSION@
Release: 1. at PLATFORM@
License: LGPL
@@ -38,29 +38,78 @@
# dependencies that we don't care about, and refuses to install
Autoreq: 0
# Without Requires: something, rpmbuild will abort!
+# Note: depending upon nspr, nss, ldapsdk, and icu
Requires: perl
-Prefix: /opt/%{name}
+Prefix: /
-%description
- at COMPANY-PRODUCT-NAME@ is a library to configure your servers using the Configuration Directory Server.
+%description
+ at PRODUCT-NAME@ is a library to configure your servers using the Configuration Directory Server.
+
+%prep
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/lib/adminutil-properties
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/lib/
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/include/adminutil-1.0/libadminutil
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/include/adminutil-1.0/libadmsslutil
-# no %prep
# no %build
%install
-mkdir -p $RPM_BUILD_ROOT/%{prefix}
-cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}
+cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}/usr
%clean
-rm -rf $RPM_BUILD_ROOT/opt
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.so
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.so
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/adminutil-properties
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.a
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.a
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0
%files
%defattr(-,root,root,-)
-%{prefix}
+%{prefix}/usr/lib/libadminutil10.so
+%{prefix}/usr/lib/libadmsslutil10.so
+%{prefix}/usr/lib/adminutil-properties/libadminutil_root.res
+
+%pre
%post
echo "Install finished."
+%postun
+rm -rf $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/adminutil-properties
+
# no %preun
+%package devel
+Summary: @PRODUCT-NAME@ Development Kit
+Group: System Environment/Libraries
+
+%description devel
+ at PRODUCT-NAME@ Header files and static libraries for development
+
+%files devel
+%defattr(-,root,root,-)
+%{prefix}/usr/lib/libadminutil10.a
+%{prefix}/usr/lib/libadmsslutil10.a
+%{prefix}/usr/include/adminutil-1.0/libadminutil/admutil.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/distadm.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/prodinfo.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/psetc.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/resource.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/srvutil.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/admsslutil.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/certmgt.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/psetcssl.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/SECerrs.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/srvutilssl.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/SSLerrs.h
+
+%pre devel
+mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/lib
+mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadminutil
+mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadmsslutil
+
+%postun devel
+rm -rf $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0
+
%changelog
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsdefs.mk 26 Oct 2005 16:35:28 -0000 1.3
+++ nsdefs.mk 16 Nov 2005 18:49:58 -0000 1.4
@@ -240,6 +240,8 @@
DIRVERDIR=$(COMMON_OBJDIR)/include
DIRVER_H=$(DIRVERDIR)/dirver.h
+ADMINUTILSPEC=$(OBJDIR)/adminutil.spec
+
#
# -- Default Section --------------------------------------------------------
#
Index: pkgadminutil.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pkgadminutil.mk 26 Oct 2005 16:35:28 -0000 1.3
+++ pkgadminutil.mk 16 Nov 2005 18:49:58 -0000 1.4
@@ -47,12 +47,13 @@
endif
ABS_INSTDIR := $(shell if test \! -f $(INSTDIR); then mkdir $(INSTDIR); fi; cd $(INSTDIR); pwd)
ABS_PKGINSTDIR := $(shell if test \! -f $(PKGINSTDIR); then mkdir $(PKGINSTDIR); fi; cd $(PKGINSTDIR); pwd)
+INCL_ADMINUTIL := adminutil-1.0
+PROP_ADMINUTIL := adminutil-properties
# set the values of the macros used by rpmbuild
# name and version of RPM - must correspond to the spec file - these get branded
-RPM_BASE_NAME=fedora
RPM_VERSION=1.0
-RPM_FILE_BASE=$(RPM_BASE_NAME)-adminutil-devel-$(RPM_VERSION)
+RPM_FILE_BASE=adminutil-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
ABS_TOPDIR = $(ABS_INSTDIR)
@@ -78,17 +79,17 @@
rm -rf $(PKGDIR)
-$(MKDIR) $(PKGDIR)
-$(MKDIR) $(PKGDIR)/include
- -$(MKDIR) $(PKGDIR)/include/libadminutil
- -$(MKDIR) $(PKGDIR)/include/libadmsslutil
+ -$(MKDIR) $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadminutil
+ -$(MKDIR) $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
-$(MKDIR) $(PKGDIR)/lib
- -$(MKDIR) $(PKGDIR)/lib/property
+ -$(MKDIR) $(PKGDIR)/lib/$(PROP_ADMINUTIL)
- cp -p $(ABS_ROOT)/include/libadminutil/*.h $(PKGDIR)/include/libadminutil
- cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/libadmsslutil
+ cp -p $(ABS_ROOT)/include/libadminutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadminutil
+ cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
# Don't package sslpset.h
- rm -f $(PKGDIR)/include/libadmsslutil/sslpset.h
+ rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h
cp -p $(ADMSERV_OBJDIR)/lib/*.* $(PKGDIR)/lib
- cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/property
+ cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/$(PROP_ADMINUTIL)
pkgSBC:
-$(RM) -rf $(ABS_PKGINSTDIR)
@@ -106,7 +107,7 @@
pkgRPM:
ifdef BUILD_RPM
# make a spec file (it's moved to OBJDIR)
- $(MAKE) -C $(ABS_ROOT) $(RPM_BASE_NAME)-adminutil.spec
- rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-adminutil.spec
+ $(MAKE) -C $(ABS_ROOT) $(ADMINUTILSPEC)
+ rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(ADMINUTILSPEC)
cd $(ABS_INSTDIR); rm -f $(RPM_FILE_BASE).tar.gz
endif # BUILD_RPM
--- fedora-adminutil.spec.tmpl DELETED ---
From fedora-directory-commits at redhat.com Wed Nov 16 18:50:11 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:50:11 -0500
Subject: [Fedora-directory-commits] adminutil/include version.h,1.2,1.3
Message-ID: <200511161850.jAGIog3j000961@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/include
Modified Files:
version.h
Log Message:
Index: version.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/version.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- version.h 26 Oct 2005 16:31:25 -0000 1.2
+++ version.h 16 Nov 2005 18:50:04 -0000 1.3
@@ -25,7 +25,7 @@
#include
-#define ADMSDK_NAME "Admin Server SDK Library"
+#define ADMSDK_NAME "Administration Server Utility"
#ifdef _DEBUG
#define ADMSDK_PRODUCT ADMSDK_NAME " (debug)"
#define ADMSDK_FLAGS VS_FF_DEBUG
@@ -39,5 +39,5 @@
#define ADMSDK_VERSION "1.0"
#define ADMSDK_SO_VERSION "10"
-#define VI_COMPANYNAME "Fedora Project"
+#define VI_COMPANYNAME "Red Hat, Inc."
#define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc."
From fedora-directory-commits at redhat.com Wed Nov 16 18:50:17 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:50:17 -0500
Subject: [Fedora-directory-commits]
adminutil/include/libadminutil srvutil.h, 1.1.1.1, 1.2
Message-ID: <200511161850.jAGIolDw000964@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/include/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/include/libadminutil
Modified Files:
srvutil.h
Log Message:
Index: srvutil.h
===================================================================
RCS file: /cvs/dirsec/adminutil/include/libadminutil/srvutil.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- srvutil.h 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ srvutil.h 16 Nov 2005 18:50:09 -0000 1.2
@@ -28,7 +28,7 @@
#endif
PR_IMPLEMENT(AttrNameList)
-retrieveSIEs(PsetHndl domainPset, char* domainDN);
+retrieveSIEs(PsetHndl domainPset, char* domainDN, char *adminName);
PR_IMPLEMENT(AttrNameList)
getServerDNList(AdmldapInfo info);
From fedora-directory-commits at redhat.com Wed Nov 16 18:50:17 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:50:17 -0500
Subject: [Fedora-directory-commits] adminutil/lib/libadminutil
dllVersionInfo.rc, 1.1.1.1, 1.2 srvutil.c, 1.1.1.1, 1.2
Message-ID: <200511161850.jAGIolYE000968@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/lib/libadminutil
Modified Files:
dllVersionInfo.rc srvutil.c
Log Message:
Index: dllVersionInfo.rc
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/dllVersionInfo.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dllVersionInfo.rc 20 Jul 2005 22:51:32 -0000 1.1.1.1
+++ dllVersionInfo.rc 16 Nov 2005 18:50:15 -0000 1.2
@@ -50,7 +50,7 @@
VALUE "InternalName", INTERNAL_NAME "\0"
VALUE "LegalCopyright", VI_COPYRIGHT "\0"
VALUE "OriginalFilename", INTERNAL_NAME ".dll\0"
- VALUE "ProductName", "Fedora Administration Server\0"
+ VALUE "ProductName", "Administration Server\0"
VALUE "ProductVersion", ADMSDK_VERSION "\0"
END
END
Index: srvutil.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/srvutil.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- srvutil.c 20 Jul 2005 22:51:32 -0000 1.1.1.1
+++ srvutil.c 16 Nov 2005 18:50:15 -0000 1.2
@@ -30,23 +30,37 @@
PR_IMPLEMENT(AttrNameList)
getServerDNList(AdmldapInfo info)
{
- char *domainDN, *isie, *sie;
+ char *domainDN = NULL, *isie = NULL, *sie = NULL;
+ char *ptr = NULL, *adminName = NULL;
PsetHndl domainPset;
int errorCode;
ListNodePtr dnList=NULL, node=NULL;
AttrNameList nl;
isie = admldapGetISIEDN(info);
- domainDN=strchr(isie, ',');
- if (!domainDN) return NULL;
+ /*
+ * ISIE sample:
+ * isie: cn= Administration Server, cn=Server Group, cn=myhost.example.com, ou=example.com, o=NetscapeRoot
+ */
+ ptr = strchr(isie, ',');
+ if (!ptr) goto err;
+
+ *ptr = '\0'; /* to cut out " Administration Server" later */
sie = admldapGetSIEDN(info);
- domainDN++;
+ ptr++;
- while (*domainDN == ' ' && *domainDN != '\0') domainDN++;
+ while (*ptr == ' ' && *ptr != '\0') ptr++;
- if (*domainDN == '\0') return NULL;
+ if (*ptr == '\0') goto err;
+
+ domainDN = PL_strdup(ptr);
+ if (!domainDN) goto err;
+
+ adminName = strchr(isie, '=');
+ if (!adminName) goto err;
+ adminName++;
/* Use domainDN to create a pset */
domainPset = psetRealCreate(admldapGetHost(info),
@@ -57,16 +71,23 @@
NULL,
&errorCode);
- if (!domainPset) return NULL;
+ if (!domainPset) goto err;
- nl = retrieveSIEs(domainPset, domainDN);
+ nl = retrieveSIEs(domainPset, domainDN, adminName);
- psetDelete(domainPset);
+ psetDelete(domainPset); /* free sie, domainDN, internally */
+ if (isie) PR_Free(isie);
return nl;
+
+err:
+ if (isie) PR_Free(isie);
+ if (sie) PR_Free(sie);
+ if (domainDN) PR_Free(domainDN);
+ return NULL;
}
PR_IMPLEMENT(AttrNameList)
-retrieveSIEs(PsetHndl domainPset, char* domainDN)
+retrieveSIEs(PsetHndl domainPset, char* domainDN, char *adminName)
{
char *sieDN = NULL, *name, *sieName, *attrName;
int errorCode, i, isieLen;
@@ -78,7 +99,7 @@
nl = childrenList;
while (name = *nl++) {
- if (strcasecmp(name, "Fedora Administration Server")) {
+ if (strcasecmp(name, adminName)) {
sieList = psetGetChildren(domainPset, name, &errorCode);
nl1 = sieList;
isieLen = PL_strlen(name);
From fedora-directory-commits at redhat.com Wed Nov 16 18:50:23 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 16 Nov 2005 13:50:23 -0500
Subject: [Fedora-directory-commits] adminutil/lib/libadmsslutil
dllVersionInfo.rc, 1.1.1.1, 1.2 srvutilssl.c, 1.1.1.1, 1.2
Message-ID: <200511161850.jAGIorMZ000972@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminutil/lib/libadmsslutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856/lib/libadmsslutil
Modified Files:
dllVersionInfo.rc srvutilssl.c
Log Message:
Index: dllVersionInfo.rc
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/dllVersionInfo.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dllVersionInfo.rc 20 Jul 2005 22:51:33 -0000 1.1.1.1
+++ dllVersionInfo.rc 16 Nov 2005 18:50:15 -0000 1.2
@@ -50,7 +50,7 @@
VALUE "InternalName", INTERNAL_NAME "\0"
VALUE "LegalCopyright", VI_COPYRIGHT "\0"
VALUE "OriginalFilename", INTERNAL_NAME ".dll\0"
- VALUE "ProductName", "Fedora Administration Server\0"
+ VALUE "ProductName", "Administration Server\0"
VALUE "ProductVersion", ADMSDK_VERSION "\0"
END
END
Index: srvutilssl.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/srvutilssl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- srvutilssl.c 20 Jul 2005 22:51:33 -0000 1.1.1.1
+++ srvutilssl.c 16 Nov 2005 18:50:15 -0000 1.2
@@ -26,23 +26,37 @@
PR_IMPLEMENT(AttrNameList)
getServerDNListSSL(AdmldapInfo info)
{
- char *domainDN, *isie, *sie;
+ char *domainDN = NULL, *isie = NULL, *sie = NULL;
+ char *ptr = NULL, *adminName = NULL;
PsetHndl domainPset;
int errorCode;
AttrNameList nl;
-
isie = admldapGetISIEDN(info);
- domainDN=strchr(isie, ',');
- if (!domainDN) return NULL;
+ /*
+ * ISIE sample:
+ * isie: cn= Administration Server, cn=Server Group, cn=myhost.example.com, ou=example.com, o=NetscapeRoot
+ */
+
+ ptr=strchr(isie, ',');
+ if (!ptr) goto err;
+
+ *ptr = '\0'; /* to cut out " Administration Server" later */
sie = admldapGetSIEDN(info);
- domainDN++;
+ ptr++;
- while (*domainDN == ' ' && *domainDN != '\0') domainDN++;
+ while (*ptr == ' ' && *ptr != '\0') ptr++;
- if (*domainDN == '\0') return NULL;
+ if (*ptr == '\0') goto err;
+
+ domainDN = PL_strdup(ptr);
+ if (!domainDN) goto err;
+
+ adminName = strchr(isie, '=');
+ if (!adminName) goto err;
+ adminName++;
/* Use domainDN to create a pset */
domainPset = psetRealCreateSSL(admldapGetHost(info),
@@ -54,12 +68,19 @@
NULL,
&errorCode);
- if (!domainPset) return NULL;
+ if (!domainPset) goto err;
- nl = retrieveSIEs(domainPset, domainDN);
+ nl = retrieveSIEs(domainPset, domainDN, adminName);
- psetDelete(domainPset);
+ psetDelete(domainPset); /* free sie, domainDN, internally */
+ if (isie) PR_Free(isie);
return nl;
+
+err:
+ if (isie) PR_Free(isie);
+ if (sie) PR_Free(sie);
+ if (domainDN) PR_Free(domainDN);
+ return NULL;
}
PR_IMPLEMENT(AttributeList)
From fedora-directory-commits at redhat.com Thu Nov 17 17:34:47 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 17 Nov 2005 12:34:47 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst ns-update, 1.8, 1.9
Message-ID: <200511171734.jAHHYlqv017573@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17550/ldapserver/ldap/cm/newinst
Modified Files:
ns-update
Log Message:
Fix the problem with the Admin Server console - error opening the encryption tab. The solution is to chown the alias directory to the admin server uid so that the security CGI can create the key/cert dbs in that directory.
Index: ns-update
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ns-update 21 Oct 2005 19:21:18 -0000 1.8
+++ ns-update 17 Nov 2005 17:34:35 -0000 1.9
@@ -165,6 +165,33 @@
cd `dirname $0`
+# we need to make sure the alias directory is owned by the server user/group
+# in order for the server to be able to create the initial key/cert db files
+
+# get the inf file name
+seenfarg=
+inffile=
+for arg in "$@" ; do
+ if [ $seenfarg ] ; then
+ inffile=$arg
+ break
+ fi
+ if [ "$arg" = "-f" ] ; then
+ seenfarg=1
+ fi
+done
+
+if [ ! -f "$inffile" ] ; then
+ echo "WARNING: Could not read the setup info file $inffile"
+else
+# grab the ssuser and ssgrp
+ ssuser=`grep SuiteSpotUserID $inffile | sed -e 's/SuiteSpotUserID[ ]*=[ ]*//'`
+ ssgrp=`grep SuiteSpotGroup $inffile | sed -e 's/SuiteSpotGroup[ ]*=[ ]*//'`
+# echo "user = $ssuser group = $ssgrp"
+# chown the alias directory
+ chown $ssuser:$ssgrp $sroot/alias
+fi
+
rc=0
./ds_create $* $extraflags
rc=$?
From fedora-directory-commits at redhat.com Thu Nov 17 17:38:32 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 17 Nov 2005 12:38:32 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.13,
1.14
Message-ID: <200511171738.jAHHcW8Y017604@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17579/ldapserver/ldap/cm/newinst
Modified Files:
setup
Log Message:
Fix two problems
1) setup was not using the correct value for the config admin ID during reconfig. The fix is to get the correct uid from the admpw file.
2) It is often difficult to figure out the correct id/url for the admin server when running it for the first time. The fix is for setup to print out the correct command to use so the user can copy/paste it into the terminal. The commands are also saved to setup.log in case they close the terminal window.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- setup 31 Oct 2005 15:55:35 -0000 1.13
+++ setup 17 Nov 2005 17:38:25 -0000 1.14
@@ -137,6 +137,19 @@
echo $rval
}
+getValFromAdmpw() {
+ cfile=$1
+ rval=`head -1 $sroot/admin-serv/config/$cfile | cut -f1 -d\:`
+ echo $rval
+}
+
+getValFromInf() {
+ cattr=$1
+ cfile=$2
+ rval=`grep -i ^$cattr $cfile | head -1 | sed -e 's/^.*=[ ]*//'`
+ echo $rval
+}
+
logfile=`doMktmp log`
myargs=
silent=
@@ -361,7 +374,7 @@
ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
adminport=`getValFromAdminConf "\> $inffile
echo "ServerRoot= $sroot" >> $inffile
echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile
- echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+ echo "ConfigDirectoryAdminID= $adminid" >> $inffile
echo "AdminDomain= $admindomain" >> $inffile
echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
echo "" >> $inffile
echo "[admin]" >> $inffile
- echo "ServerAdminID= $siepid" >> $inffile
+ echo "ServerAdminID= $adminid" >> $inffile
echo "ServerAdminPwd= $siepasswd" >> $inffile
echo "SysUser= $sysuser" >> $inffile
echo "Port= $adminport" >> $inffile
@@ -499,6 +512,16 @@
SSLOn
+# get user, host, port for startconsole
+adminport=`getValFromInf Port $inffile`
+adminhost=`getValFromInf FullMachineName $inffile`
+adminuser=`getValFromInf ConfigDirectoryAdminID $inffile`
+
+echo ""
+echo "You can now use the console. Here is the command to use to start the console:" | tee -a $logfile
+echo "cd $sroot" | tee -a $logfile
+echo "./startconsole -u $adminuser -a http://$adminhost:$adminport/" | tee -a $logfile
+echo""
echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
if [ -f setup/setup.log ] ; then
cat $logfile >> setup/setup.log
@@ -518,4 +541,5 @@
fi
rm -f $inffile
fi
+
exit 0
From fedora-directory-commits at redhat.com Thu Nov 17 17:41:19 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 17 Nov 2005 12:41:19 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd main.c, 1.7, 1.8
Message-ID: <200511171741.jAHHfJxN017626@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17610/ldapserver/ldap/servers/slapd
Modified Files:
main.c
Log Message:
The DS console Configuration Encryption tab was giving an error. The error was due to the security CGI not being able to read the ds key/cert db files. They were owned by root instead of the server uid because they were being created by NSS_Initialize which was being called before the server did the setuid.
The fix is to move the NSS/SSL initialization code to just after the setuid call.
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- main.c 19 Apr 2005 22:07:36 -0000 1.7
+++ main.c 17 Nov 2005 17:41:11 -0000 1.8
@@ -818,35 +818,6 @@
set_entry_points();
/*
- * Initialise NSS once for the whole slapd process, whether SSL
- * is enabled or not. We use NSS for random number generation and
- * other things even if we are not going to accept SSL connections.
- * We also need NSS for attribute encryption/decryption on import and export.
- */
- init_ssl = ( (slapd_exemode == SLAPD_EXEMODE_SLAPD) || importexport_encrypt)
- && config_get_security()
- && (0 != s_port) && (s_port <= LDAP_PORT_MAX);
- /* As of DS 6.1, always do a full initialization so that other
- * modules can assume NSS is available
- */
- if ( slapd_nss_init((slapd_exemode == SLAPD_EXEMODE_SLAPD),
- (slapd_exemode != SLAPD_EXEMODE_REFERRAL) /* have config? */ )) {
- LDAPDebug(LDAP_DEBUG_ANY,
- "ERROR: NSS Initialization Failed.\n", 0, 0, 0);
- exit (1);
- }
-
- if (slapd_exemode == SLAPD_EXEMODE_SLAPD) {
- client_auth_init();
- }
-
- if ( init_ssl && ( 0 != slapd_ssl_init())) {
- LDAPDebug(LDAP_DEBUG_ANY,
- "ERROR: SSL Initialization Failed.\n", 0, 0, 0 );
- exit( 1 );
- }
-
- /*
* if we were called upon to do special database stuff, do it and be
* done.
*/
@@ -1006,6 +977,34 @@
}
#endif
+ /*
+ * Initialise NSS once for the whole slapd process, whether SSL
+ * is enabled or not. We use NSS for random number generation and
+ * other things even if we are not going to accept SSL connections.
+ * We also need NSS for attribute encryption/decryption on import and export.
+ */
+ init_ssl = ( (slapd_exemode == SLAPD_EXEMODE_SLAPD) || importexport_encrypt)
+ && config_get_security()
+ && (0 != s_port) && (s_port <= LDAP_PORT_MAX);
+ /* As of DS 6.1, always do a full initialization so that other
+ * modules can assume NSS is available
+ */
+ if ( slapd_nss_init((slapd_exemode == SLAPD_EXEMODE_SLAPD),
+ (slapd_exemode != SLAPD_EXEMODE_REFERRAL) /* have config? */ )) {
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "ERROR: NSS Initialization Failed.\n", 0, 0, 0);
+ exit (1);
+ }
+
+ if (slapd_exemode == SLAPD_EXEMODE_SLAPD) {
+ client_auth_init();
+ }
+
+ if ( init_ssl && ( 0 != slapd_ssl_init())) {
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "ERROR: SSL Initialization Failed.\n", 0, 0, 0 );
+ exit( 1 );
+ }
/* -sduloutre: compute_init() and entry_computed_attr_init() moved up */
From fedora-directory-commits at redhat.com Thu Nov 17 17:42:03 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 17 Nov 2005 12:42:03 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
admserv.conf, 1.9, 1.10
Message-ID: <200511171742.jAHHg3Jg017648@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17632/adminserver/admserv/cfgstuff
Modified Files:
admserv.conf
Log Message:
Add the create CGI to the list of CGIs which mod_restartd is allowed to execute.
Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- admserv.conf 3 Nov 2005 23:20:49 -0000 1.9
+++ admserv.conf 17 Nov 2005 17:41:55 -0000 1.10
@@ -99,8 +99,10 @@
Require valid-user
-# Handle Stop, Start, Restart - invoke mod_restartd
-
+# Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd
+# need to add instance creation because you may want to create an instance
+# of DS on a low port, and instance creation starts the instance as well
+
AuthUserFile /home/rich/72srv/admin-serv/config/admpw
AuthType basic
AuthName "Admin Server"
From fedora-directory-commits at redhat.com Thu Nov 17 17:43:46 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 17 Nov 2005 12:43:46 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
ux-update.cc, 1.14, 1.15
Message-ID: <200511171743.jAHHhkWd017674@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17654/adminserver/admserv/newinst/src
Modified Files:
ux-update.cc
Log Message:
Admin server post install was core dumping in express mode because it did
not have the apache root information. This information is obtained in
the other install modes. The fix is to copy some code from the preinstaller
that figures out the value of ApacheRoot from the Apache binary.
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ux-update.cc 10 Nov 2005 01:12:59 -0000 1.14
+++ ux-update.cc 17 Nov 2005 17:43:38 -0000 1.15
@@ -209,6 +209,61 @@
return result;
}
+static char *get_value(char * file, char * attr) {
+ char cmd[1024];
+ char buf[1024];
+ FILE *fp;
+
+ sprintf(cmd, "%s -V", file);
+ fp = popen(cmd, "r");
+
+ if (fp != NULL) {
+ char *x, *t;
+ while ((fgets(buf, sizeof(buf), fp)) > 0) {
+ x = (char *)strstr(buf, attr);
+ if (x) {
+ t = (char *)strtok(buf, "\"");
+ if (t) {
+ t = (char *)strtok(NULL, "\"");
+ if (t) {
+ pclose(fp);
+ return (char *)(strdup(t));
+ }
+ }
+ }
+ }
+ }
+ pclose(fp);
+ return NULL;
+}
+
+static NSString
+findApacheRoot(const char *dir)
+{
+ char path[1024];
+ char errMsg[SML_BUF];
+ struct stat st;
+ char *v;
+
+ snprintf(path, sizeof(path), "%s/httpd.worker", dir);
+ if (stat(path, &st) != 0) {
+ snprintf(path, sizeof(path), "%s/httpd", dir);
+ if (stat(path, &st) != 0) {
+ return NULL;
+ }
+ }
+
+ v = get_value(path, "HTTPD_ROOT");
+ if (v) {
+ sprintf(path, "%s/modules", v);
+ if (stat(path, &st) != 0) {
+ return NULL;
+ }
+ }
+
+ return v;
+}
+
void
configTasks(const Ldap *ldap, const char *sroot, const char *sieDN)
{
@@ -490,12 +545,17 @@
s = adminInfo->get("SysUser");
strcpy(adminUser, s);
- s = adminInfo->get("ApacheRoot");
- strcpy(apacheRoot, s);
-
s = adminInfo->get("ApacheDir");
strcpy(apacheDir, s);
+ s = adminInfo->get("ApacheRoot");
+ if (!s) {
+ NSString ar = findApacheRoot(apacheDir);
+ strcpy(apacheRoot, (const char *)ar);
+ } else {
+ strcpy(apacheRoot, s);
+ }
+
snprintf(apacheBin, sizeof(apacheBin), "%s/httpd.worker", apacheDir);
if (stat(apacheBin, &st) != 0) {
snprintf(apacheBin, sizeof(apacheBin), "%s/httpd", apacheDir);
From fedora-directory-commits at redhat.com Thu Nov 17 17:44:52 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Thu, 17 Nov 2005 12:44:52 -0500
Subject: [Fedora-directory-commits] mod_restartd mod_restartd.c,1.3,1.4
Message-ID: <200511171744.jAHHiqX9017696@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_restartd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17680
Modified Files:
mod_restartd.c
Log Message:
add the create CGI to the list of CGIs which mod_restartd is allowed to execute
Index: mod_restartd.c
===================================================================
RCS file: /cvs/dirsec/mod_restartd/mod_restartd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_restartd.c 2 Nov 2005 01:29:06 -0000 1.3
+++ mod_restartd.c 17 Nov 2005 17:44:44 -0000 1.4
@@ -839,7 +839,7 @@
}
}
- regcomp(&uriPat, "/.*/tasks/operation/(start|restart|stop|startconfigds)$",
+ regcomp(&uriPat, "/.*/tasks/operation/(start|restart|stop|startconfigds|create)$",
REG_EXTENDED|REG_NOSUB|REG_ICASE);
return OK;
From fedora-directory-commits at redhat.com Thu Nov 17 23:29:49 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 17 Nov 2005 18:29:49 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/cm/newinst setup, 1.9.2.6,
1.9.2.7 setup.patch, 1.1.2.5, 1.1.2.6
Message-ID: <200511172329.jAHNTn8P028378@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28347
Modified Files:
Tag: Directory71RtmBranch
setup setup.patch
Log Message:
[173524] setup scripts retrieves incorrect adminid
Fixed to get the adminid from the right place: adminpw in the 2 setup scripts: one for rpm and another for the classic setup.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -r1.9.2.6 -r1.9.2.7
--- setup 27 Oct 2005 17:50:16 -0000 1.9.2.6
+++ setup 17 Nov 2005 23:29:42 -0000 1.9.2.7
@@ -137,6 +137,19 @@
echo $rval
}
+getValFromAdmpw() {
+ cfile=$1
+ rval=`head -1 $sroot/admin-serv/config/$cfile | cut -f1 -d\:`
+ echo $rval
+}
+
+getValFromInf() {
+ cattr=$1
+ cfile=$2
+ rval=`grep -i ^$cattr $cfile | head -1 | sed -e 's/^.*=[ ]*//'`
+ echo $rval
+}
+
logfile=`doMktmp log`
myargs=
silent=
@@ -365,7 +378,7 @@
ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
adminport=`getValFromAdminConf "\> $inffile
echo "ServerRoot= $sroot" >> $inffile
echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile
- echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+ echo "ConfigDirectoryAdminID= $adminid" >> $inffile
echo "AdminDomain= $admindomain" >> $inffile
echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
echo "" >> $inffile
echo "[admin]" >> $inffile
- echo "ServerAdminID= $siepid" >> $inffile
+ echo "ServerAdminID= $adminid" >> $inffile
echo "ServerAdminPwd= $siepasswd" >> $inffile
echo "SysUser= $sysuser" >> $inffile
echo "Port= $adminport" >> $inffile
@@ -508,6 +521,16 @@
sed -e "s/jvm.option=\(.*\)/jvm.option=\1 -Djava.compiler=NONE/" admin-serv/config/jvm12.conf > admin-serv/config/jvm12.tmp
mv admin-serv/config/jvm12.tmp admin-serv/config/jvm12.conf
+# get user, host, port for startconsole
+adminport=`getValFromInf Port $inffile`
+adminhost=`getValFromInf FullMachineName $inffile`
+adminuser=`getValFromInf ConfigDirectoryAdminID $inffile`
+
+echo ""
+echo "You can now use the console. Here is the command to use to start the console:" | tee -a $logfile
+echo "cd $sroot" | tee -a $logfile
+echo "./startconsole -u $adminuser -a http://$adminhost:$adminport/" | tee -a $logfile
+echo""
echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
if [ -f setup/setup.log ] ; then
cat $logfile >> setup/setup.log
@@ -527,4 +550,5 @@
fi
rm -f $inffile
fi
+
exit 0
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- setup.patch 27 Oct 2005 17:50:16 -0000 1.1.2.5
+++ setup.patch 17 Nov 2005 23:29:42 -0000 1.1.2.6
@@ -95,6 +95,12 @@
echo $rval
}
+getValFromAdmpw() {
+ cfile=$1
+ rval=`head -1 $serverroot/admin-serv/config/$cfile | awk -F\: '{print $1}'`
+ echo $rval
+}
+
dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
dsconffile=$serverroot/$dsinst/config/dse.ldif
if [ ! -f $dsconffile ]; then
@@ -197,7 +203,7 @@
ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
-siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+adminid=`getValFromAdmpw "admpw"`
suitespotuser=`ls -l $dsconffile | awk '{print $3}'`
suitespotgroup=`ls -l $dsconffile | awk '{print $4}'`
admindomain=`echo $ldaphost | awk -F. '{if ($5) {print $2 "." $3 "." $4 "." $5} else if ($4) {print $2 "." $3 "." $4} else if ($3) {print $2 "." $3} else if ($2) {print $2} else {print ""}}'`
@@ -215,11 +221,11 @@
echo "Administrator password is required. Here is your current information:"
echo ""
echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
-echo "Configuration Administrator ID: $siepid"
+echo "Configuration Administrator ID: $adminid"
echo ""
echo "At the prompt, please enter the password for the Configuration Administrator."
echo ""
-echo "administrator ID: $siepid"
+echo "administrator ID: $adminid"
siepasswd=""
while [ "$siepasswd" = "" ]; do
printf "Password: "
@@ -234,7 +240,7 @@
echo "SuitespotGroup= $suitespotgroup" >> $inffile
echo "ServerRoot= $serverroot" >> $inffile
echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/" >> $inffile
-echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+echo "ConfigDirectoryAdminID= $adminid" >> $inffile
echo "AdminDomain= $admindomain" >> $inffile
echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
echo "Components= slapd-71sp1" >> $inffile
From fedora-directory-commits at redhat.com Thu Nov 17 23:52:01 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Thu, 17 Nov 2005 18:52:01 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch,
1.2, 1.3
Message-ID: <200511172352.jAHNq1TL028482@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28462
Modified Files:
setup.patch
Log Message:
[173524] setup scripts retrieves incorrect adminid
Fixed to get the adminid from the right place: adminpw
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.patch 25 Oct 2005 16:55:49 -0000 1.2
+++ setup.patch 17 Nov 2005 23:51:54 -0000 1.3
@@ -95,6 +95,12 @@
echo $rval
}
+getValFromAdmpw() {
+ cfile=$1
+ rval=`head -1 $serverroot/admin-serv/config/$cfile | awk -F\: '{print $1}'`
+ echo $rval
+}
+
dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'`
dsconffile=$serverroot/$dsinst/config/dse.ldif
if [ ! -f $dsconffile ]; then
@@ -197,7 +203,7 @@
ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"`
ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"`
-siepid=`getValFromAdminConf "siepid:" "adm.conf"`
+adminid=`getValFromAdmpw "admpw"`
suitespotuser=`ls -l $dsconffile | awk '{print $3}'`
suitespotgroup=`ls -l $dsconffile | awk '{print $4}'`
admindomain=`echo $ldaphost | awk -F. '{if ($5) {print $2 "." $3 "." $4 "." $5} else if ($4) {print $2 "." $3 "." $4} else if ($3) {print $2 "." $3} else if ($2) {print $2} else {print ""}}'`
@@ -215,11 +221,11 @@
echo "Administrator password is required. Here is your current information:"
echo ""
echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot"
-echo "Configuration Administrator ID: $siepid"
+echo "Configuration Administrator ID: $adminid"
echo ""
echo "At the prompt, please enter the password for the Configuration Administrator."
echo ""
-echo "administrator ID: $siepid"
+echo "administrator ID: $adminid"
siepasswd=""
while [ "$siepasswd" = "" ]; do
printf "Password: "
@@ -234,7 +240,7 @@
echo "SuitespotGroup= $suitespotgroup" >> $inffile
echo "ServerRoot= $serverroot" >> $inffile
echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/" >> $inffile
-echo "ConfigDirectoryAdminID= $siepid" >> $inffile
+echo "ConfigDirectoryAdminID= $adminid" >> $inffile
echo "AdminDomain= $admindomain" >> $inffile
echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile
echo "Components= slapd-71sp1" >> $inffile
@@ -272,36 +278,41 @@
echo "$conffile: SSL on ..."
}
-for dir in `cat dssecure.txt` ; do
- clear
- if [ -f $dir/config/dse.ldif ]; then
- security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
- $dir/stop-slapd
- cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
- mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
- echo "$dir/config/dse.ldif: SSL on ..."
- echo "Restarting Directory Server: $dir/start-slapd"
- $dir/start-slapd
- fi
-done
+if [ -f dssecure.txt ]; then
+ for dir in `cat dssecure.txt` ; do
+ clear
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL on ..."
+ echo "Restarting Directory Server: $dir/start-slapd"
+ $dir/start-slapd
+ fi
+ done
+ rm -f dssecure.txt
+fi
if [ $isadminsslon -ne 0 ]; then
$serverroot/stop-admin
fi
-for confline in `cat assecure.txt` ; do
- conffile=`echo $confline | awk -F= '{print $1}'`
- confparam=`echo $confline | awk -F= '{print $2}'`
- echo $conffile | grep "\.xml$" > /dev/null 2>&1
- rval=$?
- if [ $rval -eq 0 ]; then
- adminXmlSSLOn $conffile $confparam
- else
- adminSSLOn $conffile $confparam
- fi
-done
+if [ -f assecure.txt ]; then
+ for confline in `cat assecure.txt` ; do
+ conffile=`echo $confline | awk -F= '{print $1}'`
+ confparam=`echo $confline | awk -F= '{print $2}'`
+ echo $conffile | grep "\.xml$" > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]; then
+ adminXmlSSLOn $conffile $confparam
+ else
+ adminSSLOn $conffile $confparam
+ fi
+ done
+ rm -f assecuire.txt
+fi
if [ $isadminsslon -ne 0 ]; then
echo "Restarting Administration Server: $serverroot/start-admin"
$serverroot/start-admin
fi
-rm -f dssecure.txt assecuire.txt
From fedora-directory-commits at redhat.com Fri Nov 18 16:10:38 2005
From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten))
Date: Fri, 18 Nov 2005 11:10:38 -0500
Subject: [Fedora-directory-commits] mod_nss nss_pcache.c,1.7,1.8
Message-ID: <200511181610.jAIGAc4f026719@cvs-int.fedora.redhat.com>
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26699
Modified Files:
nss_pcache.c
Log Message:
Fix command-line argument miscounting caused by the addition of the
FIPS flag. The result was that the database prefix was always
missed.
Also check the return value of NSS_Initialize() and print and exit if
the database is not opened.
Index: nss_pcache.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_pcache.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nss_pcache.c 19 Aug 2005 21:42:20 -0000 1.7
+++ nss_pcache.c 18 Nov 2005 16:10:23 -0000 1.8
@@ -319,7 +319,12 @@
PK11_ConfigurePKCS11(NULL,NULL,NULL, INTERNAL_TOKEN_NAME, NULL, NULL,NULL,NULL,8,1);
/* Initialize NSS and open the certificate database read-only. */
- rv = NSS_Initialize(argv[2], argc == 3 ? argv[3] : NULL, argc == 3 ? argv[3] : NULL, "secmod.db", NSS_INIT_READONLY);
+ rv = NSS_Initialize(argv[2], argc == 4 ? argv[3] : NULL, argc == 4 ? argv[3] : NULL, "secmod.db", NSS_INIT_READONLY);
+
+ if (rv != SECSuccess) {
+ fprintf(stderr, "Unable to initialize NSS database: %d\n", rv);
+ exit(1);
+ }
if (fipsmode) {
if (!PK11_IsFIPS()) {
From fedora-directory-commits at redhat.com Fri Nov 18 21:08:18 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:08:18 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd daemon.c,
1.6, 1.7
Message-ID: <200511182108.jAIL8IqL003596@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3562/ldapserver/ldap/servers/slapd
Modified Files:
daemon.c
Log Message:
Move ssl init on the secure socket into main with the rest of the nss/ssl init
Index: daemon.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- daemon.c 19 Apr 2005 22:07:36 -0000 1.6
+++ daemon.c 18 Nov 2005 21:07:38 -0000 1.7
@@ -406,8 +406,6 @@
#ifdef XP_WIN32
ports->s_socket_native = PR_FileDesc2NativeHandle(ports->s_socket);
#endif
- /* check if ports->s_socket != -1 ? */
- rc = slapd_ssl_init2 ( &ports->s_socket, 0 );
} else {
ports->s_socket = SLAPD_INVALID_SOCKET;
#ifdef XP_WIN32
From fedora-directory-commits at redhat.com Fri Nov 18 21:10:05 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:10:05 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd main.c, 1.8, 1.9
Message-ID: <200511182110.jAILA5Ap003629@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3602/ldapserver/ldap/servers/slapd
Modified Files:
main.c
Log Message:
Move NSS/SSL initialization after the setuid so that key/cert/other nss
related files are owned by the correct user, but make that happen before
the detach so we can ask for the pin on the terminal.
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- main.c 17 Nov 2005 17:41:11 -0000 1.8
+++ main.c 18 Nov 2005 21:09:46 -0000 1.9
@@ -645,7 +645,7 @@
{
int return_value = 0;
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
- daemon_ports_t arg = {0};
+ daemon_ports_t ports_info = {0};
Slapi_Backend *be = NULL;
int init_ssl;
#ifndef __LP64__
@@ -882,54 +882,6 @@
#endif
/*
- * Detach ourselves from the terminal (unless running in debug mode).
- * We must detach before we start any threads since detach forks() on
- * UNIX.
- */
- detach();
-
- /*
- * Now write our PID to the startup PID file.
- * This is used by the start up script to determine our PID quickly
- * after we fork, without needing to wait for the 'real' pid file to be
- * written. That could take minutes. And the start script will wait
- * that long looking for it. With this new 'early pid' file, it can avoid
- * doing that, by detecting the pid and watching for the process exiting.
- * This removes the blank stares all round from start-slapd when the server
- * fails to start for some reason
- */
- write_start_pid_file();
-
- /* Make sure we aren't going to run slapd in
- * a mode that is going to conflict with other
- * slapd processes that are currently running
- */
- if ((slapd_exemode != SLAPD_EXEMODE_REFERRAL) &&
- ( add_new_slapd_process(slapd_exemode, db2ldif_dump_replica,
- skip_db_protect_check) == -1 )) {
- LDAPDebug( LDAP_DEBUG_ANY,
- "Shutting down due to possible conflicts with other slapd processes\n",
- 0, 0, 0 );
- exit(1);
- }
-
-
- /*
- * Now it is safe to log our first startup message. If we were to
- * log anything earlier than now it would appear on the admin startup
- * screen twice because before we detach everything is sent to both
- * stderr and our error log. Yuck.
- */
- if (1) {
- char *versionstring = config_get_versionstring();
- char *buildnum = config_get_buildnum();
- LDAPDebug( LDAP_DEBUG_ANY, "%s B%s starting up\n",
- versionstring, buildnum, 0 );
- slapi_ch_free((void **)&buildnum);
- slapi_ch_free((void **)&versionstring);
- }
-
- /*
* After we read the config file we should make
* sure that everything we needed to read in has
* been read in and we'll start whatever threads,
@@ -946,19 +898,19 @@
*/
{
- arg.n_port = (unsigned short)n_port;
+ ports_info.n_port = (unsigned short)n_port;
if ( slapd_listenhost2addr( config_get_listenhost(),
- &arg.n_listenaddr ) != 0 ) {
+ &ports_info.n_listenaddr ) != 0 ) {
return(1);
}
- arg.s_port = (unsigned short)s_port;
+ ports_info.s_port = (unsigned short)s_port;
if ( slapd_listenhost2addr( config_get_securelistenhost(),
- &arg.s_listenaddr ) != 0 ) {
+ &ports_info.s_listenaddr ) != 0 ) {
return(1);
}
- return_value = daemon_pre_setuid_init(&arg);
+ return_value = daemon_pre_setuid_init(&ports_info);
if (0 != return_value) {
LDAPDebug( LDAP_DEBUG_ANY, "Failed to init daemon\n",
0, 0, 0 );
@@ -1006,6 +958,62 @@
exit( 1 );
}
+ if ( init_ssl && ( 0 != slapd_ssl_init2(&ports_info.s_socket, 0) ) ) {
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "ERROR: SSL Initialization phase 2 Failed.\n", 0, 0, 0 );
+ exit( 1 );
+ }
+
+ /*
+ * Detach ourselves from the terminal (unless running in debug mode).
+ * We must detach before we start any threads since detach forks() on
+ * UNIX.
+ * Have to detach after ssl_init - the user may be prompted for the PIN
+ * on the terminal, so it must be open.
+ */
+ detach();
+
+ /*
+ * Now write our PID to the startup PID file.
+ * This is used by the start up script to determine our PID quickly
+ * after we fork, without needing to wait for the 'real' pid file to be
+ * written. That could take minutes. And the start script will wait
+ * that long looking for it. With this new 'early pid' file, it can avoid
+ * doing that, by detecting the pid and watching for the process exiting.
+ * This removes the blank stares all round from start-slapd when the server
+ * fails to start for some reason
+ */
+ write_start_pid_file();
+
+ /* Make sure we aren't going to run slapd in
+ * a mode that is going to conflict with other
+ * slapd processes that are currently running
+ */
+ if ((slapd_exemode != SLAPD_EXEMODE_REFERRAL) &&
+ ( add_new_slapd_process(slapd_exemode, db2ldif_dump_replica,
+ skip_db_protect_check) == -1 )) {
+ LDAPDebug( LDAP_DEBUG_ANY,
+ "Shutting down due to possible conflicts with other slapd processes\n",
+ 0, 0, 0 );
+ exit(1);
+ }
+
+
+ /*
+ * Now it is safe to log our first startup message. If we were to
+ * log anything earlier than now it would appear on the admin startup
+ * screen twice because before we detach everything is sent to both
+ * stderr and our error log. Yuck.
+ */
+ if (1) {
+ char *versionstring = config_get_versionstring();
+ char *buildnum = config_get_buildnum();
+ LDAPDebug( LDAP_DEBUG_ANY, "%s B%s starting up\n",
+ versionstring, buildnum, 0 );
+ slapi_ch_free((void **)&buildnum);
+ slapi_ch_free((void **)&versionstring);
+ }
+
/* -sduloutre: compute_init() and entry_computed_attr_init() moved up */
if (slapd_exemode != SLAPD_EXEMODE_REFERRAL) {
@@ -1143,7 +1151,7 @@
{
time( &starttime );
- slapd_daemon(&arg);
+ slapd_daemon(&ports_info);
}
LDAPDebug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
reslimit_cleanup();
From fedora-directory-commits at redhat.com Fri Nov 18 21:14:19 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:14:19 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
console.conf, 1.2, 1.3
Message-ID: <200511182114.jAILEJhw003680@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3660/adminserver/admserv/cfgstuff
Modified Files:
console.conf
Log Message:
1) default cert name is server-cert not Server-Cert
2) remove SSLv2
3) add "-" to the end of the cert/key db name prefix
Index: console.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- console.conf 18 Aug 2005 18:58:18 -0000 1.2
+++ console.conf 18 Nov 2005 21:14:12 -0000 1.3
@@ -82,21 +82,21 @@
# SSL Certificate Nickname:
# The nickname of the server certificate you are going to use.
-NSSNickname Server-Cert
+NSSNickname server-cert
# Server Certificate Database:
# The NSS security database directory that holds the certificates and
# keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
# Provide the directory that these files exist.
NSSCertificateDatabase %%%sroot%%%/alias
-NSSDBPrefix %%%instancename%%%
+NSSDBPrefix %%%instancename%%%-
# SSL Cipher Suite:
# List the ciphers that the client is permitted to negotiate.
# See the mod_nss documentation for a complete list.
NSSCipherSuite -des,-rc2export,+rc4export,+desede3,+rc4,-rc2,+rsa_rc2_40_md5,+rsa_rc4_128_md5,+rsa_3des_sha,+rsa_rc4_40_md5,+fips_des_sha,+fips_3des_sha,+rsa_des_sha,-rsa_null_md5
-NSSProtocol SSLv2,SSLv3,TLSv1
+NSSProtocol SSLv3,TLSv1
# Client Authentication (Type):
# Client certificate verification type. Types are none, optional and
From fedora-directory-commits at redhat.com Fri Nov 18 21:15:10 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:15:10 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40
sec-activate.c, 1.4, 1.5
Message-ID: <200511182115.jAILFAfW003704@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3686/adminserver/admserv/cgi-src40
Modified Files:
sec-activate.c
Log Message:
Write changes to console.conf, not nss.conf
Index: sec-activate.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/sec-activate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sec-activate.c 18 Aug 2005 18:59:03 -0000 1.4
+++ sec-activate.c 18 Nov 2005 21:15:03 -0000 1.5
@@ -656,7 +656,7 @@
/* change security parameters in server.xml, new for iWS6 */
if (strcmp(security, "off")==0) {
- rv = update_conf("nss.conf", "NSSEngine", "off");
+ rv = update_conf("console.conf", "NSSEngine", "off");
if (rv < 0) {
rpt_err(APP_ERROR, NULL, getResourceString(DBT_SERVER_XML_MOD), NULL);
}
@@ -676,8 +676,8 @@
if (strlen(clientauth) == 0) {
clientauth = (char*)"off";
}
- rv = update_conf("nss.conf", "NSSEngine", "on");
- rv = update_conf("nss.conf", "NSSNickname", certnickname);
+ rv = update_conf("console.conf", "NSSEngine", "on");
+ rv = update_conf("console.conf", "NSSNickname", certnickname);
strcpy(protocols, "");
@@ -687,15 +687,15 @@
strcat(protocols, "SSLv3,TLSv1,");
protocols[strlen(protocols) - 1] = '\0'; /* remove trailing comma */
- rv = update_conf("nss.conf", "NSSProtocol", protocols);
+ rv = update_conf("console.conf", "NSSProtocol", protocols);
snprintf(ciphers, BIG_LINE, "%s,%s", ssl2, ssl3);
- rv = update_conf("nss.conf", "NSSCipherSuite", ciphers);
+ rv = update_conf("console.conf", "NSSCipherSuite", ciphers);
if (!strcmp(clientauth, "on"))
- rv = update_conf("nss.conf", "NSSVerifyClient", "require");
+ rv = update_conf("console.conf", "NSSVerifyClient", "require");
else
- rv = update_conf("nss.conf", "NSSVerifyClient", "none");
+ rv = update_conf("console.conf", "NSSVerifyClient", "none");
if (rv < 0) {
rpt_err(APP_ERROR, NULL, getResourceString(DBT_SERVER_XML_MOD), NULL);
From fedora-directory-commits at redhat.com Fri Nov 18 21:15:59 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:15:59 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src
ux-update.cc, 1.15, 1.16
Message-ID: <200511182115.jAILFxDP003726@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3710/adminserver/admserv/newinst/src
Modified Files:
ux-update.cc
Log Message:
Make sure the server uid owns the config directory and the other config files
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ux-update.cc 17 Nov 2005 17:43:38 -0000 1.15
+++ ux-update.cc 18 Nov 2005 21:15:51 -0000 1.16
@@ -662,6 +662,10 @@
logUninstallInfo(sroot, "admin", "admin", dir);
+ /* make sure the config directory is owned by the ssuser */
+ sprintf(tstr, "%s/admin-serv/config", sroot);
+ chown_file(SSuser, SSgroup, tstr);
+
/*
* Write new admpw.
*/
@@ -713,6 +717,7 @@
fclose(f);
logUninstallInfo(sroot, "admin", "admin", tstr);
+ chown_file(SSuser, SSgroup, tstr);
sprintf(tstr, "chmod 640 %s/%s", sroot, DEFAULT_LDAPSWITCH);
system(tstr);
@@ -1199,6 +1204,7 @@
snprintf(src, sizeof(tstr), "%s/shared/config/template/nss.conf.tmpl", sroot);
replaceTokensInFile(src, tstr, nssarray);
chmod(tstr, S_IRUSR | S_IWUSR);
+ chown_file(SSuser, SSgroup, tstr);
logUninstallInfo(sroot, "admin", "admin", tstr);
snprintf(tstr, sizeof(tstr), "%s/admin-serv/config/console.conf", sroot);
From fedora-directory-commits at redhat.com Fri Nov 18 21:16:47 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:16:47 -0500
Subject: [Fedora-directory-commits] adminserver/base Makefile,1.15,1.16
Message-ID: <200511182116.jAILGl9S003748@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3732/adminserver/base
Modified Files:
Makefile
Log Message:
Package libjss3.so in lib, not lib/jss
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/base/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 9 Nov 2005 23:22:55 -0000 1.15
+++ Makefile 18 Nov 2005 21:16:39 -0000 1.16
@@ -192,11 +192,11 @@
(cd $(CONSOLE_BASE_DIR); cp -p startconsole $(CLIENT_DIR)/)
# Copy JSS lib
- -$(MKDIR) $(CLIENT_DIR)/lib/jss
+ -$(MKDIR) $(CLIENT_DIR)/lib
ifeq ($(ARCH), HPUX)
- cp -p $(JSSSDK_PATH)/libjss3.sl $(CLIENT_DIR)/lib/jss/.
+ cp -p $(JSSSDK_PATH)/libjss3.sl $(CLIENT_DIR)/lib
else
- cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib/jss/.
+ cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib
endif
# Cleanup before making distributable zip
From fedora-directory-commits at redhat.com Fri Nov 18 21:18:49 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Fri, 18 Nov 2005 16:18:49 -0500
Subject: [Fedora-directory-commits] mod_admserv mod_admserv.c,1.17,1.18
Message-ID: <200511182118.jAILInxp003773@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3754
Modified Files:
mod_admserv.c
Log Message:
Make sure the pset cache file (local.conf) is owned by the server uid.
Change the euid to the server uid before calling psetCreateSSL, then change
it back afterwards.
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_admserv.c 15 Aug 2005 15:55:16 -0000 1.17
+++ mod_admserv.c 18 Nov 2005 21:18:42 -0000 1.18
@@ -42,6 +42,12 @@
#include "http_request.h"
#include "http_log.h"
+/* need uid and gid of apache process after setuid */
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#include "unixd.h"
+#define CHANGE_EUID 1
+#endif
+
#include "libadminutil/distadm.h"
#include "libadminutil/admutil.h"
#include "libadminutil/resource.h"
@@ -1948,7 +1954,9 @@
server_rec *base_server)
{
int error;
-
+#ifdef CHANGE_EUID
+ int reseteuid = 0;
+#endif /* CHANGE_EUID */
AdmldapInfo info;
PsetHndl pset;
char *val;
@@ -1979,11 +1987,26 @@
}
}
+#ifdef CHANGE_EUID
+ /* make sure pset creates the cache file owned by the server uid, not root */
+ if (geteuid() == 0) {
+ seteuid(unixd_config.user_id);
+ reseteuid = 1;
+ }
+#endif /* CHANGE_EUID */
+
pset = psetCreateSSL((char*)"admin-serv",
path,
NULL,
NULL,
&error);
+
+#ifdef CHANGE_EUID
+ if (reseteuid) {
+ seteuid(0);
+ }
+#endif /* CHANGE_EUID */
+
if (pset) {
} else {
ap_log_error(APLOG_MARK, APLOG_CRIT, 0, base_server,
From fedora-directory-commits at redhat.com Sat Nov 19 00:43:10 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 18 Nov 2005 19:43:10 -0500
Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff
admserv.conf, 1.10, 1.11
Message-ID: <200511190043.jAJ0hAii009642@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626
Modified Files:
admserv.conf
Log Message:
Admin Express cgi needs NESCompatEnv set for help to work
Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- admserv.conf 17 Nov 2005 17:41:55 -0000 1.10
+++ admserv.conf 19 Nov 2005 00:43:02 -0000 1.11
@@ -88,6 +88,7 @@
AuthName "Admin Server"
Require valid-user
AdminSDK on
+ NESCompatEnv on
Options +ExecCGI
From fedora-directory-commits at redhat.com Sat Nov 19 00:50:39 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Fri, 18 Nov 2005 19:50:39 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.44,1.45
Message-ID: <200511190050.jAJ0odMD009691@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9675
Modified Files:
Makefile
Log Message:
Need to package online help files for external builds
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile 16 Nov 2005 03:53:06 -0000 1.44
+++ Makefile 19 Nov 2005 00:50:32 -0000 1.45
@@ -515,12 +515,11 @@
fi
# copy the manual files from the zip files or checked out directory
if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
- cd $(RELDIR)/manual/en/slapd; \
if [ -f $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) ] ; then \
- $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
- $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+ $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) -d $(RELDIR)/manual/en/slapd ; \
+ $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS) -d $(RELDIR)/manual/en/slapd ; \
else \
- cp -r $(DSDOC_DIR) . ; \
+ cp -r $(DSDOC_DIR) $(RELDIR)/manual/en/slapd ; \
fi ; \
fi
From fedora-directory-commits at redhat.com Mon Nov 21 04:07:29 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Sun, 20 Nov 2005 23:07:29 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd main.c, 1.9, 1.10
Message-ID: <200511210407.jAL47U4H009415@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9395/ldapserver/ldap/servers/slapd
Modified Files:
main.c
Log Message:
1) Move the import, export, etc. (non network server mode) code to after the NSS/SSL init. For example, import needs to hash passwords, export of encrypted attrs needs encryption.
2) Only create, configure (for SSL) and bind TCP ports if running in regular or referral mode. Before, the code short circuited if doing import, export, etc. before getting to the port stuff. But since 1) above, the code needs to take care only to do network related stuff if in network mode.
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- main.c 18 Nov 2005 21:09:46 -0000 1.9
+++ main.c 21 Nov 2005 04:07:07 -0000 1.10
@@ -817,68 +817,23 @@
/* Set entry points in libslapd */
set_entry_points();
- /*
- * if we were called upon to do special database stuff, do it and be
- * done.
- */
- switch ( slapd_exemode ) {
- case SLAPD_EXEMODE_LDIF2DB:
- return slapd_exemode_ldif2db();
-
- case SLAPD_EXEMODE_DB2LDIF:
- return slapd_exemode_db2ldif(argc,argv);
-
- case SLAPD_EXEMODE_DB2INDEX:
- return slapd_exemode_db2index();
-
- case SLAPD_EXEMODE_ARCHIVE2DB:
- return slapd_exemode_archive2db();
-
- case SLAPD_EXEMODE_DB2ARCHIVE:
- return slapd_exemode_db2archive();
-
- case SLAPD_EXEMODE_DBTEST:
- return slapd_exemode_dbtest();
-
- case SLAPD_EXEMODE_REFERRAL:
- /* check that all the necessary info was given, then go on */
- if (! config_check_referral_mode()) {
- LDAPDebug(LDAP_DEBUG_ANY,
- "ERROR: No referral URL supplied\n", 0, 0, 0);
- usage( myname, extraname );
- exit(1);
- }
- break;
-
- case SLAPD_EXEMODE_SUFFIX2INSTANCE:
- return slapd_exemode_suffix2instance();
-
-#if defined(UPGRADEDB)
- case SLAPD_EXEMODE_UPGRADEDB:
- return slapd_exemode_upgradedb();
-#endif
-
- case SLAPD_EXEMODE_PRINTVERSION:
- slapd_print_version(1);
- exit(1);
- }
-
#if defined( XP_WIN32 )
- /* Register with the NT EventLog */
- hSlapdEventSource = RegisterEventSource(NULL, pszServerName );
- if( !hSlapdEventSource )
- {
- char szMessage[256];
- PR_snprintf( szMessage, sizeof(szMessage), "Directory Server %s is terminating. Failed "
- "to set the EventLog source.", pszServerName);
- MessageBox(GetDesktopWindow(), szMessage, " ",
- MB_ICONEXCLAMATION | MB_OK);
- exit( 1 );
- }
+ if (slapd_exemode == SLAPD_EXEMODE_SLAPD) {
+ /* Register with the NT EventLog */
+ hSlapdEventSource = RegisterEventSource(NULL, pszServerName );
+ if( !hSlapdEventSource ) {
+ char szMessage[256];
+ PR_snprintf( szMessage, sizeof(szMessage), "Directory Server %s is terminating. Failed "
+ "to set the EventLog source.", pszServerName);
+ MessageBox(GetDesktopWindow(), szMessage, " ",
+ MB_ICONEXCLAMATION | MB_OK);
+ exit( 1 );
+ }
- /* Check to ensure there isn't a copy of this server already running. */
- if( MultipleInstances() )
- exit( 1 );
+ /* Check to ensure there isn't a copy of this server already running. */
+ if( MultipleInstances() )
+ exit( 1 );
+ }
#endif
/*
@@ -897,7 +852,8 @@
* we need to be root in order to open them.
*/
- {
+ if ((slapd_exemode == SLAPD_EXEMODE_SLAPD) ||
+ (slapd_exemode == SLAPD_EXEMODE_REFERRAL)) {
ports_info.n_port = (unsigned short)n_port;
if ( slapd_listenhost2addr( config_get_listenhost(),
&ports_info.n_listenaddr ) != 0 ) {
@@ -958,13 +914,62 @@
exit( 1 );
}
- if ( init_ssl && ( 0 != slapd_ssl_init2(&ports_info.s_socket, 0) ) ) {
- LDAPDebug(LDAP_DEBUG_ANY,
- "ERROR: SSL Initialization phase 2 Failed.\n", 0, 0, 0 );
- exit( 1 );
+ 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,
+ "ERROR: SSL Initialization phase 2 Failed.\n", 0, 0, 0 );
+ exit( 1 );
+ }
}
/*
+ * if we were called upon to do special database stuff, do it and be
+ * done.
+ */
+ switch ( slapd_exemode ) {
+ case SLAPD_EXEMODE_LDIF2DB:
+ return slapd_exemode_ldif2db();
+
+ case SLAPD_EXEMODE_DB2LDIF:
+ return slapd_exemode_db2ldif(argc,argv);
+
+ case SLAPD_EXEMODE_DB2INDEX:
+ return slapd_exemode_db2index();
+
+ case SLAPD_EXEMODE_ARCHIVE2DB:
+ return slapd_exemode_archive2db();
+
+ case SLAPD_EXEMODE_DB2ARCHIVE:
+ return slapd_exemode_db2archive();
+
+ case SLAPD_EXEMODE_DBTEST:
+ return slapd_exemode_dbtest();
+
+ case SLAPD_EXEMODE_REFERRAL:
+ /* check that all the necessary info was given, then go on */
+ if (! config_check_referral_mode()) {
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "ERROR: No referral URL supplied\n", 0, 0, 0);
+ usage( myname, extraname );
+ exit(1);
+ }
+ break;
+
+ case SLAPD_EXEMODE_SUFFIX2INSTANCE:
+ return slapd_exemode_suffix2instance();
+
+#if defined(UPGRADEDB)
+ case SLAPD_EXEMODE_UPGRADEDB:
+ return slapd_exemode_upgradedb();
+#endif
+
+ case SLAPD_EXEMODE_PRINTVERSION:
+ slapd_print_version(1);
+ exit(1);
+ }
+
+ /*
* Detach ourselves from the terminal (unless running in debug mode).
* We must detach before we start any threads since detach forks() on
* UNIX.
From fedora-directory-commits at redhat.com Tue Nov 22 03:40:21 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 21 Nov 2005 22:40:21 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/views
views.c, 1.6, 1.7
Message-ID: <200511220340.jAM3eLRc023475@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/views
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23412/ldapserver/ldap/servers/plugins/views
Modified Files:
views.c
Log Message:
Cannot pass const strings into slapi_str2filter, since it can modify
the contents. I'm not sure why we haven't caught this earlier, but
I believe it has something to do with the patch to make ds build on
Fedora Core 4 with gcc4. To do that, we turn off the -fwriteable-strings
argument to gcc. I suppose with it on, it moves those strings to
some sort of writeable memory location. With it off, constant strings
are definitely in the data section. There was one place in views that
used a constant string, and a couple of places in the windows sync code.
Index: views.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/views.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- views.c 11 Aug 2005 16:45:04 -0000 1.6
+++ views.c 22 Nov 2005 03:40:14 -0000 1.7
@@ -735,6 +735,7 @@
Slapi_Filter *pCurrentFilter = 0;
Slapi_Filter *pBuiltFilter = 0;
Slapi_Filter *pViewEntryExcludeFilter = 0;
+ char *excludeFilter;
if(pView->includeAncestorFiltersFilter)
{
@@ -769,7 +770,11 @@
}
/* filter for removing view entries from search */
- pViewEntryExcludeFilter = slapi_str2filter( "(!(objectclass=" VIEW_OBJECTCLASS "))" );
+ /* richm - slapi_str2filter _writes_ to it's argument, so we have to pass in
+ some writeable memory, or core dump, do not pass go */
+ excludeFilter = slapi_ch_strdup("(!(objectclass=" VIEW_OBJECTCLASS "))");
+ pViewEntryExcludeFilter = slapi_str2filter( excludeFilter );
+ slapi_ch_free_string(&excludeFilter);
if(pBuiltFilter)
pView->includeAncestorFiltersFilter = slapi_filter_join_ex( LDAP_FILTER_AND, pBuiltFilter, pViewEntryExcludeFilter, 0 );
From fedora-directory-commits at redhat.com Tue Nov 22 03:40:16 2005
From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins))
Date: Mon, 21 Nov 2005 22:40:16 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
windows_protocol_util.c, 1.22, 1.23
Message-ID: <200511220340.jAM3ekcH023499@cvs-int.fedora.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23412/ldapserver/ldap/servers/plugins/replication
Modified Files:
windows_protocol_util.c
Log Message:
Cannot pass const strings into slapi_str2filter, since it can modify
the contents. I'm not sure why we haven't caught this earlier, but
I believe it has something to do with the patch to make ds build on
Fedora Core 4 with gcc4. To do that, we turn off the -fwriteable-strings
argument to gcc. I suppose with it on, it moves those strings to
some sort of writeable memory location. With it off, constant strings
are definitely in the data section. There was one place in views that
used a constant string, and a couple of places in the windows sync code.
Index: windows_protocol_util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- windows_protocol_util.c 20 Oct 2005 17:12:16 -0000 1.22
+++ windows_protocol_util.c 22 Nov 2005 03:40:08 -0000 1.23
@@ -1570,11 +1570,12 @@
{
int retval = 0;
- char *string_deleted = "(isdeleted=*)";
+ char *string_deleted = slapi_ch_strdup("(isdeleted=*)");
/* DBDB: we should allocate these filters once and keep them around for better performance */
Slapi_Filter *filter_deleted = slapi_str2filter( string_deleted );
+ slapi_ch_free_string(&string_deleted);
/* DBDB: this should be one filter, the code originally tested separately and hasn't been fixed yet */
if ( (slapi_filter_test_simple( e, filter_deleted ) == 0) )
{
@@ -2251,9 +2252,10 @@
/* Next test for the correct kind of entry */
if (local_entry) {
/* DBDB: we should allocate these filters once and keep them around for better performance */
- char *string_filter = "(&(|(objectclass=ntuser)(objectclass=ntgroup))(ntUserDomainId=*))";
+ char *string_filter = slapi_ch_strdup("(&(|(objectclass=ntuser)(objectclass=ntgroup))(ntUserDomainId=*))");
Slapi_Filter *filter = slapi_str2filter( string_filter );
+ slapi_ch_free_string(&string_filter);
if (slapi_filter_test_simple( (Slapi_Entry*)local_entry, filter ) == 0)
{
retval = 1;
From fedora-directory-commits at redhat.com Wed Nov 23 01:22:25 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 22 Nov 2005 20:22:25 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd log.c, 1.6,
1.6.2.1 main.c, 1.7, 1.7.2.1 util.c, 1.6, 1.6.2.1 proto-slap.h,
1.10.2.1, 1.10.2.2
Message-ID: <200511230122.jAN1MPmQ000985@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv963
Modified Files:
Tag: Directory71RtmBranch
log.c main.c util.c proto-slap.h
Log Message:
[173687] deadlock caused by error log rotation and logging
Modified to change the owner to the "localuser" if the error log file is not
owned by the user.
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- log.c 19 Apr 2005 22:07:36 -0000 1.6
+++ log.c 23 Nov 2005 01:22:16 -0000 1.6.2.1
@@ -48,6 +48,7 @@
#include "log.h"
#include "fe.h"
+#include /* getpwnam */
#if defined( XP_WIN32 )
#include
@@ -3225,6 +3226,17 @@
char tbuf[TBUFSIZE];
struct logfileinfo *logp;
char buffer[BUFSIZ];
+ struct passwd *pw = NULL;
+
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ if ( slapdFrontendConfig->localuser != NULL ) {
+ if ( (pw = getpwnam( slapdFrontendConfig->localuser )) == NULL )
+ return LOG_UNABLE_TO_OPENFILE;
+ }
+ else {
+ return LOG_UNABLE_TO_OPENFILE;
+ }
if (!locked) LOG_ERROR_LOCK_WRITE( );
@@ -3287,6 +3299,12 @@
return LOG_UNABLE_TO_OPENFILE;
}
+ /* make sure the logfile is owned by the localuser. If one of the
+ * alternate ns-slapd modes, such as db2bak, tries to log an error
+ * at startup, it will create the logfile as root!
+ */
+ slapd_chown_if_not_owner(loginfo.log_error_file, pw->pw_uid, -1);
+
loginfo.log_error_fdes = fp;
if (logfile_state == LOGFILE_REOPENED) {
/* we have all the information */
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- main.c 19 Apr 2005 22:07:36 -0000 1.7
+++ main.c 23 Nov 2005 01:22:16 -0000 1.7.2.1
@@ -207,32 +207,6 @@
#ifndef WIN32
-/* Changes the ownership of the given file/directory iff not
- already the owner
- Returns 0 upon success or non-zero otherwise, usually -1 if
- some system error occurred
-*/
-static int
-chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
-{
- struct stat statbuf;
- int result = 1;
- if (!filename)
- return result;
-
- memset(&statbuf, '\0', sizeof(statbuf));
- if (!(result = stat(filename, &statbuf)))
- {
- if (((uid != -1) && (uid != statbuf.st_uid)) ||
- ((gid != -1) && (gid != statbuf.st_gid)))
- {
- result = chown(filename, uid, gid);
- }
- }
-
- return result;
-}
-
/*
Four cases:
- change ownership of all files in directory (strip_fn=PR_FALSE)
@@ -258,7 +232,7 @@
if((ptr=strrchr(log,'/'))==NULL)
{
LDAPDebug(LDAP_DEBUG_ANY, "Caution changing ownership of ./%s \n",name,0,0);
- chown_if_not_owner(log, pw->pw_uid, -1 );
+ slapd_chown_if_not_owner(log, pw->pw_uid, -1 );
rc=1;
} else if(log==ptr) {
LDAPDebug(LDAP_DEBUG_ANY, "Caution changing ownership of / directory and its contents to %s\n",pw->pw_name,0,0);
@@ -273,7 +247,7 @@
while( (entry = PR_ReadDir(dir , PR_SKIP_BOTH )) !=NULL )
{
PR_snprintf(file,MAXPATHLEN+1,"%s/%s",log,entry->name);
- chown_if_not_owner( file, pw->pw_uid, -1 );
+ slapd_chown_if_not_owner( file, pw->pw_uid, -1 );
}
PR_CloseDir( dir );
}
@@ -302,7 +276,7 @@
}
/* The instance directory needs to be owned by the local user */
- chown_if_not_owner( slapdFrontendConfig->instancedir, pw->pw_uid, -1 );
+ slapd_chown_if_not_owner( slapdFrontendConfig->instancedir, pw->pw_uid, -1 );
PR_snprintf(dirname,sizeof(dirname),"%s/config",slapdFrontendConfig->instancedir);
chown_dir_files(dirname, pw, PR_FALSE); /* config directory */
chown_dir_files(slapdFrontendConfig->accesslog, pw, PR_TRUE); /* do access log directory */
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- util.c 19 Apr 2005 22:07:37 -0000 1.6
+++ util.c 23 Nov 2005 01:22:16 -0000 1.6.2.1
@@ -631,3 +631,30 @@
return( rc );
}
/*****************************************************************************/
+
+/* Changes the ownership of the given file/directory if not
+ already the owner
+ Returns 0 upon success or non-zero otherwise, usually -1 if
+ some system error occurred
+*/
+int
+slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
+{
+ struct stat statbuf;
+ int result = 1;
+ if (!filename)
+ return result;
+
+ memset(&statbuf, '\0', sizeof(statbuf));
+ if (!(result = stat(filename, &statbuf)))
+ {
+ if (((uid != -1) && (uid != statbuf.st_uid)) ||
+ ((gid != -1) && (gid != statbuf.st_gid)))
+ {
+ result = chown(filename, uid, gid);
+ }
+ }
+
+ return result;
+}
+
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- proto-slap.h 25 Aug 2005 18:25:08 -0000 1.10.2.1
+++ proto-slap.h 23 Nov 2005 01:22:16 -0000 1.10.2.2
@@ -588,6 +588,7 @@
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
+int slapd_slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
/*
* modify.c
From fedora-directory-commits at redhat.com Wed Nov 23 01:25:58 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 22 Nov 2005 20:25:58 -0500
Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.31,
1.32
Message-ID: <200511230125.jAN1PwPV001044@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1006/admserv
Modified Files:
pkgadmin.mk
Log Message:
Adjusted Admin Util and Console build path for the external build.
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pkgadmin.mk 16 Nov 2005 03:18:29 -0000 1.31
+++ pkgadmin.mk 23 Nov 2005 01:25:51 -0000 1.32
@@ -254,8 +254,8 @@
# Copy LIB ADMIN UTIL
cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
- -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property
- cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property
+ -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties
+ cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties
cd $(ADMSERV_OBJDIR)/cmdln; \
cp -p admconfig $(ADMIN_DIR)/bin/admin;
From fedora-directory-commits at redhat.com Wed Nov 23 01:25:53 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Tue, 22 Nov 2005 20:25:53 -0500
Subject: [Fedora-directory-commits] adminserver buildpaths.mk, 1.4,
1.5 nsconfig.mk, 1.19, 1.20
Message-ID: <200511230126.jAN1QNVa001048@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1006
Modified Files:
buildpaths.mk nsconfig.mk
Log Message:
Adjusted Admin Util and Console build path for the external build.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildpaths.mk 3 Nov 2005 23:20:38 -0000 1.4
+++ buildpaths.mk 23 Nov 2005 01:25:45 -0000 1.5
@@ -84,7 +84,7 @@
SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/../console
+CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/..
#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nsconfig.mk 16 Nov 2005 03:18:24 -0000 1.19
+++ nsconfig.mk 23 Nov 2005 01:25:45 -0000 1.20
@@ -793,7 +793,7 @@
ADMINUTIL_LIB_VERSION=10
ifdef ADMINUTIL_SOURCE_ROOT
ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib
- ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include
+ ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-1.0
else
ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include
From fedora-directory-commits at redhat.com Wed Nov 23 17:58:09 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 23 Nov 2005 12:58:09 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd log.c, 1.6,
1.7 main.c, 1.10, 1.11 util.c, 1.6, 1.7 proto-slap.h, 1.11, 1.12
Message-ID: <200511231758.jANHw9tm032243@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32223
Modified Files:
log.c main.c util.c proto-slap.h
Log Message:
[173687] deadlock caused by error log rotation and logging
Modified to change the owner to the "localuser" if the error log file is not
owned by the user.
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- log.c 19 Apr 2005 22:07:36 -0000 1.6
+++ log.c 23 Nov 2005 17:58:01 -0000 1.7
@@ -48,6 +48,7 @@
#include "log.h"
#include "fe.h"
+#include /* getpwnam */
#if defined( XP_WIN32 )
#include
@@ -3225,6 +3226,17 @@
char tbuf[TBUFSIZE];
struct logfileinfo *logp;
char buffer[BUFSIZ];
+ struct passwd *pw = NULL;
+
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ if ( slapdFrontendConfig->localuser != NULL ) {
+ if ( (pw = getpwnam( slapdFrontendConfig->localuser )) == NULL )
+ return LOG_UNABLE_TO_OPENFILE;
+ }
+ else {
+ return LOG_UNABLE_TO_OPENFILE;
+ }
if (!locked) LOG_ERROR_LOCK_WRITE( );
@@ -3287,6 +3299,12 @@
return LOG_UNABLE_TO_OPENFILE;
}
+ /* make sure the logfile is owned by the localuser. If one of the
+ * alternate ns-slapd modes, such as db2bak, tries to log an error
+ * at startup, it will create the logfile as root!
+ */
+ slapd_chown_if_not_owner(loginfo.log_error_file, pw->pw_uid, -1);
+
loginfo.log_error_fdes = fp;
if (logfile_state == LOGFILE_REOPENED) {
/* we have all the information */
Index: main.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- main.c 21 Nov 2005 04:07:07 -0000 1.10
+++ main.c 23 Nov 2005 17:58:01 -0000 1.11
@@ -207,32 +207,6 @@
#ifndef WIN32
-/* Changes the ownership of the given file/directory iff not
- already the owner
- Returns 0 upon success or non-zero otherwise, usually -1 if
- some system error occurred
-*/
-static int
-chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
-{
- struct stat statbuf;
- int result = 1;
- if (!filename)
- return result;
-
- memset(&statbuf, '\0', sizeof(statbuf));
- if (!(result = stat(filename, &statbuf)))
- {
- if (((uid != -1) && (uid != statbuf.st_uid)) ||
- ((gid != -1) && (gid != statbuf.st_gid)))
- {
- result = chown(filename, uid, gid);
- }
- }
-
- return result;
-}
-
/*
Four cases:
- change ownership of all files in directory (strip_fn=PR_FALSE)
@@ -258,7 +232,7 @@
if((ptr=strrchr(log,'/'))==NULL)
{
LDAPDebug(LDAP_DEBUG_ANY, "Caution changing ownership of ./%s \n",name,0,0);
- chown_if_not_owner(log, pw->pw_uid, -1 );
+ slapd_chown_if_not_owner(log, pw->pw_uid, -1 );
rc=1;
} else if(log==ptr) {
LDAPDebug(LDAP_DEBUG_ANY, "Caution changing ownership of / directory and its contents to %s\n",pw->pw_name,0,0);
@@ -273,7 +247,7 @@
while( (entry = PR_ReadDir(dir , PR_SKIP_BOTH )) !=NULL )
{
PR_snprintf(file,MAXPATHLEN+1,"%s/%s",log,entry->name);
- chown_if_not_owner( file, pw->pw_uid, -1 );
+ slapd_chown_if_not_owner( file, pw->pw_uid, -1 );
}
PR_CloseDir( dir );
}
@@ -302,7 +276,7 @@
}
/* The instance directory needs to be owned by the local user */
- chown_if_not_owner( slapdFrontendConfig->instancedir, pw->pw_uid, -1 );
+ slapd_chown_if_not_owner( slapdFrontendConfig->instancedir, pw->pw_uid, -1 );
PR_snprintf(dirname,sizeof(dirname),"%s/config",slapdFrontendConfig->instancedir);
chown_dir_files(dirname, pw, PR_FALSE); /* config directory */
chown_dir_files(slapdFrontendConfig->accesslog, pw, PR_TRUE); /* do access log directory */
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util.c 19 Apr 2005 22:07:37 -0000 1.6
+++ util.c 23 Nov 2005 17:58:01 -0000 1.7
@@ -631,3 +631,30 @@
return( rc );
}
/*****************************************************************************/
+
+/* Changes the ownership of the given file/directory if not
+ already the owner
+ Returns 0 upon success or non-zero otherwise, usually -1 if
+ some system error occurred
+*/
+int
+slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
+{
+ struct stat statbuf;
+ int result = 1;
+ if (!filename)
+ return result;
+
+ memset(&statbuf, '\0', sizeof(statbuf));
+ if (!(result = stat(filename, &statbuf)))
+ {
+ if (((uid != -1) && (uid != statbuf.st_uid)) ||
+ ((gid != -1) && (gid != statbuf.st_gid)))
+ {
+ result = chown(filename, uid, gid);
+ }
+ }
+
+ return result;
+}
+
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- proto-slap.h 25 Aug 2005 00:58:27 -0000 1.11
+++ proto-slap.h 23 Nov 2005 17:58:01 -0000 1.12
@@ -588,6 +588,7 @@
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
+int slapd_slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
/*
* modify.c
From fedora-directory-commits at redhat.com Thu Nov 24 01:38:42 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 23 Nov 2005 20:38:42 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd config.c,
1.5, 1.5.2.1
Message-ID: <200511240138.jAO1cg0c014504@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14488
Modified Files:
Tag: Directory71RtmBranch
config.c
Log Message:
[173687] deadlock caused by error log rotation and logging
need to set localuser before creating/opening error log.
Index: config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/config.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- config.c 19 Apr 2005 22:07:36 -0000 1.5
+++ config.c 24 Nov 2005 01:38:35 -0000 1.5.2.1
@@ -222,12 +222,14 @@
char loglevel[BUFSIZ];
char maxdescriptors[BUFSIZ];
char val[BUFSIZ];
+ char _localuser[BUFSIZ];
char logenabled[BUFSIZ];
char schemacheck[BUFSIZ];
Slapi_DN plug_dn;
errorlog[0] = loglevel[0] = maxdescriptors[0] = '\0';
val[0] = logenabled[0] = schemacheck[0] = '\0';
+ _localuser[0] = '\0';
/* Convert LDIF to entry structures */
slapi_sdn_init_dn_byref(&plug_dn, PLUGIN_BASE_DN);
@@ -283,6 +285,21 @@
}
}
+#ifndef _WIN32
+ /* set the local user name; needed to set up error log */
+ if (!_localuser[0] &&
+ entry_has_attr_and_value(e, CONFIG_LOCALUSER_ATTRIBUTE,
+ _localuser, sizeof(_localuser)))
+ {
+ if (config_set_localuser(CONFIG_LOCALUSER_ATTRIBUTE,
+ _localuser, errorbuf, CONFIG_APPLY) != LDAP_SUCCESS)
+ {
+ LDAPDebug(LDAP_DEBUG_ANY, "%s: %s: %s. \n", configfile,
+ CONFIG_LOCALUSER_ATTRIBUTE, errorbuf);
+ }
+ }
+#endif
+
/* set the log file name */
if (!errorlog[0] &&
entry_has_attr_and_value(e, CONFIG_ERRORLOG_ATTRIBUTE,
From fedora-directory-commits at redhat.com Thu Nov 24 01:39:51 2005
From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi))
Date: Wed, 23 Nov 2005 20:39:51 -0500
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd config.c,
1.5, 1.6
Message-ID: <200511240139.jAO1dp7s014533@cvs-int.fedora.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14517
Modified Files:
config.c
Log Message:
[173687] deadlock caused by error log rotation and logging
need to set localuser before creating/opening error log.
Index: config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.c 19 Apr 2005 22:07:36 -0000 1.5
+++ config.c 24 Nov 2005 01:39:44 -0000 1.6
@@ -222,12 +222,14 @@
char loglevel[BUFSIZ];
char maxdescriptors[BUFSIZ];
char val[BUFSIZ];
+ char _localuser[BUFSIZ];
char logenabled[BUFSIZ];
char schemacheck[BUFSIZ];
Slapi_DN plug_dn;
errorlog[0] = loglevel[0] = maxdescriptors[0] = '\0';
val[0] = logenabled[0] = schemacheck[0] = '\0';
+ _localuser[0] = '\0';
/* Convert LDIF to entry structures */
slapi_sdn_init_dn_byref(&plug_dn, PLUGIN_BASE_DN);
@@ -283,6 +285,21 @@
}
}
+#ifndef _WIN32
+ /* set the local user name; needed to set up error log */
+ if (!_localuser[0] &&
+ entry_has_attr_and_value(e, CONFIG_LOCALUSER_ATTRIBUTE,
+ _localuser, sizeof(_localuser)))
+ {
+ if (config_set_localuser(CONFIG_LOCALUSER_ATTRIBUTE,
+ _localuser, errorbuf, CONFIG_APPLY) != LDAP_SUCCESS)
+ {
+ LDAPDebug(LDAP_DEBUG_ANY, "%s: %s: %s. \n", configfile,
+ CONFIG_LOCALUSER_ATTRIBUTE, errorbuf);
+ }
+ }
+#endif
+
/* set the log file name */
if (!errorlog[0] &&
entry_has_attr_and_value(e, CONFIG_ERRORLOG_ATTRIBUTE,
@@ -295,7 +312,6 @@
CONFIG_ERRORLOG_ATTRIBUTE, errorbuf);
}
}
-
/* set the error log level */
if (!loglevel[0] &&
entry_has_attr_and_value(e, CONFIG_LOGLEVEL_ATTRIBUTE,
From fedora-directory-commits at redhat.com Tue Nov 29 18:37:25 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 29 Nov 2005 13:37:25 -0500
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/util
ClassLoaderUtil.java, 1.1.1.1, 1.2 LocalJarClassLoader.java,
1.2, 1.3
Message-ID: <200511291837.jATIbPbL022349@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252/src/com/netscape/management/client/util
Modified Files:
ClassLoaderUtil.java LocalJarClassLoader.java
Log Message:
173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained.
Index: ClassLoaderUtil.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/ClassLoaderUtil.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ClassLoaderUtil.java 18 Jul 2005 00:34:25 -0000 1.1.1.1
+++ ClassLoaderUtil.java 29 Nov 2005 18:37:17 -0000 1.2
@@ -50,13 +50,13 @@
return false;
if (Debug.getTraceLevel() >= 7) {
- Debug.println(7, debugTag + " Search <" + sJarName + "> in java/jars ");
+ Debug.println(7, debugTag + " Search <" + sJarName + "> in " + LocalJarClassLoader.jarsDir);
String list = "";
for (int n = 0 ; n < sJarList.length ; n++) {
list += "<"+sJarList[n] + ">";
}
- Debug.println(7, debugTag + " java/jars content: " + list);
+ Debug.println(7, debugTag + LocalJarClassLoader.jarsDir + " content: " + list);
}
for (int i = 0 ; i < sJarList.length ; i++)
Index: LocalJarClassLoader.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/LocalJarClassLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalJarClassLoader.java 26 Oct 2005 23:16:29 -0000 1.2
+++ LocalJarClassLoader.java 29 Nov 2005 18:37:17 -0000 1.3
@@ -25,8 +25,8 @@
import java.net.URL;
import java.net.MalformedURLException;
import com.netscape.management.client.comm.*;
-
import com.netscape.management.client.console.ConsoleInfo;
+import com.netscape.management.client.console.Console;
/**
* The LocalJarClassLoader is designed to load classes from jars
@@ -55,11 +55,13 @@
private static final String debugTag = "ClassLoader: ";
+ static String jarsDir = Console.PREFERENCE_DIR + "jars" + File.separator;
+
/**
- * Patch table lists all files in the ./patch directory
+ * Patch table lists all files in the PREFERENCE_DIR/patch directory
*/
static String patchFilePrefix = "patch-";
- static String patchDir = "./patch/";
+ static String patchDir = Console.PREFERENCE_DIR + "patch" + File.separator;
static Hashtable patchTable;
static {
@@ -408,22 +410,17 @@
/**
- * A jar file is either in /java/jars or in /java
+ * Server jar file located in jarsDir
*/
protected static String locateJarFile(String jarname) {
- // Look for files first in jars/.
+ // Look for files in jarsDir.
+ String filename = jarsDir + jarname;
- //String filename = "jars/" + jarname;
- String filename = "jars" + File.separator + jarname;
if (!((new File(filename)).exists())) {
- // file not found in jars/, look in ./
-
- filename = jarname;
- if (!((new File(filename)).exists())) {
- return null;
- }
+ return null;
+ } else {
+ return filename;
}
- return filename;
}
@@ -475,17 +472,14 @@
/**
* Returns a list of the jarfiles stored in the local jar directory.
- * This directory is currently ./jars, which assumes that our ultimate
- * application installation strategy will allow for a directory called
- * jars in the cwd of the VM on startup.
*
* @return an array of the locally stored jar files.
*/
public static String[] getLocalJarList() {
- File f = new File("jars");
+ File f = new File(jarsDir);
if (!f.exists() || !f.isDirectory()) {
- Debug.println(0, debugTag + "getLocalJarList():Unable to read ./jars directory");
+ Debug.println(0, debugTag + "getLocalJarList():Unable to read " + jarsDir + " directory");
return null;
}
@@ -498,7 +492,7 @@
}
/**
- * Returns a list of the patch files stored in the ./patch directory.
+ * Returns a list of the patch files stored in the patch directory.
* A patch file name format is patch- e.g. patch-ds41.jar
*
* @return a hashtable of patchFile
@@ -531,7 +525,7 @@
/**
* Acquires the jar file from the remote http server and stores it in the local
- * jar directory, which is currently assumed to be ./jars. It will look in
+ * jar directory, which is currently assumed to be PREFERENCE_DIR/jars. It will look in
* the /java, followed by /java/jars and finally
* directory, and it will also attempt to retrieve any L10N supplements, if found.
*
@@ -557,7 +551,7 @@
for (int i=0; i < createdFiles.size(); i++) {
try {
String filename = (String)createdFiles.elementAt(i);
- File f = new File("jars/" + filename);
+ File f = new File(jarsDir + filename);
boolean deleted = f.delete();
if (deleted) {
Debug.println(1, debugTag + " Cleanup: removed " + f);
@@ -750,13 +744,12 @@
Thread.currentThread().sleep(20);
}
- String jarPath = "jars";
- File f = new File(jarPath);
+ File f = new File(jarsDir);
if (!f.exists())
f.mkdir();
FileOutputStream fos =
- new FileOutputStream(jarPath + "/" + filename);
+ new FileOutputStream(jarsDir + filename);
AsyncByteArrayInputStream ais = (AsyncByteArrayInputStream) is;
fos.write(ais.getBuf(), 0, ais.size());
fos.close();
@@ -811,7 +804,7 @@
Vector jars = new Vector();
try {
- f = new ZipFile("jars/" + mainJar);
+ f = new ZipFile(jarsDir + mainJar);
ZipEntry e = f.getEntry(MANIFEST_FILE_NAME);
String jarname, compList = null;
@@ -981,7 +974,7 @@
}
/**
- * Parse all jars in java/jars for 'backward-compatible'
+ * Parse all jars in jarsDir for 'backward-compatible'
* directive in the manifest file
*/
public static void parseAllJars(Hashtable table, String[] jars) {
@@ -989,7 +982,7 @@
return;
for (int i = 0; i < jars.length; i++) {
try {
- ZipFile f = new ZipFile("jars/" + jars[i]);
+ ZipFile f = new ZipFile(LocalJarClassLoader.jarsDir + jars[i]);
ZipEntry e = f.getEntry(
LocalJarClassLoader.MANIFEST_FILE_NAME);
if (e == null) {
@@ -1023,7 +1016,7 @@
}
} catch (Exception ex) {
Debug.println(0,
- debugTag + " error process manifest for jars/" +
+ debugTag + " error process manifest for " + LocalJarClassLoader.jarsDir +
jars[i] + " " + ex);
continue;
}
From fedora-directory-commits at redhat.com Tue Nov 29 18:36:58 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 29 Nov 2005 13:36:58 -0500
Subject: [Fedora-directory-commits] console fedora-console.spec, NONE,
1.1 startconsole-sandbox, NONE, 1.1 build.properties, 1.6,
1.7 build.xml, 1.7, 1.8 imports.FC2, 1.1.1.1, 1.2 imports.FC3,
1.1.1.1, 1.2 imports.HP-UX11i, 1.1.1.1, 1.2 imports.Solaris9,
1.1.1.1, 1.2 startconsole, 1.4, 1.5
Message-ID: <200511291836.jATIawwH022280@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252
Modified Files:
build.properties build.xml imports.FC2 imports.FC3
imports.HP-UX11i imports.Solaris9 startconsole
Added Files:
fedora-console.spec startconsole-sandbox
Log Message:
173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained.
--- NEW FILE fedora-console.spec ---
Name: fedora-console
Version: 1.0
Release: 1
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc.
Summary: Fedora Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
Requires: ldapjdk >= 4.17, jss >= 3.6
BuildPreReq: ldapjdk >= 4.17, jss >= 3.6
%description
A Java based remote management console used for Managing Fedora
Administration Server and Fedora Directory Server.
# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)
%prep
%setup -q
%build
cd console
ant
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
install -d $RPM_BUILD_ROOT/usr/bin
install -m777 console/startconsole $RPM_BUILD_ROOT/usr/bin
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/share/java/fedora-base-%{version}.jar
/usr/share/java/fedora-mcc-%{version}.jar
/usr/share/java/fedora-mcc-%{version}_en.jar
/usr/share/java/fedora-nmclf-%{version}.jar
/usr/share/java/fedora-nmclf-%{version}_en.jar
/usr/bin/startconsole
%post
cd /usr/share/java
ln -s fedora-base-%{version}.jar fedora-base.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
%preun
rm -rf /usr/share/java/fedora-base.jar
rm -rf /usr/share/java/fedora-mcc.jar
rm -rf /usr/share/java/fedora-mcc_en.jar
rm -rf /usr/share/java/fedora-nmclf.jar
rm -rf /usr/share/java/fedora-nmclf_en.jar
%changelog
* Mon Nov 14 2005 Nathan Kinder 1.0-1
- Initial creation
--- NEW FILE startconsole-sandbox ---
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
JAVA=`which java`
if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
echo "$0: The java program is not in your path, or is not executable.";
exit 1
fi
#
# Launch the Console
#
java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties 26 Oct 2005 23:16:14 -0000 1.6
+++ build.properties 29 Nov 2005 18:36:50 -0000 1.7
@@ -25,8 +25,11 @@
console.version=10
console.dotversion=1.0
-mcc.core=mcc
-mcc.name=${mcc.core}${console.version}
+mcc.core=fedora-mcc
+mcc.name=${mcc.core}-${console.dotversion}
-nmclf.core=nmclf
-nmclf.name=${nmclf.core}${console.version}
+nmclf.core=fedora-nmclf
+nmclf.name=${nmclf.core}-${console.dotversion}
+
+base.core=fedora-base
+base.name=${base.core}-${console.dotversion}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 25 Oct 2005 17:30:46 -0000 1.7
+++ build.xml 29 Nov 2005 18:36:50 -0000 1.8
@@ -19,58 +19,43 @@
END COPYRIGHT BLOCK
-->
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
@@ -81,11 +66,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -94,33 +112,34 @@
-
+
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
@@ -128,7 +147,25 @@
-
+
+
+
+ Please set the correct location with -Dldapjdk.local.location=[path]
+
+
+
+
+
+
+
+ Please set the correct location with -Djss.local.location=[path]
+
+
+
+
+
+
+
-
-
+
+
-
+
@@ -168,26 +205,26 @@
-
+
-
+
-
+
-
+
@@ -208,30 +245,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
@@ -239,7 +271,7 @@
-
+
@@ -247,19 +279,19 @@
-
+
-
+ prefix="fedora-console${console.dotversion}">
Index: imports.FC2
===================================================================
RCS file: /cvs/dirsec/console/imports.FC2,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.FC2 18 Jul 2005 00:34:05 -0000 1.1.1.1
+++ imports.FC2 29 Nov 2005 18:36:50 -0000 1.2
@@ -24,17 +24,17 @@
ldapjdk.import=ldapjdk.jar
# Mozilla JSS Library
-jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/RHEL3_x86_gcc3_OPT.OBJ
+jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/RHEL3_x86_gcc3_OPT.OBJ
jss.lib.import=mdbinary.jar
# Mozilla JSS Jar
-jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM
+jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/RHEL3_x86_gcc3_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL3_x86_gcc3_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
-nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/RHEL3_x86_gcc3_OPT.OBJ
+nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/RHEL3_x86_gcc3_OPT.OBJ
nspr.import=mdbinary.jar
Index: imports.FC3
===================================================================
RCS file: /cvs/dirsec/console/imports.FC3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.FC3 18 Jul 2005 00:34:05 -0000 1.1.1.1
+++ imports.FC3 29 Nov 2005 18:36:50 -0000 1.2
@@ -24,17 +24,17 @@
ldapjdk.import=ldapjdk.jar
# Mozilla JSS Library
-jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/RHEL4_x86_gcc3_OPT.OBJ
+jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/RHEL4_x86_gcc3_OPT.OBJ
jss.lib.import=mdbinary.jar
# Mozilla JSS Jar
-jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM
+jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/RHEL4_x86_gcc3_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL4_x86_gcc3_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
-nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/RHEL4_x86_gcc3_OPT.OBJ
+nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/RHEL4_x86_gcc3_OPT.OBJ
nspr.import=mdbinary.jar
Index: imports.HP-UX11i
===================================================================
RCS file: /cvs/dirsec/console/imports.HP-UX11i,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.HP-UX11i 18 Jul 2005 00:34:05 -0000 1.1.1.1
+++ imports.HP-UX11i 29 Nov 2005 18:36:50 -0000 1.2
@@ -24,17 +24,17 @@
ldapjdk.import=ldapjdk.jar
# Mozilla JSS Library
-jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/HP-UXB.11.11_OPT.OBJ
+jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/HP-UXB.11.11_OPT.OBJ
jss.lib.import=mdbinary.jar
# Mozilla JSS Jar
-jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM
+jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/HP-UXB.11.11_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/HP-UXB.11.11_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
-nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/HP-UXB.11.11_OPT.OBJ
+nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/HP-UXB.11.11_OPT.OBJ
nspr.import=mdbinary.jar
Index: imports.Solaris9
===================================================================
RCS file: /cvs/dirsec/console/imports.Solaris9,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.Solaris9 18 Jul 2005 00:34:05 -0000 1.1.1.1
+++ imports.Solaris9 29 Nov 2005 18:36:50 -0000 1.2
@@ -24,17 +24,17 @@
ldapjdk.import=ldapjdk.jar
# Mozilla JSS Library
-jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/SunOS5.9_OPT.OBJ
+jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/SunOS5.9_OPT.OBJ
jss.lib.import=mdbinary.jar
# Mozilla JSS Jar
-jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM
+jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM
jss.jar.import=xpclass.jar
# Mozilla NSS Library
-nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/SunOS5.9_OPT.OBJ
+nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/SunOS5.9_OPT.OBJ
nss.import=mdbinary.jar
# Mozilla NSPR Library
-nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/SunOS5.9_OPT.OBJ
+nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/SunOS5.9_OPT.OBJ
nspr.import=mdbinary.jar
Index: startconsole
===================================================================
RCS file: /cvs/dirsec/console/startconsole,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- startconsole 26 Oct 2005 23:16:14 -0000 1.4
+++ startconsole 29 Nov 2005 18:36:50 -0000 1.5
@@ -19,51 +19,14 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
-#
-# Check if JAVA_HOME is set
-#
-if [ -z "$JAVA_HOME" ]
-then
- echo "$0: Your JAVA_HOME environment variable is not set. Please set it appropriately."
- exit 1
-fi
-
-#
-# Make sure java exists and is executable
-#
-if [ ! -f java -a ! -x java ]
-then
- echo "$0: The java program is not in your path, or is not executable."
- exit 1
-fi
-
-#
-# See if libjava and libjvm exist, and set the lib path. These are linked to by JSS.
-#
-LIBJAVA_DIR=`find $JAVA_HOME -name libjava\.s[ol] | sed 's/\/libjava\.s.$//'`
-LIBJVM_DIR=`find $JAVA_HOME -name libjvm\.s[ol] | sed 's/\/libjvm\.s.$//'`
-
-if [ -z "$LIBJAVA_DIR" -a -z "$LIBJVM_DIR" ]
+JAVA=`which java`
+if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
- echo "$0: Unable to find libjava and libjvm in JAVA_HOME. Please ensure that JAVA_HOME is set correctly."
+ echo "$0: The java program is not in your path, or is not executable.";
exit 1
-else
- if [ "$LIBJAVA_DIR" = "$LIBJVM_DIR" ]
- then
- LD_LIBRARY_PATH="$LIBJAVA_DIR"
- SHLIB_PATH="$LIBJAVA_DIR"
- DYLD_PATH="$LIBJAVA_DIR"
- else
- LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
- SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
- DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
- fi
- export LD_LIBRARY_PATH
- export SHLIB_PATH
- export DYLD_PATH
fi
#
# Launch the Console
#
-cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc10_en.jar:./jss3.jar:./ldapjdk.jar:./mcc10.jar:./nmclf10_en.jar:./nmclf10.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $*
+java -ms8m -mx64m -cp /usr/share/java/jss3.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/fedora-base-1.0.jar:/usr/share/java/fedora-mcc-1.0.jar:/usr/share/java/fedora-mcc-1.0_en.jar:/usr/share/java/fedora-nmclf-1.0.jar:/usr/share/java/fedora-nmclf-1.0_en.jar -Djava.library.path=/usr/lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
From fedora-directory-commits at redhat.com Tue Nov 29 18:37:03 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 29 Nov 2005 13:37:03 -0500
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/console
Console.java, 1.2, 1.3
Message-ID: <200511291837.jATIbX08022360@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252/src/com/netscape/management/client/console
Modified Files:
Console.java
Log Message:
173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained.
Index: Console.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Console.java 26 Oct 2005 23:16:23 -0000 1.2
+++ Console.java 29 Nov 2005 18:36:56 -0000 1.3
@@ -70,6 +70,9 @@
public static final String PREFERENCE_X = "X";
public static final String PREFERENCE_Y = "Y";
+ public static final String PREFERENCE_DIR = System.getProperty("user.home") + File.separator +
+ ".fedora-console" + File.separator;
+
public static final String OPTION_NOWINPOS = "nowinpos";
public static final String OPTION_NOLOGO = "nologo";
public static final String OPTION_JAVALAF = "javalaf";
From fedora-directory-commits at redhat.com Tue Nov 29 18:37:08 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 29 Nov 2005 13:37:08 -0500
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/preferences
FilePreferenceManager.java, 1.1.1.1, 1.2
Message-ID: <200511291837.jATIbd42022363@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/preferences
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252/src/com/netscape/management/client/preferences
Modified Files:
FilePreferenceManager.java
Log Message:
173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained.
Index: FilePreferenceManager.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/preferences/FilePreferenceManager.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- FilePreferenceManager.java 18 Jul 2005 00:34:15 -0000 1.1.1.1
+++ FilePreferenceManager.java 29 Nov 2005 18:37:01 -0000 1.2
@@ -32,7 +32,6 @@
* @author ahakim at netscape.com
*/
public class FilePreferenceManager extends PreferenceManager {
- private static String PREFERENCES_FOLDER = ".mcc";
private static String FILE_SEPARATOR = ".";
private static String FILE_SUFFIX = ".preferences";
private Hashtable _prefTable = new Hashtable();
@@ -46,21 +45,16 @@
public static String getHomePath() {
String homePath = null;
Properties p = System.getProperties();
- homePath = (String) p.get("user.home");
- if (homePath == null)
- homePath = ".";
- String prefPath = homePath + "/"+PREFERENCES_FOLDER;
-
- File f = new File(prefPath);
+ File f = new File(Console.PREFERENCE_DIR);
if (!f.exists())
f.mkdir();
if (!f.exists()) {
- Debug.println("error: cannot create/access" + prefPath);
- return homePath;
+ Debug.println("error: cannot create/access" + Console.PREFERENCE_DIR);
+ return ".";
}
- return prefPath;
+ return Console.PREFERENCE_DIR;
}
From fedora-directory-commits at redhat.com Tue Nov 29 18:37:14 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 29 Nov 2005 13:37:14 -0500
Subject: [Fedora-directory-commits]
console/src/com/netscape/management/client/security
CertRequestWizard.java, 1.1.1.1, 1.2
Message-ID: <200511291837.jATIbilB022366@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/security
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252/src/com/netscape/management/client/security
Modified Files:
CertRequestWizard.java
Log Message:
173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained.
Index: CertRequestWizard.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- CertRequestWizard.java 18 Jul 2005 00:34:16 -0000 1.1.1.1
+++ CertRequestWizard.java 29 Nov 2005 18:37:06 -0000 1.2
@@ -40,7 +40,6 @@
import com.netscape.management.client.util.Help;
import com.netscape.management.client.util.Browser;
import com.netscape.management.nmclf.*;
-
import com.netscape.management.client.security.csr.*;
import com.netscape.management.client.preferences.*;
import netscape.ldap.*;
@@ -62,7 +61,9 @@
IDataCollectionModel dataCollectionModel = new WizardDataCollectionModel();
final String PLUGIN_ID = "PLUGIN_ID";
- final String PLUGIN_DIR = "./caplugin";
+ final String PLUGIN_DIR = Console.PREFERENCE_DIR + "caplugin" + File.separator;
+ final String DEFAULT_PLUGIN_CLASS = "com.netscape.management.client.security.csr.DefaultPlugin.class";
+ final String DEFAULT_PLUGIN_DESC = "Manual Cert Request Plugin";
PluginWizardPage pwdPage = null;
PluginWizardPage endSequence = null;
@@ -379,6 +380,16 @@
//construct plugin list
Vector caList = new Vector();
File f = new File(PLUGIN_DIR);
+
+ // Load the default plugin
+ defaultPlugin = new PluginItem(DEFAULT_PLUGIN_CLASS, DEFAULT_PLUGIN_DESC,
+ "", null , "", null);
+
+ // Check if caplugin directory exists
+ if (!f.exists())
+ f.mkdir();
+
+ // Check for additional plugins
File[] fList = f.listFiles(this);
for (int i=0; i
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252/src/com/netscape/management/client/topology
Modified Files:
ServerNode.java
Log Message:
173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained.
Index: ServerNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ServerNode.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ServerNode.java 18 Jul 2005 00:34:19 -0000 1.1.1.1
+++ ServerNode.java 29 Nov 2005 18:37:12 -0000 1.2
@@ -154,7 +154,7 @@
else
{
// Try to present server object in the topology without creating the
- // object instance. Look for the cached server icon in jars/.icon file.
+ // object instance. Look for the cached server icon in .icon file.
String jarName = getJARClassName(ldc, serverDN);
/* Serializing the icon to cache it no longer seems to be
* working correctly. We will instantiate the server now
@@ -165,7 +165,7 @@
{
jarBaseName = jarName.substring(0, jarName.indexOf('.'));
}
- cacheIconPath = "jars/" + jarBaseName + ".icon";
+ cacheIconPath = LocalJarClassLoader.jarsDir + jarBaseName + ".icon";
ImageIcon icon = (ImageIcon)getIconFromCache(cacheIconPath);
if (icon != null)
{
From fedora-directory-commits at redhat.com Tue Nov 29 22:19:33 2005
From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder))
Date: Tue, 29 Nov 2005 17:19:33 -0500
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication cl5_clcache.c, 1.5, 1.6
Message-ID: <200511292219.jATMJXqr030079@cvs-int.fedora.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30063
Modified Files:
cl5_clcache.c
Log Message:
174550 - Fixed error message typo
Index: cl5_clcache.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_clcache.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cl5_clcache.c 19 Apr 2005 22:07:32 -0000 1.5
+++ cl5_clcache.c 29 Nov 2005 22:19:25 -0000 1.6
@@ -920,7 +920,7 @@
case ENOMEM:
slapi_log_error ( SLAPI_LOG_FATAL, buf->buf_agmt_name,
- "clcache_cursor_get: cann't allocate %u bytes\n", buf->buf_data.ulen );
+ "clcache_cursor_get: can't allocate %u bytes\n", buf->buf_data.ulen );
break;
default: