Date: Tue, 22 Dec 2015 08:16:36 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404220 - in head/net/rsync: . files Message-ID: <201512220816.tBM8Ga0H006786@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Dec 22 08:16:36 2015 New Revision: 404220 URL: https://svnweb.freebsd.org/changeset/ports/404220 Log: - Update to 3.1.2 - The non-default ATIMES option is now broken. Add a description and leave Makefile glue intact to give interested parties the chance to follow up with a patch. - The popular SIGINFO patch does not apply anymore. Meanwhile, make it a non-default option and mark it broken in the description. Changelog: https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2-NEWS Added: head/net/rsync/files/extrapatch-siginfo - copied unchanged from r404219, head/net/rsync/files/patch-siginfo Deleted: head/net/rsync/files/patch-siginfo Modified: head/net/rsync/Makefile head/net/rsync/distinfo Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Tue Dec 22 08:12:22 2015 (r404219) +++ head/net/rsync/Makefile Tue Dec 22 08:16:36 2015 (r404220) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rsync -PORTVERSION= 3.1.1 -PORTREVISION= 4 +PORTVERSION= 3.1.2 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ ftp://ftp.samba.org/pub/rsync/ \ @@ -36,7 +35,7 @@ CONFIGURE_ARGS= --disable-debug --enable PORTDOCS= NEWS README csprotocol.txt tech_report.tex # define options -OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV +OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV SIGINFO OPTIONS_RADIO= PTS OPTIONS_RADIO_PTS= TIMELIMIT RENAMED FLAGS ATIMES ACL @@ -47,10 +46,11 @@ SSH_DESC= Use SSH instead of RSH # options provided by patch (mutually exclusive) PTS_DESC= Functionality provided by third party patches +SIGINFO_DESC= Show file name and progress following SIGINFO (BROKEN) TIMELIMIT_DESC= Time limit patch RENAMED_DESC= Add support for renamed file detection FLAGS_DESC= File system flags support patch, adds --fileflags -ATIMES_DESC= Preserve access times, adds --atimes +ATIMES_DESC= Preserve access times, adds --atimes (BROKEN) ACL_DESC= Add backward-compatibility for the --acls option # define default options @@ -64,6 +64,7 @@ FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/ RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff ACL_EXTRA_PATCHES= ${WRKSRC}/patches/acls.diff \ ${FILESDIR}/extrapatch-acl +SIGINFO_EXTRA_PATCHES= ${FILESDIR}/extrapatch-siginfo ICONV_USES= iconv ICONV_CPPFLAGS= -I${LOCALBASE}/include Modified: head/net/rsync/distinfo ============================================================================== --- head/net/rsync/distinfo Tue Dec 22 08:12:22 2015 (r404219) +++ head/net/rsync/distinfo Tue Dec 22 08:16:36 2015 (r404220) @@ -1,4 +1,4 @@ -SHA256 (rsync-3.1.1.tar.gz) = 7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621 -SIZE (rsync-3.1.1.tar.gz) = 890124 -SHA256 (rsync-patches-3.1.1.tar.gz) = 547ea4a37eb497050b37bda029dee4927436781e7b0e4eb207c2fad54d4a3246 -SIZE (rsync-patches-3.1.1.tar.gz) = 167954 +SHA256 (rsync-3.1.2.tar.gz) = ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 +SIZE (rsync-3.1.2.tar.gz) = 892724 +SHA256 (rsync-patches-3.1.2.tar.gz) = edeebe9f2532ae291ce43fb86c9d7aaf80ba4edfdad25dce6d42dc33286b2326 +SIZE (rsync-patches-3.1.2.tar.gz) = 174333 Copied: head/net/rsync/files/extrapatch-siginfo (from r404219, head/net/rsync/files/patch-siginfo) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/rsync/files/extrapatch-siginfo Tue Dec 22 08:16:36 2015 (r404220, copy of r404219, head/net/rsync/files/patch-siginfo) @@ -0,0 +1,62 @@ +diff --git a/main.c b/main.c +index 4613c96..3d47f3a 100644 +--- a/main.c ++++ b/main.c +@@ -81,6 +81,7 @@ + extern unsigned int module_dirlen; + extern BOOL flist_receiving_enabled; + extern BOOL shutting_down; ++extern BOOL want_progress_now; + extern int basis_dir_cnt; + extern struct stats stats; + extern char *stdout_format; +@@ -1447,6 +1448,15 @@ + _exit(0); + } + ++#ifdef SIGINFO ++static RETSIGTYPE siginfo_handler(UNUSED(int val)) ++{ ++ ++ if (!am_server) ++ want_progress_now = True; ++} ++#endif ++ + RETSIGTYPE remember_children(UNUSED(int val)) + { + #ifdef WNOHANG +@@ -1546,6 +1556,9 @@ + SIGACTMASK(SIGABRT, rsync_panic_handler); + SIGACTMASK(SIGBUS, rsync_panic_handler); + #endif ++#ifdef SIGINFO ++ SIGACTMASK(SIGINFO, siginfo_handler); ++#endif + + starttime = time(NULL); + our_uid = MY_UID(); +index 4ea4c09..1c255ef 100644 +--- a/receiver.c ++++ b/receiver.c +@@ -62,6 +62,8 @@ extern char sender_file_sum[MAX_DIGEST_LEN]; + extern struct file_list *cur_flist, *first_flist, *dir_flist; + extern filter_rule_list daemon_filter_list; + ++BOOL want_progress_now; ++ + static struct bitbag *delayed_bits = NULL; + static int phase = 0, redoing = 0; + static flist_ndx_list batch_redo_list; +@@ -302,6 +304,11 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, + while ((i = recv_token(f_in, &data)) != 0) { + if (INFO_GTE(PROGRESS, 1)) + show_progress(offset, total_size); ++ else if (want_progress_now) { ++ rprintf(FINFO, "%s\n", fname); ++ end_progress(offset); ++ } ++ want_progress_now = False; + + if (allowed_lull) + maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH | MSK_ACTIVE_RECEIVER);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512220816.tBM8Ga0H006786>