[Pkg-owncloud-commits] [SCM] ocsync.git branch, master, updated. upstream/0.60.3-15-gf729cf9

[Sandro Knauß]

The following commit has been merged in the master branch:
commit f729cf9c55335800194b4f243e8bedd0daefc7b1
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Dec 14 23:03:21 2012 +0100

    deleted md5_mhash.patch

diff --git a/debian/patches/md5_mhash.patch b/debian/patches/md5_mhash.patch
deleted file mode 100644
index 906353c..0000000
--- a/debian/patches/md5_mhash.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Description: Use mhash instead of OpenSSL to calculate MD5 hashes to avoid
- GPL+OpenSSL license conflicts.
-Author: Felix Geyer <debfx at ubuntu.com>
-
---- csync-owncloud-0.50.8.orig/src/CMakeLists.txt
-+++ csync-owncloud-0.50.8/src/CMakeLists.txt
-@@ -3,11 +3,7 @@ project(libcsync C)
- add_subdirectory(std)
- 
- find_package(SQLite3 REQUIRED)
--if(CMAKE_CROSSCOMPILING)
--    find_package(OpenSSLCross REQUIRED)
--else()
--    find_package(OpenSSL REQUIRED)
--endif()
-+find_library(MHASH_LIBRARY mhash)
- 
- set(CSYNC_PUBLIC_INCLUDE_DIRS
-   ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -31,7 +26,7 @@ set(CSYNC_LINK_LIBRARIES
-   ${CSYNC_LIBRARY}
-   ${CSTDLIB_LIBRARY}
-   ${CSYNC_REQUIRED_LIBRARIES}
--  ${OPENSSL_LIBRARIES}
-+  ${MHASH_LIBRARY}
-   ${SQLITE3_LIBRARIES}
- )
- 
---- csync-owncloud-0.50.8.orig/src/csync_util.c
-+++ csync-owncloud-0.50.8/src/csync_util.c
-@@ -32,13 +32,7 @@
- #include "csync_util.h"
- #include "vio/csync_vio.h"
- 
--#if defined(__APPLE__)
--#  define COMMON_DIGEST_FOR_OPENSSL
--#  include <CommonCrypto/CommonDigest.h>
--#  define SHA1 CC_SHA1
--#else
--#  include <openssl/md5.h>
--#endif
-+#include <mhash.h>
- 
- #define CSYNC_LOG_CATEGORY_NAME "csync.util"
- #include "csync_log.h"
-@@ -354,7 +348,7 @@ char* csync_file_md5(const char *filenam
- {
-     const char *tmpFileName;
-     int fd;
--    MD5_CTX c;
-+    MHASH c;
-     char buf[ BUF_SIZE+1 ];
-     unsigned char digest[16];
-     size_t size;
-@@ -364,13 +358,13 @@ char* csync_file_md5(const char *filenam
-     if ( (fd = _topen( tmpFileName, O_RDONLY )) < 0) {
-         return NULL;
-     } else {
--        MD5_Init(&c);
-+        c = mhash_init(MHASH_MD5);
-         while( (size=read(fd, buf, BUF_SIZE )) >  0) {
-             buf[size]='\0';
--            MD5_Update(&c, buf, size);
-+            mhash(c, buf, size);
-         }
-         close(fd);
--        MD5_Final(digest, &c);
-+        mhash_deinit(c, digest);
-     }
- 
-     c_free_multibyte(tmpFileName);
-@@ -379,22 +373,22 @@ char* csync_file_md5(const char *filenam
- 
- char* csync_buffer_md5(const char *str, int length)
- {
--    MD5_CTX c;
-+    MHASH c;
-     unsigned char digest[16];
- 
--    MD5_Init(&c);
-+    c = mhash_init(MHASH_MD5);
- 
-     while (length > 0) {
-         if (length > 512) {
--            MD5_Update(&c, str, 512);
-+            mhash(c, str, 512);
-         } else {
--            MD5_Update(&c, str, length);
-+            mhash(c, str, length);
-         }
-         length -= 512;
-         str += 512;
-     }
- 
--    MD5_Final(digest, &c);
-+    mhash_deinit(c, digest);
-     return digest_to_out(digest);
- }
- 

-- 
ocsync.git