svn commit: r404224 - in head/net/rsync: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Tue Dec 22 10:09:20 UTC 2015
Author: ehaupt
Date: Tue Dec 22 10:09:19 2015
New Revision: 404224
URL: https://svnweb.freebsd.org/changeset/ports/404224
Log:
Restore SIGINFO patch with new rsync version.
Notified by: des
Added:
head/net/rsync/files/patch-siginfo
- copied, changed from r404223, head/net/rsync/files/extrapatch-siginfo
Deleted:
head/net/rsync/files/extrapatch-siginfo
Modified:
head/net/rsync/Makefile
Modified: head/net/rsync/Makefile
==============================================================================
--- head/net/rsync/Makefile Tue Dec 22 08:46:33 2015 (r404223)
+++ head/net/rsync/Makefile Tue Dec 22 10:09:19 2015 (r404224)
@@ -4,6 +4,7 @@
PORTNAME= rsync
PORTVERSION= 3.1.2
CATEGORIES= net ipv6
+PORTREVISION= 1
MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \
ftp://ftp.samba.org/pub/rsync/ \
ftp://ftp.sunet.se/pub/unix/admin/rsync/ \
@@ -35,7 +36,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 SIGINFO
+OPTIONS_DEFINE= DOCS POPT_PORT ZLIB_BASE SSH ICONV
OPTIONS_RADIO= PTS
OPTIONS_RADIO_PTS= TIMELIMIT RENAMED FLAGS ATIMES ACL
@@ -46,7 +47,6 @@ 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
@@ -64,7 +64,6 @@ 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
Copied and modified: head/net/rsync/files/patch-siginfo (from r404223, head/net/rsync/files/extrapatch-siginfo)
==============================================================================
--- head/net/rsync/files/extrapatch-siginfo Tue Dec 22 08:46:33 2015 (r404223, copy source)
+++ head/net/rsync/files/patch-siginfo Tue Dec 22 10:09:19 2015 (r404224)
@@ -2,31 +2,31 @@ diff --git a/main.c b/main.c
index 4613c96..3d47f3a 100644
--- a/main.c
+++ b/main.c
-@@ -81,6 +81,7 @@
+@@ -76,6 +76,7 @@ extern size_t bwlimit_writemax;
extern unsigned int module_dirlen;
extern BOOL flist_receiving_enabled;
extern BOOL shutting_down;
+extern BOOL want_progress_now;
+ extern int backup_dir_len;
extern int basis_dir_cnt;
extern struct stats stats;
- extern char *stdout_format;
-@@ -1447,6 +1448,15 @@
+@@ -1439,6 +1440,15 @@ static void sigusr2_handler(UNUSED(int val))
_exit(0);
}
+#ifdef SIGINFO
-+static RETSIGTYPE siginfo_handler(UNUSED(int val))
++static void siginfo_handler(UNUSED(int val))
+{
+
-+ if (!am_server)
-+ want_progress_now = True;
++ if (!am_server)
++ want_progress_now = True;
+}
+#endif
+
- RETSIGTYPE remember_children(UNUSED(int val))
+ void remember_children(UNUSED(int val))
{
#ifdef WNOHANG
-@@ -1546,6 +1556,9 @@
+@@ -1538,6 +1548,9 @@ int main(int argc,char *argv[])
SIGACTMASK(SIGABRT, rsync_panic_handler);
SIGACTMASK(SIGBUS, rsync_panic_handler);
#endif
@@ -36,6 +36,7 @@ index 4613c96..3d47f3a 100644
starttime = time(NULL);
our_uid = MY_UID();
+diff --git a/receiver.c b/receiver.c
index 4ea4c09..1c255ef 100644
--- a/receiver.c
+++ b/receiver.c
More information about the svn-ports-head
mailing list