OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 10-Jan-2009 11:11:26 Branch: HEAD Handle: 2009011010112600 Modified files: openpkg-src/csync csync.patch csync.spec Log: upgrading package: csync 0.41.95 -> 0.41.97 Summary: Revision Changes Path 1.4 +14 -14 openpkg-src/csync/csync.patch 1.4 +4 -3 openpkg-src/csync/csync.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/csync/csync.patch ============================================================================ $ cvs diff -u -r1.3 -r1.4 csync.patch --- openpkg-src/csync/csync.patch 26 Sep 2008 16:23:33 -0000 1.3 +++ openpkg-src/csync/csync.patch 10 Jan 2009 10:11:26 -0000 1.4 @@ -1,6 +1,6 @@ Index: client/CMakeLists.txt ---- client/CMakeLists.txt.orig 2008-09-10 11:35:13 +0200 -+++ client/CMakeLists.txt 2008-09-25 17:58:44 +0200 +--- 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} @@ -10,8 +10,8 @@ set(client_SRCS Index: cmake/Modules/DefineCompilerFlags.cmake ---- cmake/Modules/DefineCompilerFlags.cmake.orig 2008-09-10 11:35:13 +0200 -+++ cmake/Modules/DefineCompilerFlags.cmake 2008-09-25 17:59:03 +0200 +--- 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") @@ -30,8 +30,8 @@ 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-09-10 11:35:13 +0200 -+++ cmake/Modules/FindDlfcn.cmake 2008-09-25 17:58:44 +0200 +--- 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) @@ -45,8 +45,8 @@ if (DLFCN_FOUND) if (NOT Dlfcn_FIND_QUIETLY) Index: cmake/Modules/FindRT.cmake ---- cmake/Modules/FindRT.cmake.orig 2008-09-10 11:35:13 +0200 -+++ cmake/Modules/FindRT.cmake 2008-09-25 17:58:44 +0200 +--- 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) @@ -60,24 +60,24 @@ if (RT_FOUND) if (NOT RT_FIND_QUIETLY) Index: src/csync_propagate.c ---- src/csync_propagate.c.orig 2008-09-10 11:35:12 +0200 -+++ src/csync_propagate.c 2008-09-25 17:58:44 +0200 +--- 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 == getuid() || geteuid() == 0) { + if (st->uid == ctx->pwd.uid || ctx->pwd.euid == 0) { flags |= O_NOATIME; } +#endif - sfp = csync_vio_open(ctx, suri, O_RDONLY|O_NOFOLLOW, 0); + 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-09-10 11:35:12 +0200 -+++ src/std/c_file.c 2008-09-25 17:58:44 +0200 +--- 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; @@ . patch -p0 <<'@@ .' Index: openpkg-src/csync/csync.spec ============================================================================ $ cvs diff -u -r1.3 -r1.4 csync.spec --- openpkg-src/csync/csync.spec 26 Sep 2008 16:23:33 -0000 1.3 +++ openpkg-src/csync/csync.spec 10 Jan 2009 10:11:26 -0000 1.4 @@ -31,8 +31,8 @@ Class: EVAL Group: Filesystem License: GPL -Version: 0.41.95 -Release: 20080926 +Version: 0.41.97 +Release: 20090110 # list of sources Source0: http://www.csync.org/files/csync-%{version}.tar.gz @@ -54,7 +54,7 @@ %track prog csync = { version = %{version} - url = http://www.csync.org/get-it/ + url = http://www.csync.org/files/ regex = csync-(__VER__)\.tar\.gz } @@ -89,6 +89,7 @@ ) || exit $? strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/csync + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/libexec/csync mv $RPM_BUILD_ROOT%{l_prefix}/bin/csync \ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
