[Pkg-owncloud-commits] [SCM] ocsync.git branch, master, updated. debian/0.70.3-1-5-g5a97a58
Sandro Knauß
bugs at sandroknauss.de
Tue Mar 5 04:05:34 UTC 2013
The following commit has been merged in the master branch:
commit 5a97a585be0b62b66aa616943f83416df6a37726
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue Mar 5 05:04:41 2013 +0100
updating debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
diff --git a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
index 71277c6..120a922 100644
--- a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
+++ b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
@@ -22,10 +22,10 @@ Signed-off-by: Gergely Nagy <algernon at madhouse-project.org>
create mode 100644 src/ini.c
create mode 100644 src/ini.h
-Index: ocsync-0.70.3/INSTALL
+Index: ocsync/INSTALL
===================================================================
---- ocsync-0.70.3.orig/INSTALL 2013-01-30 22:26:22.552273610 +0100
-+++ ocsync-0.70.3/INSTALL 2013-01-30 22:26:22.540273572 +0100
+--- ocsync.orig/INSTALL 2013-03-05 05:03:53.752452622 +0100
++++ ocsync/INSTALL 2013-03-05 05:03:53.745452599 +0100
@@ -11,7 +11,6 @@
- [check](http://check.sourceforge.net) >= 0.9.5
- [sqlite3](http://www.sqlite.org) >= 3.4
@@ -34,10 +34,10 @@ Index: ocsync-0.70.3/INSTALL
- [libsmbclient](http://www.samba.org) >= 3.5
- [libssh](http://www.libssh.org) >= 0.5
-Index: ocsync-0.70.3/src/CMakeLists.txt
+Index: ocsync/src/CMakeLists.txt
===================================================================
---- ocsync-0.70.3.orig/src/CMakeLists.txt 2013-01-30 22:26:22.552273610 +0100
-+++ ocsync-0.70.3/src/CMakeLists.txt 2013-01-30 22:26:22.541273575 +0100
+--- ocsync.orig/src/CMakeLists.txt 2013-03-05 05:03:53.752452622 +0100
++++ ocsync/src/CMakeLists.txt 2013-03-05 05:03:53.746452602 +0100
@@ -6,12 +6,9 @@
if (CSYNC_STATIC_COMPILE_DIR)
set(SQLITE3_INCLUDE_DIRS "")
@@ -67,16 +67,16 @@ Index: ocsync-0.70.3/src/CMakeLists.txt
csync_config.c
csync_exclude.c
csync_log.c
-Index: ocsync-0.70.3/src/csync_config.c
+Index: ocsync/src/csync_config.c
===================================================================
---- ocsync-0.70.3.orig/src/csync_config.c 2013-01-30 22:26:22.552273610 +0100
-+++ ocsync-0.70.3/src/csync_config.c 2013-01-30 22:26:22.542273578 +0100
-@@ -23,12 +23,12 @@
+--- ocsync.orig/src/csync_config.c 2013-03-05 05:03:53.752452622 +0100
++++ ocsync/src/csync_config.c 2013-03-05 05:04:04.316487251 +0100
+@@ -23,12 +23,11 @@
/* #define _GNU_SOURCE */
#include <stdio.h>
-#include <iniparser.h>
-
+-
#include "c_lib.h"
#include "c_private.h"
#include "csync_private.h"
@@ -85,12 +85,10 @@ Index: ocsync-0.70.3/src/csync_config.c
#include "csync_misc.h"
#define CSYNC_LOG_CATEGORY_NAME "csync.config"
-@@ -75,9 +75,47 @@
+@@ -75,8 +74,47 @@
return re;
}
--int csync_config_load(CSYNC *ctx, const char *config) {
-- dictionary *dict;
+static int csync_config_handle(void *user_data, const char *section,
+ const char *name, const char *value) {
+ CSYNC *ctx = (CSYNC *)user_data;
@@ -103,7 +101,7 @@ Index: ocsync-0.70.3/src/csync_config.c
+ ctx->options.max_depth = atoi(value);
+ return 1;
+ }
-
++
+ if (strcmp(name, "max_time_difference") == 0) {
+ ctx->options.max_time_difference = atoi(value);
+ return 1;
@@ -131,11 +129,12 @@ Index: ocsync-0.70.3/src/csync_config.c
+ return 1;
+}
+
-+int csync_config_load(CSYNC *ctx, const char *config) {
+ int csync_config_load(CSYNC *ctx, const char *config) {
+- dictionary *dict;
+
/* copy default config, if no config exists */
if (! c_isfile(config)) {
- /* check if there is still one csync.conf left over in $HOME/.csync
-@@ -125,27 +163,21 @@
+@@ -125,31 +163,26 @@
}
}
@@ -152,26 +151,30 @@ Index: ocsync-0.70.3/src/csync_config.c
- ctx->options.max_depth = iniparser_getint(dict, "global:max_depth", MAX_DEPTH);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Config: max_depth = %d",
ctx->options.max_depth);
--
+
- ctx->options.max_time_difference = iniparser_getint(dict,
- "global:max_time_difference", MAX_TIME_DIFFERENCE);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Config: max_time_difference = %d",
ctx->options.max_time_difference);
--
+
- ctx->options.sync_symbolic_links = iniparser_getboolean(dict,
- "global:sync_symbolic_links", 0);
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Config: sync_symbolic_links = %d",
ctx->options.sync_symbolic_links);
+- ctx->options.timeout = iniparser_getint(dict, "global:timeout", 0);
+ CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Config: timeout = %d",
+ ctx->options.timeout);
+
- iniparser_freedict(dict);
-
return 0;
}
-Index: ocsync-0.70.3/src/ini.c
+Index: ocsync/src/ini.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ocsync-0.70.3/src/ini.c 2013-01-30 22:26:22.543273581 +0100
++++ ocsync/src/ini.c 2013-03-05 05:03:53.748452609 +0100
@@ -0,0 +1,149 @@
+/* inih -- simple .INI file parser
+
@@ -322,10 +325,10 @@ Index: ocsync-0.70.3/src/ini.c
+ fclose(file);
+ return error;
+}
-Index: ocsync-0.70.3/src/ini.h
+Index: ocsync/src/ini.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ocsync-0.70.3/src/ini.h 2013-01-30 22:26:22.544273585 +0100
++++ ocsync/src/ini.h 2013-03-05 05:03:53.749452612 +0100
@@ -0,0 +1,55 @@
+/* inih -- simple .INI file parser
+
@@ -382,9 +385,9 @@ Index: ocsync-0.70.3/src/ini.h
+#endif
+
+#endif /* __INI_H__ */
-Index: ocsync-0.70.3/cmake/Modules/FindIniparser.cmake
+Index: ocsync/cmake/Modules/FindIniparser.cmake
===================================================================
---- ocsync-0.70.3.orig/cmake/Modules/FindIniparser.cmake 2013-01-30 22:26:22.552273610 +0100
+--- ocsync.orig/cmake/Modules/FindIniparser.cmake 2013-03-05 05:03:53.752452622 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-# - Try to find Iniparser
--
ocsync.git
More information about the Pkg-owncloud-commits
mailing list