The branch, master has been updated
via 6e962ac5 Eliminate .in for rsync-ssl.
from 991ab811 Turn nightly-rsync into a python script.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6e962ac51e3b3507d320a91c31685108266f636f
Author: Wayne Davison <wa...@opencoder.net>
Date: Wed Apr 22 14:53:06 2020 -0700
Eliminate .in for rsync-ssl.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 -
Makefile.in | 8 ++------
rsync-ssl.in => rsync-ssl | 4 +++-
3 files changed, 5 insertions(+), 8 deletions(-)
rename rsync-ssl.in => rsync-ssl (86%)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index f601caed..de495172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ aclocal.m4
/getgroups
/gmon.out
/rsync
-/rsync-ssl
/stunnel-rsyncd.conf
/shconfig
/testdir
diff --git a/Makefile.in b/Makefile.in
index 6ce3c74c..536be420 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,7 +63,7 @@ CHECK_OBJS=tls.o testrun.o getgroups.o getfsdev.o t_stub.o
t_unsafe.o trimslash.
$(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@
@OBJ_RESTORE@
-all: Makefile rsync$(EXEEXT) rsync-ssl stunnel-rsyncd.conf @MAKE_MAN@
+all: Makefile rsync$(EXEEXT) stunnel-rsyncd.conf @MAKE_MAN@
install: all
-${MKDIR_P} ${DESTDIR}${bindir}
@@ -192,10 +192,6 @@ Makefile: Makefile.in config.status configure.sh
config.h.in
fi \
fi
-rsync-ssl: $(srcdir)/rsync-ssl.in Makefile
- sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl
- @chmod +x rsync-ssl
-
stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in
>stunnel-rsyncd.conf
@@ -245,7 +241,7 @@ cleantests:
# the source directory.
distclean: clean
rm -f Makefile config.h config.status
- rm -f rsync-ssl stunnel-rsyncd.conf
+ rm -f stunnel-rsyncd.conf
rm -f lib/dummy popt/dummy zlib/dummy
rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status
rm -f $(srcdir)/lib/dummy $(srcdir)/popt/dummy $(srcdir)/zlib/dummy
diff --git a/rsync-ssl.in b/rsync-ssl
similarity index 86%
rename from rsync-ssl.in
rename to rsync-ssl
index 37865e1f..f3e365d7 100755
--- a/rsync-ssl.in
+++ b/rsync-ssl
@@ -17,4 +17,6 @@ case "$@" in
;;
esac
-exec @bindir@/rsync --rsh=@bindir@/rsync-ssl-rsh "${@}"
+mydir="${0%/*}"
+
+exec "$mydir/rsync" --rsh="$mydir/rsync-ssl-rsh" "${@}"
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
