Hey, like in beta1 there are still open issues in beta3 for ocsync:
* a typo of Klaas email address ending with ">wie" (fixed in 0003-*patch attached) *no ChangeLog entry for 0.91.X * one file is still GPL (where it is not intended): tests/ownCloud/ownCloud/Test.pm *still the both patches I send you for compiling ocsync under FreeBSD aren't included (0001-*patch and 0002-*patch) The attached patches are a format-patch based on the git tag v.0.91.2. mirall issues: * the file src/3rdparty/csync/c_jhash.h is a copy from ocsync. Looks a little bit weird. It is included in src/mirall/syncjournaldb.cpp. *Changlog entry missing Regards, sandro -- On Tuesday 10 December 2013 10:57:16 Daniel Molkentin wrote: > Hi, > > As we are getting closer to the final release of 1.5.0, we today announce > the final beta version, beta3. If no major issues are found, this is also > the Release Candidate. > > Changes compared to beta2: > > mirall: > - Fix windows rename of temporary files > - Fix Win32 move file operation > - Set proper enable state of blacklist button after the dialog was opened > - Set proper tooltips in blacklist > - Translatable error messages for file errors > - Add man page for owncloudcmd (#1234) > - Don't close setup wizard when the initial sync run is started > - Close the sync journal if a folder gets removed (#1252) > - Activity: Avoid horizontal scrollbar (#1213) > - Fix crash (#1229) > - Resize wizard appropriately (#1130) > - Fix account identity test (#1231) > - Maintain the file type correctly > - Display rename-target in sync protocol action column > - Let recursive removal also remove the top dir > - If item is a directory, remove its contents from the database as well > (#1257) - Install headers for owncloudsync library > - Fix opening the explorer with a selected file in Windows (#1249) > - Add build number into versioning scheme > > ocsync: > - have translatable error message for indiv. file errors. > - Use uint64_t for inode on win32 to fix a type glitch. > - Add test that directrories are properly moved. > - Handle symlinks correctly. > - Do not longer recurse into ignored directories in update phase. > - Added proper symlink detection for win32 platform. > > You can get the beta client from http://owncloud.org/sync-clients/#testing > > Please keep on testing! Report issue you might find in the github issue > tracker at [1] > > Again two things are important: > a) first, search if the bug was already reported! If so, add _new_ > information to the issue, but please please stay away from +1's b) please > put a [1.5.0 beta3] in the subject of the issue. > > Standard Disclaimer: This is beta software, please NEVER use it without a > backup and keep a good eye on it. > > Thanks a lot, > > Daniel > > [1] https://github.com/owncloud/mirall/issues > -- > www.owncloud.com - Your Data, Your Cloud, Your Way! > > ownCloud GmbH, GF: Markus Rex, Holger Dyroff > Schloßäckerstrasse 26a, 90443 Nürnberg, HRB 28050 (AG Nürnberg)
>From 88e72df8c13313686d661ee508809b8600f46bf1 Mon Sep 17 00:00:00 2001 From: hefee <he...@netzguerilla.net> Date: Wed, 11 Dec 2013 14:31:05 +0100 Subject: [PATCH 1/3] compile ocsync for FreeBSD. --- src/std/c_private.h | 9 +++++++++ src/std/c_string.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/std/c_private.h b/src/std/c_private.h index fb1313c..c1ef1a7 100644 --- a/src/std/c_private.h +++ b/src/std/c_private.h @@ -36,6 +36,8 @@ #include <wchar.h> #endif +#include <errno.h> + #ifdef _WIN32 #define EDQUOT 0 #define ENODATA 0 @@ -55,8 +57,15 @@ #define nlink_t int #define getuid() 0 #define geteuid() 0 +#else +#include <fcntl.h> +#endif + +#ifndef ENODATA +#define ENODATA EPIPE #endif + #ifdef _WIN32 typedef struct stat64 csync_stat_t; #define _FILE_OFFSET_BITS 64 diff --git a/src/std/c_string.c b/src/std/c_string.c index 2a660c4..2c056a5 100644 --- a/src/std/c_string.c +++ b/src/std/c_string.c @@ -335,7 +335,7 @@ char* c_utf8_from_locale(const mbchar_t *wstr) #ifdef WITH_ICONV dst = c_iconv(wstr, iconv_from_native); #else - dst = wstr; + dst = (char*) wstr; #endif #endif return dst; @@ -372,7 +372,7 @@ mbchar_t* c_utf8_to_locale(const char *str) #ifdef WITH_ICONV dst = c_iconv(str, iconv_to_native); #else - dst = str; + dst = (_TCHAR*) str; #endif #endif return dst; -- 1.8.5.1
>From dc01b13431f425b4958fb7911ebfa2a6c15e6d71 Mon Sep 17 00:00:00 2001 From: hefee <he...@netzguerilla.net> Date: Wed, 11 Dec 2013 14:31:05 +0100 Subject: [PATCH 2/3] Get rid of PATH_MAX, that is not available under FreeBSD. --- src/csync_misc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/csync_misc.c b/src/csync_misc.c index 2654060..6d76d59 100644 --- a/src/csync_misc.c +++ b/src/csync_misc.c @@ -90,7 +90,6 @@ char *csync_get_local_username(void) { #endif /* NSS_BUFLEN_PASSWD */ char *csync_get_user_home_dir(void) { - char home[PATH_MAX] = {0}; const char *envp; struct passwd pwd; struct passwd *pwdbuf; @@ -98,11 +97,8 @@ char *csync_get_user_home_dir(void) { int rc; envp = getenv("HOME"); - if (envp != NULL) { - snprintf(home, sizeof(home), "%s", envp); - if (home[0] != '\0') { - return c_strdup(home); - } + if (envp != NULL && envp[0] != '\0') { + return c_strdup(envp); } /* Still nothing found, read the password file */ -- 1.8.5.1
>From 324c49e27542144fe40611c387c4a600c9941fbb Mon Sep 17 00:00:00 2001 From: hefee <he...@netzguerilla.net> Date: Wed, 11 Dec 2013 14:54:34 +0100 Subject: [PATCH 3/3] fixing typo --- src/csync_misc.c | 2 +- src/csync_misc.h | 2 +- src/csync_statedb.c | 2 +- src/csync_statedb.h | 2 +- src/csync_update.c | 2 +- src/csync_update.h | 2 +- src/csync_util.c | 2 +- src/csync_util.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/csync_misc.c b/src/csync_misc.c index 6d76d59..a80fa3a 100644 --- a/src/csync_misc.c +++ b/src/csync_misc.c @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_misc.h b/src/csync_misc.h index 84d3f6a..fed9ca3 100644 --- a/src/csync_misc.h +++ b/src/csync_misc.h @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_statedb.c b/src/csync_statedb.c index 63fe615..2f26f5d 100644 --- a/src/csync_statedb.c +++ b/src/csync_statedb.c @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_statedb.h b/src/csync_statedb.h index 1d31c68..feef102 100644 --- a/src/csync_statedb.h +++ b/src/csync_statedb.h @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_update.c b/src/csync_update.c index 15d3ee8..746cd2c 100644 --- a/src/csync_update.c +++ b/src/csync_update.c @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_update.h b/src/csync_update.h index 73ffa54..6f6dee4 100644 --- a/src/csync_update.h +++ b/src/csync_update.h @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_util.c b/src/csync_util.c index e611c60..049b328 100644 --- a/src/csync_util.c +++ b/src/csync_util.c @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/csync_util.h b/src/csync_util.h index e9bbfa5..10f5727 100644 --- a/src/csync_util.h +++ b/src/csync_util.h @@ -2,7 +2,7 @@ * libcsync -- a library to sync a directory with another * * Copyright (c) 2008-2013 by Andreas Schneider <a...@cryptomilk.org> - * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com>wie + * Copyright (c) 2012-2013 by Klaas Freitag <frei...@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 1.8.5.1
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Owncloud mailing list Owncloud@kde.org https://mail.kde.org/mailman/listinfo/owncloud