[Midnightbsd-cvs] CVS Commit: net/rsync: Update rsync to 2.6.9
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 14 18:01:57 EDT 2007
Log Message:
-----------
Update rsync to 2.6.9
Modified Files:
--------------
mports/net/rsync:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
Added Files:
-----------
mports/net/rsync/files:
extra-patches-acls.diff (r1.1)
Removed Files:
-------------
mports/net/rsync/files:
patch-2.6.8-unexpected_tag_3
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/rsync/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lnet/rsync/Makefile -Lnet/rsync/Makefile -u -r1.2 -r1.3
--- net/rsync/Makefile
+++ net/rsync/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= rsync
-PORTVERSION= 2.6.8
-PORTREVISION= 2
+PORTVERSION= 2.6.9
CATEGORIES= net ipv6
MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \
ftp://ftp.samba.org/pub/%SUBDIR%/ \
@@ -26,7 +25,8 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug --enable-ipv6 \
- --with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf
+ --with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf \
+ --mandir=${PREFIX}/man
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.0
PATCH_STRIP= -p1
@@ -39,31 +39,35 @@
OPTIONS= POPT_PORT "Use popt from devel/popt instead of bundled one" off \
TIMELIMIT "Time limit patch" on \
- FLAGS "File system flags support patch, adds --flags" on \
- ACLS "ACL support patch, adds --acls" on \
+ FLAGS "File system flags support patch, adds --flags" off \
+ ACLS "ACL support patch, adds --acls" off \
SSH "Use SSH instead of RSH" on
.include <bsd.port.pre.mk>
.if defined(WITH_POPT_PORT)
LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
.else
CONFIGURE_ARGS+= --with-included-popt
.endif
-.if !defined(WITHOUT_TIMELIMIT)
+.if defined(WITH_TIMELIMIT)
EXTRA_PATCHES+= ${WRKSRC}/patches/time-limit.diff
.endif
-.if !defined(WITHOUT_FLAGS)
+.if defined(WITH_FLAGS)
EXTRA_PATCHES+= ${WRKSRC}/patches/flags.diff
.endif
-.if !defined(WITHOUT_ACLS)
-EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff
+.if defined(WITH_ACLS)
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patches-acls.diff ${WRKSRC}/patches/acls.diff
CONFIGURE_ARGS+=--enable-acl-support
+
+.if defined(WITH_FLAGS)
+IGNORE= can't be buld: Flags and ACL patches can not be enabled at the same time.
+.endif
.endif
.if defined(WITHOUT_SSH)
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/rsync/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lnet/rsync/distinfo -Lnet/rsync/distinfo -u -r1.1 -r1.2
--- net/rsync/distinfo
+++ net/rsync/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsync-2.6.8.tar.gz) = 082a9dba1f741e6591e5cd748a1233de
-SHA256 (rsync-2.6.8.tar.gz) = 784782de0efee0b4624bdd1d75d524ef95d16354cb13cbb5449d990b61e607a6
-SIZE (rsync-2.6.8.tar.gz) = 772314
+MD5 (rsync-2.6.9.tar.gz) = 996d8d8831dbca17910094e56dcb5942
+SHA256 (rsync-2.6.9.tar.gz) = ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
+SIZE (rsync-2.6.9.tar.gz) = 811841
--- /dev/null
+++ net/rsync/files/extra-patches-acls.diff
@@ -0,0 +1,26 @@
+--- strip/patches/acls.diff.orig Tue Nov 7 05:41:54 2006
++++ strip/patches/acls.diff Mon Apr 9 15:50:06 2007
+@@ -1399,7 +1399,7 @@
+ file->mode = tweak_mode(file->mode, chmod_modes);
+
+ +#ifdef SUPPORT_ACLS
+-+ if (preserve_acls) {
+++ if (preserve_acls && f >= 0) {
+ + sx.st.st_mode = file->mode;
+ + sx.acc_acl = sx.def_acl = NULL;
+ + if (get_acl(fname, &sx) < 0)
+@@ -1415,12 +1415,12 @@
+ flist->files[flist->count++] = file;
+ send_file_entry(file, f);
+ +#ifdef SUPPORT_ACLS
+-+ if (preserve_acls)
+++ if (preserve_acls && f >= 0)
+ + send_acl(&sx, f);
+ +#endif
+ + } else {
+ +#ifdef SUPPORT_ACLS
+-+ if (preserve_acls)
+++ if (preserve_acls && f >= 0)
+ + free_acl(&sx);
+ +#endif
+ }
--- net/rsync/files/patch-2.6.8-unexpected_tag_3
+++ /dev/null
@@ -1,98 +0,0 @@
-===================================================================
-RCS file: /cvsroot/rsync/io.c,v
-retrieving revision 1.195
-retrieving revision 1.196
-diff -u -r1.195 -r1.196
---- io.c 2006/05/03 06:32:59 1.195
-+++ io.c 2006/05/03 16:17:46 1.196
-@@ -282,10 +282,7 @@
- exit_cleanup(RERR_STREAMIO);
- }
- read_loop(fd, buf, len);
-- if (defer_forwarding_messages)
-- msg_list_add(&msg2sndr, MSG_DELETED, buf, len);
-- else
-- io_multiplex_write(MSG_DELETED, buf, len);
-+ send_msg(MSG_DELETED, buf, len);
- break;
- case MSG_SUCCESS:
- if (len != 4 || !am_generator) {
-@@ -295,10 +292,7 @@
- read_loop(fd, buf, len);
- if (remove_sent_files) {
- decrement_active_files(IVAL(buf,0));
-- if (defer_forwarding_messages)
-- msg_list_add(&msg2sndr, MSG_SUCCESS, buf, len);
-- else
-- io_multiplex_write(MSG_SUCCESS, buf, len);
-+ send_msg(MSG_SUCCESS, buf, len);
- }
- if (preserve_hard_links)
- flist_ndx_push(&hlink_list, IVAL(buf,0));
-@@ -318,10 +312,7 @@
- if (n >= sizeof buf)
- n = sizeof buf - 1;
- read_loop(fd, buf, n);
-- if (am_generator && am_server && defer_forwarding_messages)
-- msg_list_add(&msg2sndr, tag, buf, n);
-- else
-- rwrite((enum logcode)tag, buf, n);
-+ rwrite(tag, buf, n);
- len -= n;
- }
- break;
-@@ -395,14 +386,19 @@
- return 1;
- }
-
--void send_msg(enum msgcode code, char *buf, int len)
-+int send_msg(enum msgcode code, char *buf, int len)
- {
- if (msg_fd_out < 0) {
-- io_multiplex_write(code, buf, len);
-- return;
-+ if (!defer_forwarding_messages)
-+ return io_multiplex_write(code, buf, len);
-+ if (!io_multiplexing_out)
-+ return 0;
-+ msg_list_add(&msg2sndr, code, buf, len);
-+ return 1;
- }
- msg_list_add(&msg2genr, code, buf, len);
- msg2genr_flush(NORMAL_FLUSH);
-+ return 1;
- }
-
- int get_redo_num(int itemizing, enum logcode code)
-===================================================================
-RCS file: /cvsroot/rsync/log.c,v
-retrieving revision 1.147
-retrieving revision 1.148
-diff -u -r1.147 -r1.148
---- log.c 2006/05/03 06:11:11 1.147
-+++ log.c 2006/05/03 16:17:49 1.148
-@@ -256,7 +256,7 @@
-
- if (am_server) {
- /* Pass the message to the non-server side. */
-- if (io_multiplex_write((enum msgcode)code, buf, len))
-+ if (send_msg(code, buf, len))
- return;
- if (am_daemon) {
- /* TODO: can we send the error to the user somehow? */
-===================================================================
-RCS file: /cvsroot/rsync/proto.h,v
-retrieving revision 1.303
-retrieving revision 1.304
-diff -u -r1.303 -r1.304
---- proto.h 2006/05/03 00:48:17 1.303
-+++ proto.h 2006/05/03 16:17:42 1.304
-@@ -104,7 +104,7 @@
- void set_msg_fd_out(int fd);
- void increment_active_files(int ndx, int itemizing, enum logcode code);
- void decrement_active_files(int ndx);
--void send_msg(enum msgcode code, char *buf, int len);
-+int send_msg(enum msgcode code, char *buf, int len);
- int get_redo_num(int itemizing, enum logcode code);
- int get_hlink_num(void);
- void io_set_filesfrom_fds(int f_in, int f_out);
More information about the Midnightbsd-cvs
mailing list