mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Restore SIGINFO patch with new rsync version.

Browse Source 
Notified by:	des
This commit is contained in:
Emanuel Haupt 2015-12-22 10:09:19 +00:00
parent 2b07aba507
commit 5b60da4f94
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=404224
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/rsync/Makefile
View File

@ -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-ipv6 \
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/fileflags.diff \
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

17
net/rsync/files/extrapatch-siginfo → net/rsync/files/patch-siginfo
View File

@ -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