Commit graph

25 commits

Author SHA1 Message Date
Olivier Goffart
b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Andreas Schneider
9382a047ae cmake: Update FindNeon and add support for version checking. 2013-07-12 11:57:07 +02:00
Andreas Schneider
cccbb6699a cmake: Find SMBClient correctly. 2013-07-04 10:29:48 +02:00
Markus Goetz
639f1127b7 Move stuff to _util.c 2013-05-08 13:59:07 +02:00
Markus Goetz
52e2775292 Make PROPFIND cache external unit
and introduce a csync_owncloud.h
2013-05-08 13:12:01 +02:00
Olivier Goffart
e75f11b87a Use httpbf in owncloud 2013-01-29 16:23:28 +01:00
Klaas Freitag
404073fe7f Rename csync to ocsync to not collide with upstream csync. 2012-10-01 12:39:05 +02:00
Klaas Freitag
cbf259b482 ownCloud: Add neon include dir variable to the compile include dirs. 2012-05-04 12:07:20 +02:00
Dominik Schmidt
ac6e5ff4b9 CMake: Fix owncloud linkage against neon. 2012-05-04 12:04:13 +02:00
Dominik Schmidt
1fbba4f158 mingw: resolve name clashes in dummy module and link it against libcsync 2012-03-02 17:04:02 +01:00
Dominik Schmidt
f064dbcde4 Make libsmbclient optional 2012-03-02 17:02:59 +01:00
Klaas Freitag
5ba71bbf79 Change module link statement to link against LIBCSYNC.
For windows building, the whole csync lib instead of the C standards
only is needed. Not a big difference, so changed for all platforms.
2012-02-22 18:23:18 +01:00
Klaas Freitag
7c3544611b owncloud: Adopted to new owncloud scheme. 2012-02-22 18:23:18 +01:00
Andreas Schneider
f0f36120ad module: Build the webdav module. 2012-02-22 18:23:17 +01:00
Andreas Schneider
3df0eb527f Require at least libssh 0.4.0. 2010-02-15 11:55:48 +01:00
Andreas Schneider
d082c8479e Require at least version 0.3.3 of libssh. 2009-08-25 10:53:58 +02:00
Andreas Schneider
050b806dc8 Rename FindLibSSH. 2009-05-07 17:00:25 +02:00
Andreas Schneider
0634e0fdea Don't require a C++ compiler. 2009-03-18 10:55:14 +01:00
Andreas Schneider
6d20c8b4fc Install the modules to a version directory.
The directory version number is the soversion of the library.
2008-12-16 15:03:57 +01:00
Andreas Schneider
8b3b57734e Fix segfault in the modules if running in a pam module.
If csync is running in a pam module and the module isn't linked
against the cstdlib, the module segfaults.
2008-09-09 15:07:37 +02:00
Andreas Schneider
959911fa32 Only build the sftp module if libssh is found. 2008-09-04 16:08:50 +02:00
Andreas Schneider
4b03d4ff78 Linking against the stdlib isn't needed. 2008-08-08 15:58:18 +02:00
Andreas Schneider
ecf1027a54 This is a start for a sftp module. 2008-08-06 18:16:54 +02:00
Andreas Schneider
e6f4a4cf4b Add a module dummy for testing. 2008-05-09 10:56:38 +02:00
Andreas Schneider
ab39159607 Add virtual IO plugin system.
This is the initial commit of the vio plugin system. The idea is based on
gnomevfs.
2008-04-07 17:16:41 +02:00