- Update to 2.6.4

- Use new infrastructure for rc script
- Remove pkg-message, it's 4 years since the change

Approved by:	marcus (portmgr hat)

8 files changed, 5 insertions, 508 deletions

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 7ac45e1893cc..edb4fdd7aef3 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rsync
-PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTVERSION=	2.6.4
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
 		ftp://ftp.samba.org//pub/%SUBDIR%/ \
@@ -25,7 +24,7 @@ COMMENT=	A network file distribution/synchronization utility
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 .endif
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	rsyncd.sh
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
@@ -50,9 +49,7 @@ EXTRA_PATCHES+=	${WRKSRC}/patches/time-limit.diff
 
 .include <bsd.port.pre.mk>
 
-SED_SCRIPT+=	-e 's,%%NAME%%,rsyncd,g' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+SUB_LIST+=	NAME=rsyncd
 
 .if ${OSVERSION} < 400016
 WITHOUT_SSH?=	yes
@@ -84,23 +81,16 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
 
-post-build:
-	@${SED} ${SED_SCRIPT} <${FILESDIR}/rsyncd.sh >${WRKDIR}/rsyncd.sh
-
 post-install:
 	@${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/rsync
 	@${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${DESTDIR}${PREFIX}/etc/
 	@[ -f ${DESTDIR}${PREFIX}/etc/rsyncd.conf ] || \
 		${CP} ${DESTDIR}${PREFIX}/etc/rsyncd.conf.sample \
 		${DESTDIR}${PREFIX}/etc/rsyncd.conf
-	@${INSTALL_SCRIPT} ${WRKDIR}/rsyncd.sh ${DESTDIR}${PREFIX}/etc/rc.d/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DESTDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DESTDIR}${DOCSDIR}
 .endif
-.if !defined(WITHOUT_SSH)
-	@${CAT} ${PKGMESSAGE}
-.endif
 
 test: build
 	@cd ${WRKSRC} && ${MAKE} check
diff --git a/net/rsync/distinfo b/net/rsync/distinfo
index 128bb28923ac..6a0d53669da0 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,2 +1,2 @@
-MD5 (rsync-2.6.3.tar.gz) = 2beb30caafa69a01182e71c528fb0393
-SIZE (rsync-2.6.3.tar.gz) = 583453
+MD5 (rsync-2.6.4.tar.gz) = a26c454a36148e0e873bedf3c0cc955d
+SIZE (rsync-2.6.4.tar.gz) = 627680
diff --git a/net/rsync/files/patch-exclude.c b/net/rsync/files/patch-exclude.c
deleted file mode 100644
index e54eb21f8cf2..000000000000
--- a/net/rsync/files/patch-exclude.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Re-enable "!"s in .cvsignore files
-# https://bugzilla.samba.org/show_bug.cgi?id=1873
-#
---- exclude.c.orig	Wed Sep 22 06:11:15 2004
-+++ exclude.c	Wed Oct  6 19:04:55 2004
-@@ -235,8 +235,9 @@
- /* Get the next include/exclude arg from the string.  The token will not
-  * be '\0' terminated, so use the returned length to limit the string.
-  * Also, be sure to add this length to the returned pointer before passing
-- * it back to ask for the next token.  This routine parses the +/- prefixes
-- * and the "!" token unless xflags contains XFLG_WORDS_ONLY.  The *flag_ptr
-+ * it back to ask for the next token.  This routine parses the "!" (list-
-+ * clearing) token and (if xflags does NOT contain XFLG_WORDS_ONLY) the
-+ * +/- prefixes for overriding the include/exclude mode.  The *flag_ptr
-  * value will also be set to the MATCHFLG_* bits for the current token.
-  */
- static const char *get_exclude_tok(const char *p, unsigned int *len_ptr,
-@@ -273,7 +274,7 @@
- 	} else
- 		len = strlen(s);
- 
--	if (*p == '!' && len == 1 && !(xflags & XFLG_WORDS_ONLY))
-+	if (*p == '!' && len == 1)
- 		mflags |= MATCHFLG_CLEAR_LIST;
- 
- 	*len_ptr = len;
diff --git a/net/rsync/files/patch-mknod b/net/rsync/files/patch-mknod
deleted file mode 100644
index 0ea5bbd05a79..000000000000
--- a/net/rsync/files/patch-mknod
+++ /dev/null
@@ -1,443 +0,0 @@
-#
-# Copy FIFOs and sockets
-# https://bugzilla.samba.org/show_bug.cgi?id=1804
-#
---- Makefile.in	12 Aug 2004 18:59:03 -0000	1.104
-+++ Makefile.in	23 Sep 2004 06:22:00 -0000
-@@ -41,7 +41,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  po
- 	popt/popthelp.o popt/poptparse.o
- OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
- 
--TLS_OBJ = tls.o syscall.o lib/permstring.o
-+TLS_OBJ = tls.o syscall.o lib/compat.o lib/permstring.o
- 
- # Programs we must have to run the test cases
- CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
-@@ -83,7 +83,7 @@ getgroups$(EXEEXT): getgroups.o
- getfsdev$(EXEEXT): getfsdev.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
- 
--TRIMSLASH_OBJ = trimslash.o syscall.o
-+TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o
- trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
- 
---- backup.c	20 Sep 2004 19:46:45 -0000	1.38
-+++ backup.c	23 Sep 2004 06:22:00 -0000
-@@ -176,7 +176,6 @@ static int keep_backup(char *fname)
- 	if (!(buf = get_backup_name(fname)))
- 		return 0;
- 
--#ifdef HAVE_MKNOD
- 	/* Check to see if this is a device file, or link */
- 	if (IS_DEVICE(file->mode)) {
- 		if (am_root && preserve_devices) {
-@@ -194,7 +193,6 @@ static int keep_backup(char *fname)
- 		kept = 1;
- 		do_unlink(fname);
- 	}
--#endif
- 
- 	if (!kept && S_ISDIR(file->mode)) {
- 		/* make an empty directory */
---- config.h.in	2 Aug 2004 21:54:49 -0000	1.92
-+++ config.h.in	23 Sep 2004 06:22:00 -0000
-@@ -209,6 +209,9 @@
- /* Define if you have strct sockaddr_storage. */
- #undef HAVE_SOCKADDR_STORAGE
- 
-+/* Do we have sockaddr_un.sun_len? */
-+#undef HAVE_SOCKADDR_UN_LEN
-+
- /* */
- #undef HAVE_SOCKETPAIR
- 
-@@ -342,6 +345,12 @@
-    <sysmacros.h>. */
- #undef MAJOR_IN_SYSMACROS
- 
-+/* */
-+#undef MKNOD_CREATES_FIFOS
-+
-+/* */
-+#undef MKNOD_CREATES_SOCKETS
-+
- /* Define to the address where bug reports for this package should be sent. */
- #undef PACKAGE_BUGREPORT
- 
---- configure	21 Sep 2004 16:10:35 -0000	1.192
-+++ configure	23 Sep 2004 06:22:02 -0000
-@@ -8523,6 +8523,124 @@ _ACEOF
- fi
- 
- 
-+echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5
-+echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6
-+if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+
-+int
-+main ()
-+{
-+static struct sockaddr_un ac_aggr;
-+if (ac_aggr.sun_len)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_member_struct_sockaddr_un_sun_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+
-+int
-+main ()
-+{
-+static struct sockaddr_un ac_aggr;
-+if (sizeof ac_aggr.sun_len)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_member_struct_sockaddr_un_sun_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_member_struct_sockaddr_un_sun_len=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6
-+if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SOCKADDR_UN_LEN 1
-+_ACEOF
-+
-+fi
-+
-+
- echo "$as_me:$LINENO: checking struct sockaddr_storage" >&5
- echo $ECHO_N "checking struct sockaddr_storage... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10219,6 +10337,120 @@ _ACEOF
- 
- fi
- 
-+echo "$as_me:$LINENO: checking if mknod creates FIFOs" >&5
-+echo $ECHO_N "checking if mknod creates FIFOs... $ECHO_C" >&6
-+if test "${rsync_cv_MKNOD_CREATES_FIFOS+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "$cross_compiling" = yes; then
-+  rsync_cv_MKNOD_CREATES_FIFOS=cross
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+main() { int rc, ec; char *fn = "fifo-test";
-+unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);
-+if (rc) {printf("%d %d\n",rc,ec); return ec;}
-+return 0;}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  rsync_cv_MKNOD_CREATES_FIFOS=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+rsync_cv_MKNOD_CREATES_FIFOS=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $rsync_cv_MKNOD_CREATES_FIFOS" >&5
-+echo "${ECHO_T}$rsync_cv_MKNOD_CREATES_FIFOS" >&6
-+if test x"$rsync_cv_MKNOD_CREATES_FIFOS" = x"yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define MKNOD_CREATES_FIFOS 1
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking if mknod creates sockets" >&5
-+echo $ECHO_N "checking if mknod creates sockets... $ECHO_C" >&6
-+if test "${rsync_cv_MKNOD_CREATES_SOCKETS+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+if test "$cross_compiling" = yes; then
-+  rsync_cv_MKNOD_CREATES_SOCKETS=cross
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+main() { int rc, ec; char *fn = "sock-test";
-+unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);
-+if (rc) {printf("%d %d\n",rc,ec); return ec;}
-+return 0;}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  rsync_cv_MKNOD_CREATES_SOCKETS=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+rsync_cv_MKNOD_CREATES_SOCKETS=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $rsync_cv_MKNOD_CREATES_SOCKETS" >&5
-+echo "${ECHO_T}$rsync_cv_MKNOD_CREATES_SOCKETS" >&6
-+if test x"$rsync_cv_MKNOD_CREATES_SOCKETS" = x"yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define MKNOD_CREATES_SOCKETS 1
-+_ACEOF
-+
-+fi
-+
- #
- # The following test was mostly taken from the tcl/tk plus patches
- #
---- configure.in	21 Sep 2004 16:10:35 -0000	1.200
-+++ configure.in	23 Sep 2004 06:22:02 -0000
-@@ -409,6 +409,15 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_
- #include <netinet/in.h>
- ])
- 
-+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
-+		[ AC_DEFINE(HAVE_SOCKADDR_UN_LEN, 1, [Do we have sockaddr_un.sun_len?]) ],
-+		[],
-+		[
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+])
-+
- AC_MSG_CHECKING(struct sockaddr_storage)
- AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/socket.h>],
-@@ -625,6 +634,34 @@ if test x"$rsync_cv_REPLACE_INET_ATON" =
-     AC_DEFINE(REPLACE_INET_ATON, 1, [ ])
- fi
- 
-+AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[
-+AC_TRY_RUN([
-+#include <stdio.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+main() { int rc, ec; char *fn = "fifo-test";
-+unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);
-+if (rc) {printf("%d %d\n",rc,ec); return ec;}
-+return 0;}],
-+           rsync_cv_MKNOD_CREATES_FIFOS=yes,rsync_cv_MKNOD_CREATES_FIFOS=no,rsync_cv_MKNOD_CREATES_FIFOS=cross)])
-+if test x"$rsync_cv_MKNOD_CREATES_FIFOS" = x"yes"; then
-+    AC_DEFINE(MKNOD_CREATES_FIFOS, 1, [ ])
-+fi
-+
-+AC_CACHE_CHECK([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[
-+AC_TRY_RUN([
-+#include <stdio.h>
-+#include <sys/stat.h>
-+#include <errno.h>
-+main() { int rc, ec; char *fn = "sock-test";
-+unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);
-+if (rc) {printf("%d %d\n",rc,ec); return ec;}
-+return 0;}],
-+           rsync_cv_MKNOD_CREATES_SOCKETS=yes,rsync_cv_MKNOD_CREATES_SOCKETS=no,rsync_cv_MKNOD_CREATES_SOCKETS=cross)])
-+if test x"$rsync_cv_MKNOD_CREATES_SOCKETS" = x"yes"; then
-+    AC_DEFINE(MKNOD_CREATES_SOCKETS, 1, [ ])
-+fi
-+
- #
- # The following test was mostly taken from the tcl/tk plus patches
- #
---- generator.c	20 Sep 2004 19:47:59 -0000	1.114
-+++ generator.c	23 Sep 2004 06:22:02 -0000
-@@ -385,7 +385,6 @@ static void recv_generator(char *fname, 
- 		return;
- 	}
- 
--#ifdef HAVE_MKNOD
- 	if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
- 		if (statret != 0 ||
- 		    st.st_mode != file->mode ||
-@@ -411,7 +410,6 @@ static void recv_generator(char *fname, 
- 		}
- 		return;
- 	}
--#endif
- 
- 	if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
- 		return;
---- syscall.c	2 Aug 2004 21:56:07 -0000	1.31
-+++ syscall.c	23 Sep 2004 06:22:02 -0000
-@@ -26,6 +26,10 @@
- 
- #include "rsync.h"
- 
-+#if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
-+#include <sys/un.h>
-+#endif
-+
- extern int dry_run;
- extern int read_only;
- extern int list_only;
-@@ -71,14 +75,41 @@ int do_lchown(const char *path, uid_t ow
- 	return lchown(path, owner, group);
- }
- 
--#if HAVE_MKNOD
- int do_mknod(char *pathname, mode_t mode, dev_t dev)
- {
- 	if (dry_run) return 0;
- 	RETURN_ERROR_IF_RO_OR_LO;
-+#if !MKNOD_CREATES_FIFOS && HAVE_MKFIFO
-+	if (S_ISFIFO(mode))
-+		return mkfifo(pathname, mode);
-+#endif
-+#if !MKNOD_CREATES_SOCKETS && HAVE_SYS_UN_H
-+	if (S_ISSOCK(mode)) {
-+		int sock;
-+		struct sockaddr_un saddr;
-+		unsigned int len;
-+
-+		saddr.sun_family = AF_UNIX;
-+		len = strlcpy(saddr.sun_path, pathname, sizeof saddr.sun_path);
-+#if HAVE_SOCKADDR_UN_LEN
-+		saddr.sun_len = len >= sizeof saddr.sun_path
-+			      ? sizeof saddr.sun_path : len + 1;
-+#endif
-+
-+		if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0
-+		    || (unlink(pathname) < 0 && errno != ENOENT)
-+		    || (bind(sock, (struct sockaddr*)&saddr, sizeof saddr)) < 0)
-+			return -1;
-+		close(sock);
-+		return do_chmod(pathname, mode);
-+	}
-+#endif
-+#if HAVE_MKNOD
- 	return mknod(pathname, mode, dev);
--}
-+#else
-+	return -1;
- #endif
-+}
- 
- int do_rmdir(char *pathname)
- {
diff --git a/net/rsync/files/patch-receiver.c b/net/rsync/files/patch-receiver.c
deleted file mode 100644
index f4d0639975f7..000000000000
--- a/net/rsync/files/patch-receiver.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Fix an off-by-one error in the handling of --max-delete=N
-# http://lists.samba.org/archive/rsync/2004-October/010853.html
-#
---- receiver.c.orig	Tue Sep 21 11:24:06 2004
-+++ receiver.c	Wed Oct 20 08:12:19 2004
-@@ -116,7 +116,7 @@
- 			rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
- 
- 		for (i = local_file_list->count-1; i >= 0; i--) {
--			if (max_delete && deletion_count > max_delete)
-+			if (max_delete && deletion_count >= max_delete)
- 				break;
- 			if (!local_file_list->files[i]->basename)
- 				continue;
diff --git a/net/rsync/files/rsyncd.sh b/net/rsync/files/rsyncd.sh.in
index b86b09e12543..b86b09e12543 100644
--- a/net/rsync/files/rsyncd.sh
+++ b/net/rsync/files/rsyncd.sh.in
diff --git a/net/rsync/pkg-message b/net/rsync/pkg-message
deleted file mode 100644
index f9109fce4cf1..000000000000
--- a/net/rsync/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-************************************************************
-Note that rsync now uses SSH as the transport by default.
-
-If you still need to use RSH instead, please specify
-"-e rsh" in the rsync command line or set the environment
-variable RSYNC_RSH to "rsh".
-************************************************************
diff --git a/net/rsync/pkg-plist b/net/rsync/pkg-plist
index d85fc82adbfb..1a67dc6ec584 100644
--- a/net/rsync/pkg-plist
+++ b/net/rsync/pkg-plist
@@ -3,4 +3,3 @@ bin/rsync
 @unexec if cmp -s %D/etc/rsyncd.conf.sample %D/etc/rsyncd.conf; then rm -f %D/etc/rsyncd.conf; fi
 etc/rsyncd.conf.sample
 @exec [ -f %B/rsyncd.conf ] || cp %B/%f %B/rsyncd.conf
-etc/rc.d/rsyncd.sh