You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.0 KiB
68 lines
2.0 KiB
Index: client/CMakeLists.txt |
|
--- client/CMakeLists.txt.orig 2010-02-15 12:38:31.000000000 +0100 |
|
+++ client/CMakeLists.txt 2010-02-16 08:54:09.000000000 +0100 |
|
@@ -19,6 +19,7 @@ |
|
set(CLIENT_LINK_LIBRARIES |
|
${CLIENT_EXECUTABLE} |
|
${CSYNC_LIBRARY} |
|
+ ${CLIENT_LINK_LIBRARIES} |
|
) |
|
|
|
set(client_SRCS |
|
Index: cmake/Modules/DefineCompilerFlags.cmake |
|
--- cmake/Modules/DefineCompilerFlags.cmake.orig 2010-02-15 12:38:32.000000000 +0100 |
|
+++ cmake/Modules/DefineCompilerFlags.cmake 2010-02-16 08:54:38.000000000 +0100 |
|
@@ -38,11 +38,6 @@ |
|
add_definitions(${_lfs_CFLAGS}) |
|
endif (CMAKE_SIZEOF_VOID_P MATCHES "8") |
|
|
|
- check_c_compiler_flag("-fstack-protector" WITH_STACK_PROTECTOR) |
|
- if (WITH_STACK_PROTECTOR) |
|
- add_definitions(-fstack-protector) |
|
- endif (WITH_STACK_PROTECTOR) |
|
- |
|
check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) |
|
if (WITH_FORTIFY_SOURCE) |
|
add_definitions(-D_FORTIFY_SOURCE=2) |
|
Index: src/csync_propagate.c |
|
--- src/csync_propagate.c.orig 2010-02-15 12:38:32.000000000 +0100 |
|
+++ src/csync_propagate.c 2010-02-16 08:54:09.000000000 +0100 |
|
@@ -101,10 +101,12 @@ |
|
/* Open the source file */ |
|
ctx->replica = srep; |
|
flags = O_RDONLY|O_NOFOLLOW; |
|
+#if defined(O_NOATIME) |
|
/* O_NOATIME can only be set by the owner of the file or the superuser */ |
|
if (st->uid == ctx->pwd.uid || ctx->pwd.euid == 0) { |
|
flags |= O_NOATIME; |
|
} |
|
+#endif |
|
sfp = csync_vio_open(ctx, suri, flags, 0); |
|
if (sfp == NULL) { |
|
if (errno == ENOMEM) { |
|
Index: src/std/c_file.c |
|
--- src/std/c_file.c.orig 2010-02-15 12:38:32.000000000 +0100 |
|
+++ src/std/c_file.c 2010-02-16 08:54:09.000000000 +0100 |
|
@@ -93,14 +93,22 @@ |
|
/* done */ |
|
break; |
|
} else if (bread < 0) { |
|
+#if defined(EIO) && !defined(ENODATA) |
|
+ errno = EIO; |
|
+#else |
|
errno = ENODATA; |
|
+#endif |
|
rc = -1; |
|
goto out; |
|
} |
|
|
|
bwritten = write(dstfd, buf, bread); |
|
if (bwritten < 0) { |
|
+#if defined(EIO) && !defined(ENODATA) |
|
+ errno = EIO; |
|
+#else |
|
errno = ENODATA; |
|
+#endif |
|
rc = -1; |
|
goto out; |
|
}
|
|
|