X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=rsync%2Frsync.nm;h=05a99f87785c9a9a18e0506202c34d85ad07fdc1;hb=414ca3fe85d1fbaed8e775926166f19c158ea836;hp=3af7d69f9e63f7c613423d37fb241b283888f868;hpb=1178d37f411057c323eb56688581d1e173d3a90b;p=ipfire-3.x.git

diff --git a/rsync/rsync.nm b/rsync/rsync.nm
index 3af7d69f9..05a99f877 100644
--- a/rsync/rsync.nm
+++ b/rsync/rsync.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = rsync
-version    = 3.0.7
-release    = 1
+version    = 3.1.2
+release    = 2
 
 groups     = Applications/Internet
 url        = http://rsync.samba.org/
@@ -31,8 +31,17 @@ build
 		libacl-devel
 		libattr-devel
 		popt-devel
+		zlib-devel
+
+		# Testsuite.
+		%{bindir}/setfacl
 	end
 
+	configure_options += \
+		--without-included-popt \
+		--without-included-zlib
+
+
 	prepare_cmds
 		# Fix permission issure.
 		cd %{DIR_APP} && chmod -x support/*
@@ -52,19 +61,60 @@ build
 
 	make_build_targets = proto all
 
+	test
+		# Fix permissions of testsuite helper script.
+		#
+		# Otherwise some tests of the testsuite will fail,
+		# because the script is not allowed to be executed.
+		chmod +x ./support/lsh.sh
+
+		make check
+	end
+
 	make_install_targets += \
 		INSTALLCMD="install -p" \
 		INSTALLMAN="install -p"
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/etc/xinetd.d
-		install -p -m 644 %{DIR_SOURCE}/rsync.xinetd \
-			%{BUILDROOT}/etc/xinetd.d/rsync
+
+		# Install config file.
+		mkdir -pv %{BUILDROOT}%{sysconfdir}
+
+		install -m 0644 %{DIR_SOURCE}/rsyncd.conf \
+			%{BUILDROOT}%{sysconfdir}/
+
+		# Create directory for pidfile.
+		mkdir -pv %{BUILDROOT}/run/rsyncd
 	end
+
 end
 
 packages
 	package %{name}
+		configfiles
+			%{sysconfdir}/rsyncd.conf
+		end
+
+		script postin
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script preun
+			systemctl --no-reload disable rsyncd.service >/dev/null 2>&1 || :
+			systemctl --no-reload disable rsyncd.socket >/dev/null 2>&1 || :
+			systemctl stop rsyncd.service >/dev/null 2>&1 || :
+			systemctl stop rsyncd.socket >/dev/null 2>&1 || :
+			systemctl stop rsyncd@.service >/dev/null 2>&1 || :
+		end
+
+		script postun
+			systemctl daemon-reload >/dev/null 2>&1 || :
+		end
+
+		script postup
+			systemctl daemon-reload >/dev/null 2>&1 || :
+			systemctl try-restart rsyncd.service >/dev/null 2>&1 || :
+		end
 	end
 
 	package %{name}-debuginfo