Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2013/05/31 12:41:43 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2014/03/11 14:34:39 jperkin Exp $

-DISTNAME=	rsync-3.0.9
-PKGREVISION=	2
+DISTNAME=	rsync-3.1.0
 CATEGORIES=	net
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		http://rsync.samba.org/ftp/rsync/old-versions/  \
@@ -17,16 +16,17 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews

 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync

-GNU_CONFIGURE=		yes
 USE_TOOLS+=		perl
-CONFIGURE_ARGS+=	--with-included-popt \
-			--with-rsyncd-conf=${PKG_SYSCONFDIR}/rsyncd.conf
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-included-popt
+CONFIGURE_ARGS+=	--with-rsyncd-conf=${PKG_SYSCONFDIR}/rsyncd.conf
 TEST_TARGET=		test

 PKG_SYSCONFSUBDIR=	rsync

 RCD_SCRIPTS=		rsyncd
 RCD_SCRIPT_SRC.rsyncd=	files/rsyncd.sh
+SMF_NAME=		rsyncd

 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
@@ -37,7 +37,7 @@ SUBST_SED.paths+=	-e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g'

 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/tech_report.tex \
-	  ${DESTDIR}${PREFIX}/share/doc/rsync
+		${DESTDIR}${PREFIX}/share/doc/rsync

 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/net/rsync/PLIST
+++ b/net/rsync/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:09:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:11 jperkin Exp $
 bin/rsync
 man/man1/rsync.1
 man/man5/rsyncd.conf.5
 share/doc/rsync/README
 share/doc/rsync/tech_report.tex
-share/examples/rc.d/rsyncd
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.37 2011/10/03 09:49:56 tron Exp $
+$NetBSD: distinfo,v 1.38 2013/10/02 18:06:19 adam Exp $

-SHA1 (rsync-3.0.9.tar.gz) = c64c8341984aea647506eb504496999fd968ddfc
-RMD160 (rsync-3.0.9.tar.gz) = e5ee8d786defb0d8f937c8d027466f418c63c97e
-Size (rsync-3.0.9.tar.gz) = 792725 bytes
-SHA1 (patch-ab) = f7895312568d1ff5ca7031cf9b1ddd2b6e0b02d8
+SHA1 (rsync-3.1.0.tar.gz) = eb58ab04bcb6293da76b83f58327c038b23fcba3
+RMD160 (rsync-3.1.0.tar.gz) = d072ab02c31468aa72270a4cf90b5865c5139e1b
+Size (rsync-3.1.0.tar.gz) = 883901 bytes
+SHA1 (patch-ab) = 98aa07a50314e3309b48f803d6febb1138eae1f2
--- a/net/rsync/files/smf/manifest.xml
+++ b/net/rsync/files/smf/manifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default" />
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local" />
+    </dependency>
+    <exec_method type="method" name="start" exec="@PREFIX@/bin/rsync --daemon --config %{config_file}" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/rsyncd.conf" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">rsyncd daemon</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
--- a/net/rsync/patches/patch-ab
+++ b/net/rsync/patches/patch-ab
@@ -1,19 +1,20 @@
-$NetBSD: patch-ab,v 1.15 2009/06/15 16:53:02 tron Exp $
+$NetBSD: patch-ab,v 1.16 2013/10/02 18:06:19 adam Exp $

--- Makefile.in.orig	2009-04-11 00:24:49.000000000 +0100
-+++ Makefile.in	2009-06-15 13:55:30.000000000 +0100
-@@ -62,12 +62,9 @@
- all: Makefile rsync$(EXEEXT) @MAKE_MAN@
+--- Makefile.in.orig	2013-06-15 23:40:10.000000000 +0000
+++ Makefile.in
+@@ -65,12 +65,9 @@ CHECK_OBJS=tls.o testrun.o getgroups.o g
+ all: Makefile rsync$(EXEEXT) rsync-ssl stunnel-rsync stunnel-rsyncd.conf @MAKE_MAN@
 
 install: all
-	-mkdir -p ${DESTDIR}${bindir}
+-	-${MKDIR_P} ${DESTDIR}${bindir}
 -	${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
-	-mkdir -p ${DESTDIR}${mandir}/man1
-	-mkdir -p ${DESTDIR}${mandir}/man5
-+	${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir}
- 	if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
+-	-${MKDIR_P} ${DESTDIR}${mandir}/man1
+-	-${MKDIR_P} ${DESTDIR}${mandir}/man5
+-	if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
 -	if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
+	${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir}
+	if test -f rsync.1; then ${BSD_INSTALL_MAN} rsync.1 ${DESTDIR}${mandir}/man1; fi
 +	if test -f rsyncd.conf.5; then ${BSD_INSTALL_MAN} rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
 
- install-strip:
- 	$(MAKE) INSTALL_STRIP='-s' install
+ install-ssl-client: rsync-ssl stunnel-rsync
+ 	-${MKDIR_P} ${DESTDIR}${bindir}