[amanda] amanda-3.3.2

[Lukáš Nykrýn]

commit 1885f8d3d61c72618d7cfe91633beb3d97cde284
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Thu Aug 16 11:03:25 2012 +0200

    amanda-3.3.2

 amanda-xinetd   |   25 -------------------------
 amanda.socket   |    9 +++++++++
 amanda.spec     |   39 ++++++++++++++++++++++++---------------
 amanda at .service |    9 +++++++++
 sources         |    2 +-
 5 files changed, 43 insertions(+), 41 deletions(-)
---
diff --git a/amanda.socket b/amanda.socket
new file mode 100644
index 0000000..136d00f
--- /dev/null
+++ b/amanda.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Amanda Activation Socket
+
+[Socket]
+ListenStream=10080
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/amanda.spec b/amanda.spec
index 6cb69cb..ecc4b24 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -1,5 +1,5 @@
 %define _libexecdir %{_libdir}
-%{!?defconfig:%define defconfig DailySet1}
+%define defconfig DailySet1
 %{!?indexserver:%define indexserver amandahost}
 %{!?tapeserver:%define tapeserver %{indexserver}}
 %{!?amanda_user:%define amanda_user amandabackup}
@@ -7,17 +7,17 @@
 
 Summary: A network-capable tape backup solution
 Name: amanda
-Version: 3.3.1
-Release: 3%{?dist}
-Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz
+Version: 3.3.2
+Release: 1%{?dist}
+Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
-Source5: amanda-xinetd
 Source8: amandahosts
+Source9: amanda.socket
+Source10: amanda at .service
 Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch6: amanda-3.2.0-config-dir.patch
-Patch9: amanda-3.3.0-glib.patch
 Patch10: amanda-3.3.1-stdio.patch
 
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
@@ -32,8 +32,10 @@ BuildRequires: perl-devel perl(ExtUtils::Embed) perl(Test::Simple)
 BuildRequires: glib2-devel openssl-devel swig bison flex
 BuildRequires: libcurl-devel
 Requires(pre): shadow-utils
-Requires(post): grep sed
-Requires: fileutils grep initscripts tar /bin/mail xinetd
+Requires(post): grep sed systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires: fileutils grep initscripts tar /bin/mail
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Obsoletes: amanda-devel < 2.6.1p2-5
 Provides: amanda-devel = 2.6.1p2-5
@@ -83,7 +85,6 @@ server also needs to have the amanda-client package installed.
 %patch2 -p1 -b .xattrs
 %patch3 -p1 -b .tcpport
 %patch6 -p1 -b .config
-%patch9 -p2 -b .glib
 %patch10 -p1 -b .stdio
 ./autogen
 
@@ -124,12 +125,11 @@ rm -rf ${RPM_BUILD_ROOT}
 make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/etc/amanda
-mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-cp %SOURCE5 $RPM_BUILD_ROOT/etc/xinetd.d/amanda
-chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amanda
 mkdir -p $RPM_BUILD_ROOT/var/log/amanda
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda
 install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts
+install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket
+install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda at .service
 
 ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad
 ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8
@@ -162,11 +162,14 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %post
 /sbin/ldconfig
-[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || :
+%systemd_post amanda.socket
+
+%preun
+%systemd_preun amanda.socket
 
 %postun
 /sbin/ldconfig
-[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || :
+%systemd_postun_with_restart amanda.socket
 
 %post client -p /sbin/ldconfig
 
@@ -179,7 +182,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT* NEWS README
-%config(noreplace) /etc/xinetd.d/amanda
+%{_unitdir}/amanda at .service
+%{_unitdir}/amanda.socket
+
 
 %{_libdir}/libamanda-*.so
 %{_libdir}/libamanda.so
@@ -435,6 +440,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Aug 15 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 3.3.2-1
+- upgrade to new upstream release
+- convert to systemd
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/amanda at .service b/amanda at .service
new file mode 100644
index 0000000..24adab4
--- /dev/null
+++ b/amanda at .service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Amanda Backup System
+After=local-fs.target
+
+[Service]
+User=amandabackup
+Group=disk
+ExecStart=/usr/sbin/amandad -auth=bsdtcp amdump 
+StandardInput=socket
diff --git a/sources b/sources
index ecccdb8..ca969e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dae7631b4abcf7eac874df6e3740e75b  amanda-3.3.1.tar.gz
+1a6cfe47eaee121f22540ac5fa58c366  amanda-3.3.2.tar.gz