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: 21-Sep-2008 19:41:53
Branch: HEAD Handle: 2008092118415300
Added files:
openpkg-src/csync csync.patch csync.spec
Log:
new package: csync 0.41.92 (Bidirectional Filesystem Synchronisation)
Summary:
Revision Changes Path
1.1 +102 -0 openpkg-src/csync/csync.patch
1.1 +110 -0 openpkg-src/csync/csync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/csync/csync.patch
============================================================================
$ cvs diff -u -r0 -r1.1 csync.patch
--- /dev/null 2008-09-21 19:39:59 +0200
+++ csync.patch 2008-09-21 19:41:53 +0200
@@ -0,0 +1,102 @@
+Index: client/CMakeLists.txt
+--- client/CMakeLists.txt.orig 2008-06-16 14:20:06 +0200
++++ client/CMakeLists.txt 2008-09-21 19:40:13 +0200
+@@ -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-06-16 14:20:06
+0200
++++ cmake/Modules/DefineCompilerFlags.cmake 2008-09-21 19:40:13 +0200
+@@ -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 -W -Wmissing-prototypes
-Wdeclaration-after-statement -Wreturn-type -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-06-16 14:20:06 +0200
++++ cmake/Modules/FindDlfcn.cmake 2008-09-21 19:40:13 +0200
+@@ -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-06-16 14:20:06 +0200
++++ cmake/Modules/FindRT.cmake 2008-09-21 19:40:13 +0200
+@@ -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-06-16 14:20:06 +0200
++++ src/csync_propagate.c 2008-09-21 19:40:13 +0200
+@@ -100,7 +100,11 @@
+
+ /* Open the source file */
+ ctx->replica = srep;
++#if defined(O_NOATIME)
+ 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);
++#endif
+ if (sfp == NULL) {
+ if (errno == ENOMEM) {
+ rc = -1;
+Index: src/std/c_file.c
+--- 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
+@@ -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;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/csync/csync.spec
============================================================================
$ cvs diff -u -r0 -r1.1 csync.spec
--- /dev/null 2008-09-21 19:39:59 +0200
+++ csync.spec 2008-09-21 19:41:53 +0200
@@ -0,0 +1,110 @@
+##
+## csync.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: csync
+Summary: Bidirectional Filesystem Synchronisation
+URL: http://www.csync.org/
+Vendor: Andreas Schneider
+Packager: OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class: EVAL
+Group: Filesystem
+License: GPL
+Version: 0.41.92
+Release: 20080921
+
+# list of sources
+Source0: http://www.csync.org/files/csync-%{version}.tar.gz
+Patch0: csync.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20060823, cmake
+PreReq: OpenPKG, openpkg >= 20060823
+BuildPreReq: log4c, check, sqlite, iniparser, libsmbclient, argp
+PreReq: log4c, check, sqlite, iniparser, libsmbclient, argp
+AutoReq: no
+AutoReqProv: no
+
+%description
+ csync is the most badly packaged program in the OpenPKG world.
+
+%track
+ prog csync = {
+ version = %{version}
+ url = http://www.csync.org/get-it/
+ regex = csync-(__VER__)\.tar\.gz
+ }
+
+%prep
+ %setup -q
+ %patch -p0
+
+%build
+ mkdir build
+ cd build
+ cmake \
+ -DCMAKE_BUILD_TYPE="Release" \
+ -DCMAKE_INSTALL_PREFIX="%{l_prefix}" \
+ -DINFO_INSTALL_DIR="%{l_prefix}/info" \
+ -DMAN_INSTALL_DIR="%{l_prefix}/info" \
+ -DLIBEXEC_INSTALL_DIR="%{l_prefix}/libexec/csync" \
+ -DLIB_INSTALL_DIR="%{l_prefix}/lib/csync" \
+ -DCMAKE_C_COMPILER="%{l_cc}" \
+ -DCMAKE_C_FLAGS="%{l_cflags} %{l_cppflags}" \
+ -DCMAKE_EXE_LINKER_FLAGS="%{l_ldflags}" \
+ -DCLIENT_LINK_LIBRARIES="%{l_prefix}/lib/libargp.a" \
+ -DCMAKE_CXX_COMPILER="%{l_cxx}" \
+ -DINIPARSER_INCLUDE_DIR="%{l_prefix}/include/iniparser/" \
+ -DINIPARSER_LIBRARY="%{l_prefix}/lib/libiniparser.a" \
+ ..
+ %{l_make} %{l_mflags}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+ ( cd build
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/csync
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/csync
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/csync \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/csync/
+ ( echo "#!/bin/sh"
+ echo "LD_LIBRARY_PATH=\"%{l_prefix}/lib/csync\""
+ echo "export LD_LIBRARY_PATH"
+ echo "exec %{l_prefix}/libexec/csync/csync \${1+\"[EMAIL PROTECTED]"}"
+ ) >$RPM_BUILD_ROOT%{l_prefix}/bin/csync
+ chmod a+x $RPM_BUILD_ROOT%{l_prefix}/bin/csync
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%config %{l_prefix}/etc/csync/*'
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
