rpms/condor/devel gcc44_const.patch, NONE, 1.1 condor.spec, 1.17, 1.18 const_strchr.patch, 1.1, NONE

[Matthew Farrellee]

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11884

Modified Files:
	condor.spec 
Added Files:
	gcc44_const.patch 
Removed Files:
	const_strchr.patch 
Log Message:
fixed changelog and gcc44 errors

gcc44_const.patch:

--- NEW FILE gcc44_const.patch ---
commit 5218f2f94d01fa74519472d0d72e9c43e9792624
Author: Matthew Farrellee <matt at redhat.com>
Date:   Wed Feb 25 13:32:43 2009 -0600

    Port to gcc 4.4's stricter string functions
    
    gcc 4.4 is now enforcing constness for strchr strrchr strstr etc. This
    means when we pass in a const char * we need to take out a const char
    *, not a char *.

diff --git a/src/condor_amazon/gsoap_commands.cpp b/src/condor_amazon/gsoap_commands.cpp
index 064096d..514adab 100644
--- a/src/condor_amazon/gsoap_commands.cpp
+++ b/src/condor_amazon/gsoap_commands.cpp
@@ -97,7 +97,7 @@ AmazonRequest::ParseSoapError(const char* callerstring)
 
 		// NOTE: The faultcode appears to have a qualifying 
 		// namespace, which we need to strip
-		char *s = strrchr(*code, ':');
+		const char *s = strrchr(*code, ':');
 		if( s ) {
 			s++;
 			if( !strncasecmp(s, "Client.", strlen("Client.")) ) {
diff --git a/src/condor_c++_util/store_cred.cpp b/src/condor_c++_util/store_cred.cpp
index 9d43fc8..49da998 100644
--- a/src/condor_c++_util/store_cred.cpp
+++ b/src/condor_c++_util/store_cred.cpp
@@ -170,7 +170,7 @@ char* getStoredCredential(const char *username, const char *domain)
 
 int store_cred_service(const char *user, const char *pw, int mode)
 {
-	char *at = strchr(user, '@');
+	const char *at = strchr(user, '@');
 	if ((at == NULL) || (at == user)) {
 		dprintf(D_ALWAYS, "store_cred: malformed user name\n");
 		return FAILURE;
diff --git a/src/condor_gridmanager/gt42_gahp_wrapper.cpp b/src/condor_gridmanager/gt42_gahp_wrapper.cpp
index 63762ab..0336c80 100644
--- a/src/condor_gridmanager/gt42_gahp_wrapper.cpp
+++ b/src/condor_gridmanager/gt42_gahp_wrapper.cpp
@@ -160,7 +160,7 @@ main( int argc, char* argv[] ) {
 	Directory dir( buff.Value() );
 	dir.Rewind();
 	while ( (ctmp = dir.Next()) ) {
-		char *match = strstr( ctmp, ".jar" );
+		const char *match = strstr( ctmp, ".jar" );
 		if ( match && strlen( match ) == 4 ) {
 			classpath += classpath_seperator;
 			classpath += dir.GetFullPath();
@@ -170,7 +170,7 @@ main( int argc, char* argv[] ) {
 	Directory dir2( buff.Value() );
 	dir2.Rewind();
 	while ( (ctmp = dir2.Next()) ) {
-		char *match = strstr( ctmp, ".jar" );
+		const char *match = strstr( ctmp, ".jar" );
 		if ( match && strlen( match ) == 4 ) {
 			classpath += classpath_seperator;
 			classpath += dir2.GetFullPath();
diff --git a/src/condor_gridmanager/gt4_gahp_wrapper.cpp b/src/condor_gridmanager/gt4_gahp_wrapper.cpp
index c9f23ed..3d1c09b 100644
--- a/src/condor_gridmanager/gt4_gahp_wrapper.cpp
+++ b/src/condor_gridmanager/gt4_gahp_wrapper.cpp
@@ -160,7 +160,7 @@ main( int argc, char* argv[] ) {
 	Directory dir( buff.Value() );
 	dir.Rewind();
 	while ( (ctmp = dir.Next()) ) {
-		char *match = strstr( ctmp, ".jar" );
+		const char *match = strstr( ctmp, ".jar" );
 		if ( match && strlen( match ) == 4 ) {
 			classpath += classpath_seperator;
 			classpath += dir.GetFullPath();


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- condor.spec	24 Feb 2009 19:36:00 -0000	1.17
+++ condor.spec	25 Feb 2009 20:18:44 -0000	1.18
@@ -28,7 +28,7 @@
 Patch3: chkconfig_off.patch
 Patch4: no_rpmdb_query.patch
 Patch5: no_basename.patch
-Patch6: const_strchr.patch
+Patch6: gcc44_const.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -577,6 +577,12 @@
 - Removed Requires in favor of automatic dependencies on SONAMEs
 - Added no_rmpdb_query.patch to avoid rpm -q during a build
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.0-4
+- rebuild with new openssl
+
 * Mon Jan 14 2009  <matt at redhat> - 7.2.0-3
 - Fixed regression: initscript was on by default, now off again
 


--- const_strchr.patch DELETED ---