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: 12-Mar-2008 17:26:13
Branch: HEAD Handle: 2008031216261100
Modified files:
openpkg-src/rsync rsync.patch rsync.spec
Log:
use miniperl instead of requireing perl (which is not allowed as rsync
is CORE); add with_iconv option for the --iconv functionality
Summary:
Revision Changes Path
1.26 +27 -7 openpkg-src/rsync/rsync.patch
1.93 +19 -4 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.patch
============================================================================
$ cvs diff -u -r1.25 -r1.26 rsync.patch
--- openpkg-src/rsync/rsync.patch 2 Mar 2008 19:52:48 -0000 1.25
+++ openpkg-src/rsync/rsync.patch 12 Mar 2008 16:26:11 -0000 1.26
@@ -1,7 +1,27 @@
+Index: Makefile.in
+--- Makefile.in.orig 2008-02-13 02:29:09 +0100
++++ Makefile.in 2008-03-12 17:12:05 +0100
+@@ -13,6 +13,7 @@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
++PERL=perl
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+@@ -147,7 +148,7 @@
+ @echo ' ' >/dev/null
+
+ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
+- perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
++ $(PERL) $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
+
+ man: rsync.1 rsyncd.conf.5
+
Index: compat.c
---- compat.c.orig 2006-04-26 01:51:12 +0200
-+++ compat.c 2006-11-08 09:09:06 +0100
-@@ -54,19 +54,21 @@
+--- compat.c.orig 2008-03-01 21:01:41 +0100
++++ compat.c 2008-03-12 17:10:21 +0100
+@@ -161,19 +161,21 @@
rprintf(FINFO, "(%s) Protocol versions: remote=%d,
negotiated=%d\n",
am_server? "Server" : "Client", remote_protocol,
protocol_version);
}
@@ -31,9 +51,9 @@
}
if (protocol_version > PROTOCOL_VERSION) {
Index: rsync.h
---- rsync.h.orig 2006-10-24 05:31:30 +0200
-+++ rsync.h 2006-11-08 09:09:06 +0100
-@@ -86,9 +86,12 @@
+--- rsync.h.orig 2008-03-01 21:12:04 +0100
++++ rsync.h 2008-03-12 17:10:21 +0100
+@@ -113,9 +113,12 @@
* unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
* MAX_PROTOCOL_VERSION. */
@@ -47,5 +67,5 @@
+#define OLD_CLIENT_PROTOCOL_VERSION 27
+#define MAX_CLIENT_PROTOCOL_VERSION 40
- #define RSYNC_PORT 873
+ #define FILECNT_LOOKAHEAD 1000
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.92 -r1.93 rsync.spec
--- openpkg-src/rsync/rsync.spec 7 Mar 2008 17:41:24 -0000 1.92
+++ openpkg-src/rsync/rsync.spec 12 Mar 2008 16:26:11 -0000 1.93
@@ -32,7 +32,10 @@
Group: Filesystem
License: GPL
Version: 3.0.0
-Release: 20080307
+Release: 20080312
+
+# package options
+%option with_iconv no
# list of sources
Source0: http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
@@ -45,6 +48,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
+%if "%{with_iconv}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
AutoReq: no
AutoReqProv: no
@@ -73,19 +80,27 @@
%build
# configure vendor sources
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
GREP="grep" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+ --with-rsync-path="rsync" \
--with-rsyncd-conf=%{l_prefix}/etc/rsync/rsync.conf \
--disable-debug \
--disable-locale \
+%if "%{with_iconv}" == "yes"
+ --enable-iconv \
+%else
+ --disable-iconv \
+%endif
--with-included-popt \
- --with-rsh=ssh
+ --with-rsh="ssh"
# build vendor sources
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags -O} PERL="%{l_miniperl}"
%install
# perform vendor installation
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
