head	1.4;
access;
symbols;
locks; strict;
comment	@# @;


1.4
date	2009.01.10.10.11.26;	author rse;	state Exp;
branches;
next	1.3;
commitid	Heb4lATGoHMXcTxt;

1.3
date	2008.09.26.16.23.33;	author rse;	state Exp;
branches;
next	1.2;
commitid	ciuSGPgb3OkSFikt;

1.2
date	2008.09.22.06.55.51;	author rse;	state Exp;
branches;
next	1.1;
commitid	2Xvy0ui1Op75FJjt;

1.1
date	2008.09.21.17.41.53;	author rse;	state Exp;
branches;
next	;
commitid	GxhiW2pCNmPHgFjt;


desc
@@


1.4
log
@upgrading package: csync 0.41.95 -> 0.41.97
@
text
@Index: client/CMakeLists.txt
--- client/CMakeLists.txt.orig	2008-12-30 10:52:43 +0100
+++ client/CMakeLists.txt	2009-01-10 11:08:04 +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	2008-12-30 10:52:43 +0100
+++ cmake/Modules/DefineCompilerFlags.cmake	2009-01-10 11:08:04 +0100
@@@@ -31,15 +31,9 @@@@
     )
   endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
 
-  string(REGEX REPLACE "[\r\n]" " " ${_lfs_CFLAGS} "${${_lfs_CFLAGS}}")
+  string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
 
   add_definitions(${_lfs_CFLAGS})
-  add_definitions(-Wall -Wextra -Wmissing-prototypes -Wdeclaration-after-statement -Wunused)
-
-  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)
Index: cmake/Modules/FindDlfcn.cmake
--- cmake/Modules/FindDlfcn.cmake.orig	2008-12-30 10:52:43 +0100
+++ cmake/Modules/FindDlfcn.cmake	2009-01-10 11:08:04 +0100
@@@@ -53,9 +53,9 @@@@
     )
   endif (DL_FOUND)
 
-  if (DLFCN_INCLUDE_DIRS AND DLFCN_LIBRARIES)
+  if (DLFCN_INCLUDE_DIRS OR DLFCN_LIBRARIES)
      set(DLFCN_FOUND TRUE)
-  endif (DLFCN_INCLUDE_DIRS AND DLFCN_LIBRARIES)
+  endif (DLFCN_INCLUDE_DIRS OR DLFCN_LIBRARIES)
 
   if (DLFCN_FOUND)
     if (NOT Dlfcn_FIND_QUIETLY)
Index: cmake/Modules/FindRT.cmake
--- cmake/Modules/FindRT.cmake.orig	2008-12-30 10:52:43 +0100
+++ cmake/Modules/FindRT.cmake	2009-01-10 11:08:04 +0100
@@@@ -53,9 +53,9 @@@@
     )
   endif (RT_FOUND)
 
-  if (RT_INCLUDE_DIRS AND RT_LIBRARIES)
+  if (RT_INCLUDE_DIRS OR RT_LIBRARIES)
      set(RT_FOUND TRUE)
-  endif (RT_INCLUDE_DIRS AND RT_LIBRARIES)
+  endif (RT_INCLUDE_DIRS OR RT_LIBRARIES)
 
   if (RT_FOUND)
     if (NOT RT_FIND_QUIETLY)
Index: src/csync_propagate.c
--- src/csync_propagate.c.orig	2008-12-30 10:52:43 +0100
+++ src/csync_propagate.c	2009-01-10 11:08:39 +0100
@@@@ -103,10 +103,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	2008-12-30 10:52:43 +0100
+++ src/std/c_file.c	2009-01-10 11:08:04 +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;
     }
@


1.3
log
@upgrading package: csync 0.41.93 -> 0.41.95
@
text
@d2 2
a3 2
--- client/CMakeLists.txt.orig	2008-09-10 11:35:13 +0200
+++ client/CMakeLists.txt	2008-09-25 17:58:44 +0200
d13 2
a14 2
--- cmake/Modules/DefineCompilerFlags.cmake.orig	2008-09-10 11:35:13 +0200
+++ cmake/Modules/DefineCompilerFlags.cmake	2008-09-25 17:59:03 +0200
d33 2
a34 2
--- cmake/Modules/FindDlfcn.cmake.orig	2008-09-10 11:35:13 +0200
+++ cmake/Modules/FindDlfcn.cmake	2008-09-25 17:58:44 +0200
d48 2
a49 2
--- cmake/Modules/FindRT.cmake.orig	2008-09-10 11:35:13 +0200
+++ cmake/Modules/FindRT.cmake	2008-09-25 17:58:44 +0200
d63 2
a64 2
--- src/csync_propagate.c.orig	2008-09-10 11:35:12 +0200
+++ src/csync_propagate.c	2008-09-25 17:58:44 +0200
d71 1
a71 1
   if (st->uid == getuid() || geteuid() == 0) {
d75 1
a75 1
   sfp = csync_vio_open(ctx, suri, O_RDONLY|O_NOFOLLOW, 0);
d79 2
a80 2
--- src/std/c_file.c.orig	2008-09-10 11:35:12 +0200
+++ src/std/c_file.c	2008-09-25 17:58:44 +0200
@


1.2
log
@upgrading package: csync 0.41.92 -> 0.41.93
@
text
@d2 2
a3 2
--- client/CMakeLists.txt.orig	2008-06-25 14:51:27 +0200
+++ client/CMakeLists.txt	2008-09-22 08:51:40 +0200
d13 2
a14 2
--- cmake/Modules/DefineCompilerFlags.cmake.orig	2008-06-25 14:51:27 +0200
+++ cmake/Modules/DefineCompilerFlags.cmake	2008-09-22 08:51:40 +0200
d23 1
a23 1
-  add_definitions(-Wall -W -Wmissing-prototypes -Wdeclaration-after-statement -Wreturn-type -Wunused)
d33 2
a34 2
--- cmake/Modules/FindDlfcn.cmake.orig	2008-06-25 14:51:27 +0200
+++ cmake/Modules/FindDlfcn.cmake	2008-09-22 08:51:40 +0200
d48 2
a49 2
--- cmake/Modules/FindRT.cmake.orig	2008-06-25 14:51:27 +0200
+++ cmake/Modules/FindRT.cmake	2008-09-22 08:51:40 +0200
d63 3
a65 3
--- src/csync_propagate.c.orig	2008-06-25 14:51:27 +0200
+++ src/csync_propagate.c	2008-09-22 08:52:33 +0200
@@@@ -102,10 +102,12 @@@@
d79 2
a80 2
--- src/std/c_file.c.orig	2008-06-25 14:51:27 +0200
+++ src/std/c_file.c	2008-09-22 08:51:40 +0200
@


1.1
log
@new package: csync 0.41.92 (Bidirectional Filesystem Synchronisation)
@
text
@d2 2
a3 2
--- client/CMakeLists.txt.orig	2008-06-16 14:20:06 +0200
+++ client/CMakeLists.txt	2008-09-21 19:40:13 +0200
d13 2
a14 2
--- cmake/Modules/DefineCompilerFlags.cmake.orig	2008-06-16 14:20:06 +0200
+++ cmake/Modules/DefineCompilerFlags.cmake	2008-09-21 19:40:13 +0200
d33 2
a34 2
--- cmake/Modules/FindDlfcn.cmake.orig	2008-06-16 14:20:06 +0200
+++ cmake/Modules/FindDlfcn.cmake	2008-09-21 19:40:13 +0200
d48 2
a49 2
--- cmake/Modules/FindRT.cmake.orig	2008-06-16 14:20:06 +0200
+++ cmake/Modules/FindRT.cmake	2008-09-21 19:40:13 +0200
d63 3
a65 4
--- src/csync_propagate.c.orig	2008-06-16 14:20:06 +0200
+++ src/csync_propagate.c	2008-09-21 19:40:13 +0200
@@@@ -100,7 +100,11 @@@@
 
d68 1
d70 4
a73 3
   sfp = csync_vio_open(ctx, suri, O_RDONLY|O_NOFOLLOW|O_NOATIME, 0);
+#else
+  sfp = csync_vio_open(ctx, suri, O_RDONLY|O_NOFOLLOW, 0);
d75 1
a77 1
       rc = -1;
d79 2
a80 2
--- src/std/c_file.c.orig	2008-06-16 14:20:06 +0200
+++ src/std/c_file.c	2008-09-21 19:40:13 +0200
@