rpms/dclib/FC-5 dclib-0.3.7-hashfix.patch, NONE, 1.1 dclib-0.3.7-keylock.patch, NONE, 1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.7, 1.8

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/extras/rpms/dclib/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30277

Modified Files:
	dclib.spec 
Added Files:
	dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch 
	dclib-0.3.7-permissions.patch 
Log Message:
* Mon May 01 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
- dclib-0.3.7-permissions.patch
  make valknut use the umask instead of hardcoded permissions
- dclib-0.3.7-keylock.patch
  fixes $Lock-parsing problem
- dclib-0.3.7-hashfix.patch
  fixes production of wrong hashes


dclib-0.3.7-hashfix.patch:

--- NEW FILE dclib-0.3.7-hashfix.patch ---
--- dclib/csearchindex.cpp	2005-04-06 01:21:00.397324222 +0200
+++ dclib/csearchindex.cpp	2005-04-06 01:25:34.469238109 +0200
@@ -419,10 +419,12 @@
 	CString s;
 	CBase32 base32;
 	CByteArray dst,src;
-	
-	if ( hbi < m_pHashIndex->Size() )
+	struct hashbaseobject * hbo;
+
+	if ( hbi < m_pHashBaseArray->Size() )
 	{
-		src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE);
+		hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi);
+		src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE);
 		base32.Encode( &dst, &src );
 		if ( dst.Size() > 0 )
 		{

dclib-0.3.7-keylock.patch:

--- NEW FILE dclib-0.3.7-keylock.patch ---
--- dclib/cmessagehandler.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/cmessagehandler.cpp	2005-06-26 00:09:12.000000000 +0200
@@ -428,7 +428,7 @@
 
 	int i,i1;
 
-	i = sContent.Find(' ');
+	i = sContent.Find(" Pk=");
 
 	if ( (msg = new CMessageLock()) != 0 )
 	{

dclib-0.3.7-permissions.patch:

--- NEW FILE dclib-0.3.7-permissions.patch ---
--- dclib/core/cdir.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/core/cdir.cpp	2005-06-24 13:41:38.000000000 +0200
@@ -553,7 +553,7 @@
 #ifdef WIN32
 			if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 )
 #else
-			if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 )
+			if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 )
 #endif
 			{
 				if ( errno != EEXIST )
--- dclib/core/filecopy.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/core/filecopy.cpp	2005-06-24 13:40:54.000000000 +0200
@@ -94,7 +94,7 @@
 	
 	blen = sb.st_blksize;
 
-	while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0)
+	while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0)
 	{
 		if (errno == EEXIST && unlink(to) == 0)
 			continue;
--- dclib/ctransfer.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/ctransfer.cpp	2005-06-24 13:39:08.000000000 +0200
@@ -488,7 +488,7 @@
 
 		mode |= IO_RAW | IO_WRITEONLY;
 
-		if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE )
+		if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE )
 		{
 			CallBack_SendError(strerror(errno));
 			perror("File open");


Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/FC-5/dclib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dclib.spec	13 Feb 2006 21:00:26 -0000	1.7
+++ dclib.spec	1 May 2006 22:33:50 -0000	1.8
@@ -1,14 +1,17 @@
 Name:           dclib
 Version:        0.3.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dcgui.berlios.de/
 Source0:        http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{name}-%{version}-hashfix.patch
+Patch1:         %{name}-%{version}-keylock.patch
+Patch2:         %{name}-%{version}-permissions.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
 
 %description
@@ -31,6 +34,9 @@
 
 %prep
 %setup -q
+%patch0 -b .hashfix
+%patch1 -b .keylock
+%patch2 -b .perms
 
 
 %build
@@ -66,6 +72,14 @@
 
 
 %changelog
+* Mon May 01 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
+- dclib-0.3.7-permissions.patch
+  make valknut use the umask instead of hardcoded permissions
+- dclib-0.3.7-keylock.patch
+  fixes $Lock-parsing problem
+- dclib-0.3.7-hashfix.patch
+  fixes production of wrong hashes
+
 * Mon Feb 13 2006 Luke Macken <lmacken at redhat.com> 0.3.7-6
 - Rebuild for FE5