[Midnightbsd-cvs] mports [16794] trunk/net/rsync: rsync 3.1.1

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 5 01:20:56 EDT 2014 

Revision: 16794
          http://svnweb.midnightbsd.org/mports/?rev=16794
Author:   laffer1
Date:     2014-09-05 01:20:55 -0400 (Fri, 05 Sep 2014)
Log Message:
-----------
rsync 3.1.1

Modified Paths:
--------------
    trunk/net/rsync/Makefile
    trunk/net/rsync/distinfo
    trunk/net/rsync/files/rsyncd.conf.sample
    trunk/net/rsync/pkg-plist

Added Paths:
-----------
    trunk/net/rsync/files/extrapatch-main.c
    trunk/net/rsync/files/rsyncd.in

Removed Paths:
-------------
    trunk/net/rsync/files/rsyncd.sh.in

Property Changed:
----------------
    trunk/net/rsync/files/extra-patches-acls.diff
    trunk/net/rsync/files/rsyncd.conf.sample

Modified: trunk/net/rsync/Makefile
===================================================================
--- trunk/net/rsync/Makefile	2014-09-05 05:18:44 UTC (rev 16793)
+++ trunk/net/rsync/Makefile	2014-09-05 05:20:55 UTC (rev 16794)
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=	rsync
-PORTVERSION=	3.0.9
+PORTVERSION=	3.1.1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
 		ftp://ftp.samba.org/pub/%SUBDIR%/ \
@@ -18,115 +18,91 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A network file distribution/synchronization utility
+
 LICENSE=	gpl3
 
+USES=		cpe
+
+CPE_VENDOR=	samba
+CPE_PRODUCT=	rsync
+
+PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	rsyncd.sh
+USE_RC_SUBR=	rsyncd
 SUB_LIST=	NAME=rsyncd
-MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--disable-debug --enable-ipv6 \
-		--with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf
-CONFIGURE_TARGET=	${MACHINE_ARCH}-portbld-freebsd7.0
+		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	NEWS README csprotocol.txt tech_report.tex
-.endif
 
-MAN1=		rsync.1
-MAN5=		rsyncd.conf.5
+# define options
+OPTIONS_DEFINE=		DOCS POPT_PORT ZLIB_BASE SSH ICONV
+OPTIONS_RADIO=		PTS
+OPTIONS_RADIO_PTS=	TIMELIMIT RENAMED FLAGS ATIMES ACL
 
-OPTIONS=	POPT_PORT "Use popt from devel/popt instead of bundled one" off \
-		SSH       "Use SSH instead of RSH" on \
-		FLAGS     "File system flags support patch, adds --fileflags" off \
-		ATIMES    "Preserve access times, adds --atimes" off \
-		ACL       "Add backward-compatibility for the --acls option" off \
-		ICONV     "Add iconv support" off \
-		TIMELIMIT "Time limit patch" off
+# options provided upstream
+POPT_PORT_DESC=	Use popt from devel/popt instead of bundled one
+ZLIB_BASE_DESC=	Use zlib from base instead of bundled one
+SSH_DESC=	Use SSH instead of RSH
 
-.include <bsd.port.pre.mk>
+# options provided by patch (mutually exclusive)
+PTS_DESC=	Functionality provided by third party patches
+TIMELIMIT_DESC=	Time limit patch
+RENAMED_DESC=	Add support for renamed file detection
+FLAGS_DESC=	File system flags support patch, adds --fileflags
+ATIMES_DESC=	Preserve access times, adds --atimes
+ACL_DESC=	Add backward-compatibility for the --acls option
 
-.if !defined(WITHOUT_TIMELIMIT)
-PATCH_STRIP=	-p1
-EXTRA_PATCHES+=	${WRKSRC}/patches/time-limit.diff
-.if defined(WITH_FLAGS)
-IGNORE=		flags and timelimit can't be both enabled at the same time. Please rerun 'make config' and disable one of them
-.endif
-.if defined(WITH_ATIMES)
-IGNORE=		atimes and timelimit can't be enabled simultaneously. Please rerun 'make config' and disable one of them
-.endif
-.endif
+# define default options
+OPTIONS_DEFAULT=SSH FLAGS
 
-.if !defined(WITHOUT_ATIMES)
-PATCH_STRIP=	-p1
-EXTRA_PATCHES+=	${WRKSRC}/patches/atimes.diff
-.if defined(WITH_FLAGS)
-IGNORE=		flags and atimes can't be enabled simultaneously. Please rerun 'make config' and disable one of them
-.endif
-.endif
+ZLIB_BASE_CONFIGURE_ON=	--with-included-zlib=no
+TIMELIMIT_EXTRA_PATCHES=	${WRKSRC}/patches/time-limit.diff
+ATIMES_EXTRA_PATCHES=		${WRKSRC}/patches/atimes.diff
+FLAGS_EXTRA_PATCHES=		${WRKSRC}/patches/fileflags.diff \
+				${FILESDIR}/extrapatch-main.c
+RENAMED_EXTRA_PATCHES=		${WRKSRC}/patches/detect-renamed.diff
+ACL_EXTRA_PATCHES=		${WRKSRC}/patches/acls.diff
 
-.if defined(WITH_ICONV) || defined(WITH_FLAGS) || defined(WITH_ACL) || make(makesum) || defined(WITH_TIMELIMIT) || defined(WITH_ATIMES)
-DISTFILES+=	${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
-CFLAGS+=	-I${LOCALBASE}/include
-.endif
+ICONV_USES=	iconv
+ICONV_CPPFLAGS=	-I${LOCALBASE}/include
+ICONV_LDFLAGS=	-L${LOCALBASE}/lib
+ICONV_CONFIGURE_ENABLE=	iconv iconv-open
 
-.if defined(WITH_ICONV)
-USE_ICONV=	yes
-CONFIGUREDCFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
-.else
-CONFIGURE_ARGS+=	--disable-iconv
-CONFIGURE_ENV+=		ac_cv_search_libiconv_open=no
-CONFIGURE_ENV+=		ac_cv_header_iconv_h=no
-.endif
+POPT_PORT_LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+POPT_PORT_CPPFLAGS=	-I${LOCALBASE}/include
+POPT_PORT_LDFLAGS=	-L${LOCALBASE}/lib
+POPT_CONFIGURE_WITH=	included-popt
 
-.if defined(WITH_FLAGS)
-PATCH_STRIP=	-p1
-EXTRA_PATCHES+=	${WRKSRC}/patches/fileflags.diff
-.endif
+SSH_CONFIGURE_ON=	--with-rsh=ssh
+SSH_CONFIGURE_OFF=	--with-rsh=rsh
 
-.if defined(WITH_ACL)
-PATCH_STRIP=	-p1
-EXTRA_PATCHES+=	${WRKSRC}/patches/acls.diff
-.endif
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_POPT_PORT)
-LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-.else
-CONFIGURE_ARGS+=	--with-included-popt
+.if ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MACL} || make(makesum) || ${PORT_OPTIONS:MTIMELIMIT} || ${PORT_OPTIONS:MATIMES} || ${PORT_OPTIONS:MRENAMED}
+DISTFILES+=	${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
-.if defined(WITHOUT_SSH)
-CONFIGURE_ARGS+=	--with-rsh=rsh
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
 .endif
 
-# guard against CFLAGS damage by MAKE_ENV
 post-patch:
-	@${REINPLACE_CMD} -e 's|CFLAGS|CONFIGUREDCFLAGS|' \
-		-e 's|perl.*|${DO_NADA}|' \
-			${WRKSRC}/Makefile.in
-
-pre-configure:
-	@${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g'  \
+	@${REINPLACE_CMD} -e 's|perl.*|${DO_NADA}|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g'  \
 		${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
-		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/rsync
-	@${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/
-	@[ -f ${PREFIX}/etc/rsyncd.conf ] || \
-		${CP} ${PREFIX}/etc/rsyncd.conf.sample \
-		${PREFIX}/etc/rsyncd.conf
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rsync
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 test: build
-	@cd ${WRKSRC} && ${MAKE} check
+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
 
 .include <bsd.port.post.mk>

Modified: trunk/net/rsync/distinfo
===================================================================
--- trunk/net/rsync/distinfo	2014-09-05 05:18:44 UTC (rev 16793)
+++ trunk/net/rsync/distinfo	2014-09-05 05:20:55 UTC (rev 16794)
@@ -1,4 +1,4 @@
-SHA256 (rsync-3.0.9.tar.gz) = 30f10f8dd5490d28240d4271bb652b1da7a60b22ed2b9ae28090668de9247c05
-SIZE (rsync-3.0.9.tar.gz) = 792725
-SHA256 (rsync-patches-3.0.9.tar.gz) = 0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9
-SIZE (rsync-patches-3.0.9.tar.gz) = 172417
+SHA256 (rsync-3.1.1.tar.gz) = 7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621
+SIZE (rsync-3.1.1.tar.gz) = 890124
+SHA256 (rsync-patches-3.1.1.tar.gz) = 547ea4a37eb497050b37bda029dee4927436781e7b0e4eb207c2fad54d4a3246
+SIZE (rsync-patches-3.1.1.tar.gz) = 167954

Index: trunk/net/rsync/files/extra-patches-acls.diff
===================================================================
--- trunk/net/rsync/files/extra-patches-acls.diff	2014-09-05 05:18:44 UTC (rev 16793)
+++ trunk/net/rsync/files/extra-patches-acls.diff	2014-09-05 05:20:55 UTC (rev 16794)

Property changes on: trunk/net/rsync/files/extra-patches-acls.diff
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/net/rsync/files/extrapatch-main.c
===================================================================
--- trunk/net/rsync/files/extrapatch-main.c	                        (rev 0)
+++ trunk/net/rsync/files/extrapatch-main.c	2014-09-05 05:20:55 UTC (rev 16794)
@@ -0,0 +1,10 @@
+--- main.c.orig	2013-10-02 10:47:24.479295402 +0200
++++ main.c	2013-10-02 10:47:43.659318579 +0200
+@@ -30,6 +30,7 @@
+ #include <sys/sysctl.h>
+ #endif
+ 
++extern int force_change;
+ extern int dry_run;
+ extern int list_only;
+ extern int io_timeout;

Modified: trunk/net/rsync/files/rsyncd.conf.sample
===================================================================
--- trunk/net/rsync/files/rsyncd.conf.sample	2014-09-05 05:18:44 UTC (rev 16793)
+++ trunk/net/rsync/files/rsyncd.conf.sample	2014-09-05 05:20:55 UTC (rev 16794)
@@ -1,5 +1,5 @@
 # rsyncd.conf - Example file, see rsyncd.conf(5)
-# $MidnightBSD$
+#
 
 # Set this if you want to stop rsync daemon with rc.d scripts
 pid file = /var/run/rsyncd.pid
@@ -32,4 +32,4 @@
 #	path = /data/cvs
 #	comment = CVS repository (requires authentication)
 #	auth users = tridge, susan
-#	secrets file = /usr/local/etc/rsyncd.secrets
+#	secrets file = /usr/local/etc/rsync/rsyncd.secrets


Property changes on: trunk/net/rsync/files/rsyncd.conf.sample
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Copied: trunk/net/rsync/files/rsyncd.in (from rev 16741, trunk/net/rsync/files/rsyncd.sh.in)
===================================================================
--- trunk/net/rsync/files/rsyncd.in	                        (rev 0)
+++ trunk/net/rsync/files/rsyncd.in	2014-09-05 05:20:55 UTC (rev 16794)
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD: head/net/rsync/files/rsyncd.in 351269 2014-04-14 17:20:17Z ehaupt $
+# $MidnightBSD$
+
+# PROVIDE: %%NAME%%
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable `%%NAME%%':
+#
+# %%NAME%%_enable="YES"
+# %%NAME%%_flags="<set as needed>"
+#
+# See rsync(1) for %%NAME%%_flags
+#
+
+. /etc/rc.subr
+
+name="%%NAME%%"
+rcvar=%%NAME%%_enable
+
+command="%%PREFIX%%/bin/rsync"
+command_args="--daemon"
+start_precmd="%%NAME%%_precmd"
+pidfile="/var/run/$name.pid"
+required_files="%%ETCDIR%%/$name.conf"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${%%NAME%%_enable="NO"}
+
+%%NAME%%_precmd()
+{
+	if [ -f "%%PREFIX%%/etc/$name.conf" ] && [ ! -L "%%PREFIX%%/etc/$name.conf" ]; then
+		echo "Found %%PREFIX%%/etc/$name.conf in old location. Migrating to %%ETCDIR%%/$name.conf."
+		mv %%PREFIX%%/etc/$name.conf %%ETCDIR%%/$name.conf
+		ln -s %%ETCDIR%%/$name.conf %%PREFIX%%/etc/$name.conf
+	fi
+}
+
+run_rc_command "$1"

Deleted: trunk/net/rsync/files/rsyncd.sh.in
===================================================================
--- trunk/net/rsync/files/rsyncd.sh.in	2014-09-05 05:18:44 UTC (rev 16793)
+++ trunk/net/rsync/files/rsyncd.sh.in	2014-09-05 05:20:55 UTC (rev 16794)
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/rsync/files/rsyncd.sh.in,v 1.3 2009/07/15 16:55:54 dougb Exp $
-#
-
-# PROVIDE: %%NAME%%
-# REQUIRE: LOGIN
-# BEFORE:  securelevel
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable `%%NAME%%':
-#
-# %%NAME%%_enable="YES"
-# %%NAME%%_flags="<set as needed>"
-#
-# See rsync(1) for %%NAME%%_flags
-#
-
-. /etc/rc.subr
-
-name="%%NAME%%"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/rsync"
-command_args="--daemon"
-pidfile="/var/run/$name.pid"
-required_files="%%PREFIX%%/etc/$name.conf"
-
-# read configuration and set defaults
-load_rc_config "$name"
-: ${%%NAME%%_enable="NO"}
-
-run_rc_command "$1"

Modified: trunk/net/rsync/pkg-plist
===================================================================
--- trunk/net/rsync/pkg-plist	2014-09-05 05:18:44 UTC (rev 16793)
+++ trunk/net/rsync/pkg-plist	2014-09-05 05:20:55 UTC (rev 16794)
@@ -1,5 +1,5 @@
- at comment $MidnightBSD$
 bin/rsync
- at 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
- at exec [ -f %B/rsyncd.conf ] || cp %B/%f %B/rsyncd.conf
+man/man1/rsync.1.gz
+man/man5/rsyncd.conf.5.gz
+ at sample %%ETCDIR%%/rsyncd.conf.sample
+ at dirrmtry %%ETCDIR%%

More information about the Midnightbsd-cvs mailing list