diff -u -r --new-file --exclude=CVS rsync-2.0.6/clientserver.c rsync-2.0.7/clientserver.c --- rsync-2.0.6/clientserver.c Sat May 16 00:10:47 1998 +++ rsync-2.0.7/clientserver.c Sat May 16 15:26:28 1998 @@ -110,6 +110,8 @@ char *host = client_name(fd); char *name = lp_name(i); int start_glob=0; + char *request=NULL; + extern int am_sender; if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { rprintf(FERROR,"rsync denied on module %s from %s (%s)\n", @@ -211,8 +213,7 @@ if (start_glob) { if (start_glob == 1) { - rprintf(FINFO,"rsync on %s from %s (%s)\n", - p, host, addr); + request = strdup(p); start_glob++; } glob_expand(name, argv, &argc, MAX_ARGS); @@ -230,6 +231,13 @@ } parse_arguments(argc, argv); + + if (request) { + rprintf(FINFO,"rsync %s %s from %s (%s)\n", + am_sender?"on":"to", + request, host, addr); + free(request); + } /* don't allow the logs to be flooded too fast */ if (verbose > 1) verbose = 1; diff -u -r --new-file --exclude=CVS rsync-2.0.6/cvs.log rsync-2.0.7/cvs.log --- rsync-2.0.6/cvs.log Sat May 16 10:57:44 1998 +++ rsync-2.0.7/cvs.log Sat May 16 15:38:44 1998 @@ -4048,3 +4048,160 @@ Log Message: preparing for release of 2.0.6 + +**************************************** +Date: Saturday May 16, 1998 @ 13:03 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv14255 + +Modified Files: + clientserver.c main.c +Log Message: + +- distinguish downloads and uploads in the syslog messages +- add stats on uploads in syslog + + + + +**************************************** +Date: Saturday May 16, 1998 @ 14:22 +Author: jht + +Update of /data/cvs/rsync/packaging +In directory samba:/tmp/cvs-serv4460/packaging + +Log Message: +Directory /data/cvs/rsync/packaging added to the repository + + + +**************************************** +Date: Saturday May 16, 1998 @ 14:22 +Author: jht + +Update of /data/cvs/rsync/packaging/redhat +In directory samba:/tmp/cvs-serv16665/redhat + +Log Message: +Directory /data/cvs/rsync/packaging/redhat added to the repository + + + +**************************************** +Date: Saturday May 16, 1998 @ 14:22 +Author: jht + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/tmp/cvs-serv20718/5.0 + +Log Message: +Directory /data/cvs/rsync/packaging/redhat/5.0 added to the repository + + + +**************************************** +Date: Saturday May 16, 1998 @ 14:23 +Author: jht + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/tmp/cvs-serv16240 + +Added Files: + rsync.spec +Log Message: +Spec file for building Red Hat RPM packages. + + + +**************************************** +Date: Saturday May 16, 1998 @ 15:24 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv26195 + +Modified Files: + main.c +Log Message: +- print the stats at the right place when uploading in the rsync + daemon +- update spec file + + + + +**************************************** +Date: Saturday May 16, 1998 @ 15:24 +Author: tridge + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/tmp/cvs-serv27709 + +Modified Files: + rsync.spec +Log Message: +- print the stats at the right place when uploading in the rsync + daemon +- update spec file + + + + +**************************************** +Date: Saturday May 16, 1998 @ 15:30 +Author: rsync-bugs + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/data/people/rsync-bugs/rsync/packaging/redhat/5.0 + +Added Files: + rsync.spec.tmpl +Log Message: +added a template file for the rsync spec file to enable automatic spec +generation + + + +**************************************** +Date: Saturday May 16, 1998 @ 15:35 +Author: rsync-bugs + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/data/people/rsync-bugs/rsync/packaging/redhat/5.0 + +Modified Files: + rsync.spec.tmpl +Log Message: +put only the ftp directory in the template file + + + + +**************************************** +Date: Saturday May 16, 1998 @ 15:38 +Author: rsync-bu + +Update of /data/cvs/rsync +In directory samba:/data/people/rsync-bugs/rsync + +Modified Files: + version.h +Log Message: +preparing for release of 2.0.7 + + +**************************************** +Date: Saturday May 16, 1998 @ 15:38 +Author: rsync-bu + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/data/people/rsync-bugs/rsync/packaging/redhat/5.0 + +Modified Files: + rsync.spec +Log Message: +preparing for release of 2.0.7 + diff -u -r --new-file --exclude=CVS rsync-2.0.6/main.c rsync-2.0.7/main.c --- rsync-2.0.6/main.c Fri May 15 20:57:36 1998 +++ rsync-2.0.7/main.c Sat May 16 15:26:28 1998 @@ -34,14 +34,15 @@ extern int am_sender; extern int am_daemon; - if (!verbose) return; - if (am_daemon) { rprintf(FINFO, "wrote %.0f bytes read %.0f bytes total size %.0f\n", (double)write_total(),(double)read_total(), (double)total_size); + if (f == -1 || !am_sender) return; } + if (!verbose) return; + if (am_server && am_sender) { write_longint(f,read_total()); write_longint(f,write_total()); @@ -225,32 +226,32 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) { - int pid; - int status=0; - int recv_pipe[2]; - extern int preserve_hard_links; - - if (preserve_hard_links) - init_hard_links(flist); - - if (pipe(recv_pipe) < 0) { - rprintf(FERROR,"pipe failed in do_recv\n"); - exit(1); - } + int pid; + int status=0; + int recv_pipe[2]; + extern int preserve_hard_links; + extern int am_daemon; + + if (preserve_hard_links) + init_hard_links(flist); + + if (pipe(recv_pipe) < 0) { + rprintf(FERROR,"pipe failed in do_recv\n"); + exit(1); + } - if ((pid=do_fork()) == 0) { - recv_files(f_in,flist,local_name,recv_pipe[1]); - if (verbose > 2) - rprintf(FINFO,"receiver read %ld\n",(long)read_total()); - exit_cleanup(0); - } + if ((pid=do_fork()) == 0) { + recv_files(f_in,flist,local_name,recv_pipe[1]); + if (am_daemon) report(-1); + exit_cleanup(0); + } - generate_files(f_out,flist,local_name,recv_pipe[0]); + generate_files(f_out,flist,local_name,recv_pipe[0]); - waitpid(pid, &status, 0); + waitpid(pid, &status, 0); - return status; + return status; } diff -u -r --new-file --exclude=CVS rsync-2.0.6/packaging/redhat/5.0/rsync.spec rsync-2.0.7/packaging/redhat/5.0/rsync.spec --- rsync-2.0.6/packaging/redhat/5.0/rsync.spec Thu Jan 1 10:00:00 1970 +++ rsync-2.0.7/packaging/redhat/5.0/rsync.spec Sat May 16 15:38:31 1998 @@ -0,0 +1,79 @@ +Summary: Program for efficient remote updates of files. +Name: rsync +Version: 2.0.7 +Release: 1 +Copyright: GPL +Group: Applications/Networking +Source: ftp://samba.anu.edu.au/pub/rsync/ +URL: http://samba.anu.edu.au/rsync/ +Packager: John H Terpstra +BuildRoot: /tmp/rsync + +%description +rsync is a replacement for rcp that has many more features. + +rsync uses the "rsync algorithm" which provides a very fast method for +bringing remote files into sync. It does this by sending just the +differences in the files across the link, without requiring that both +sets of files are present at one of the ends of the link beforehand. + +A technical report describing the rsync algorithm is included with +this package. + +%changelog +* Sat May 16 1998 John H Terpstra + Upgraded to Rsync 2.0.6 + -new feature anonymous rsync + +* Mon Apr 6 1998 Douglas N. Arnold + +Upgrade to rsync version 1.7.2. + +* Sun Mar 1 1998 Douglas N. Arnold + +Built 1.6.9-1 based on the 1.6.3-2 spec file of John A. Martin. +Changes from 1.6.3-2 packaging: added latex and dvips commands +to create tech_report.ps. + +* Mon Aug 25 1997 John A. Martin + +Built 1.6.3-2 after finding no rsync-1.6.3-1.src.rpm although there +was an ftp://ftp.redhat.com/pub/contrib/alpha/rsync-1.6.3-1.alpha.rpm +showing no packager nor signature but giving +"Source RPM: rsync-1.6.3-1.src.rpm". + +Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip +to '%build', removed '%prefix'. + +* Thu Apr 10 1997 Michael De La Rue + +rsync-1.6.2-1 packaged. (This entry by jam to credit Michael for the +previous package(s).) + +%prep +%setup + +%build +./configure --prefix=/usr +make CFLAGS=$RPM_OPT_FLAGS +strip rsync +latex tech_report +dvips tech_report -o + +%install +mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}} +install -m755 rsync $RPM_BUILD_ROOT/usr/bin +install -m644 rsync.1 $RPM_BUILD_ROOT/usr/man/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/man/man5 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%attr(-,root,root) /usr/bin/rsync +%attr(-,root,root) /usr/man/man1/rsync.1 +%attr(-,root,root) /usr/man/man5/rsyncd.conf.5 +%attr(-,root,root) %doc tech_report.ps +%attr(-,root,root) %doc tech_report.tex +%attr(-,root,root) %doc README +%attr(-,root,root) %doc COPYING diff -u -r --new-file --exclude=CVS rsync-2.0.6/packaging/redhat/5.0/rsync.spec.tmpl rsync-2.0.7/packaging/redhat/5.0/rsync.spec.tmpl --- rsync-2.0.6/packaging/redhat/5.0/rsync.spec.tmpl Thu Jan 1 10:00:00 1970 +++ rsync-2.0.7/packaging/redhat/5.0/rsync.spec.tmpl Sat May 16 15:35:25 1998 @@ -0,0 +1,79 @@ +Summary: Program for efficient remote updates of files. +Name: rsync +Version: PVERSION +Release: PRELEASE +Copyright: GPL +Group: Applications/Networking +Source: ftp://samba.anu.edu.au/pub/rsync/ +URL: http://samba.anu.edu.au/rsync/ +Packager: John H Terpstra +BuildRoot: /tmp/rsync + +%description +rsync is a replacement for rcp that has many more features. + +rsync uses the "rsync algorithm" which provides a very fast method for +bringing remote files into sync. It does this by sending just the +differences in the files across the link, without requiring that both +sets of files are present at one of the ends of the link beforehand. + +A technical report describing the rsync algorithm is included with +this package. + +%changelog +* Sat May 16 1998 John H Terpstra + Upgraded to Rsync 2.0.6 + -new feature anonymous rsync + +* Mon Apr 6 1998 Douglas N. Arnold + +Upgrade to rsync version 1.7.2. + +* Sun Mar 1 1998 Douglas N. Arnold + +Built 1.6.9-1 based on the 1.6.3-2 spec file of John A. Martin. +Changes from 1.6.3-2 packaging: added latex and dvips commands +to create tech_report.ps. + +* Mon Aug 25 1997 John A. Martin + +Built 1.6.3-2 after finding no rsync-1.6.3-1.src.rpm although there +was an ftp://ftp.redhat.com/pub/contrib/alpha/rsync-1.6.3-1.alpha.rpm +showing no packager nor signature but giving +"Source RPM: rsync-1.6.3-1.src.rpm". + +Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip +to '%build', removed '%prefix'. + +* Thu Apr 10 1997 Michael De La Rue + +rsync-1.6.2-1 packaged. (This entry by jam to credit Michael for the +previous package(s).) + +%prep +%setup + +%build +./configure --prefix=/usr +make CFLAGS=$RPM_OPT_FLAGS +strip rsync +latex tech_report +dvips tech_report -o + +%install +mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}} +install -m755 rsync $RPM_BUILD_ROOT/usr/bin +install -m644 rsync.1 $RPM_BUILD_ROOT/usr/man/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/man/man5 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%attr(-,root,root) /usr/bin/rsync +%attr(-,root,root) /usr/man/man1/rsync.1 +%attr(-,root,root) /usr/man/man5/rsyncd.conf.5 +%attr(-,root,root) %doc tech_report.ps +%attr(-,root,root) %doc tech_report.tex +%attr(-,root,root) %doc README +%attr(-,root,root) %doc COPYING diff -u -r --new-file --exclude=CVS rsync-2.0.6/version.h rsync-2.0.7/version.h --- rsync-2.0.6/version.h Sat May 16 10:57:35 1998 +++ rsync-2.0.7/version.h Sat May 16 15:38:29 1998 @@ -1 +1 @@ -#define VERSION "2.0.6" +#define VERSION "2.0.7"