./configure
make
-based-on: 5b19cf787515fc2388dd070a85e86ced5d80510b
+based-on: fe993ca94da3f7326ee6355d03ae54e9fa76f448
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
-@@ -25,6 +25,7 @@ aclocal.m4
+@@ -26,6 +26,7 @@ aclocal.m4
/getgroups
/gmon.out
/rsync
OBJS3=progress.o pipe.o
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
-@@ -76,10 +78,12 @@ install: all
+@@ -78,10 +80,12 @@ install: all
${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
${INSTALLCMD} -m 755 rsync-ssl ${DESTDIR}${bindir}
${INSTALLCMD} -m 755 ssl-rsh ${DESTDIR}${libdir}
if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
install-ssl-daemon: stunnel-rsyncd.conf
-@@ -97,6 +101,9 @@ install-strip:
+@@ -99,6 +103,9 @@ install-strip:
rsync$(EXEEXT): $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(OBJS): $(HEADERS)
$(CHECK_OBJS): $(HEADERS)
options.o: latest-year.h
-@@ -215,7 +222,7 @@ proto.h: proto.h-tstamp
- proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
+@@ -222,7 +229,7 @@ proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
awk -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
+ .PHONY: man
-man: rsync.1 rsync-ssl.1 rsyncd.conf.5
+man: rsync.1 rsync-ssl.1 rsyncd.conf.5 rsyncdb.1
- rsync.1: rsync.1.md md2man latest-year.h Makefile
+ rsync.1: rsync.1.md md2man NEWS.md Makefile
@$(srcdir)/maybe-make-man $(srcdir) rsync.1.md
-@@ -226,8 +233,11 @@ rsync-ssl.1: rsync-ssl.1.md md2man latest-year.h Makefile
- rsyncd.conf.5: rsyncd.conf.5.md md2man latest-year.h Makefile
+@@ -233,9 +240,12 @@ rsync-ssl.1: rsync-ssl.1.md md2man NEWS.md Makefile
+ rsyncd.conf.5: rsyncd.conf.5.md md2man NEWS.md Makefile
@$(srcdir)/maybe-make-man $(srcdir) rsyncd.conf.5.md
-+rsyncdb.1: rsyncdb.1.md md2man latest-year.h Makefile
++rsyncdb.1: rsyncdb.1.md md2man NEWS.md Makefile
+ @$(srcdir)/maybe-make-man $(srcdir) rsyncdb.1.md
+
+ .PHONY: clean
clean: cleantests
- rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
+ rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) rsyncdb$(EXEEXT) \
rounding rounding.h *.old
- cleantests:
+ .PHONY: cleantests
diff --git a/checksum.c b/checksum.c
--- a/checksum.c
+++ b/checksum.c