Author: baggins Date: Mon May 12 11:35:34 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - ssh auth setup - cleaned R/BR
---- Files affected: SPECS: amanda.spec (1.162 -> 1.163) ---- Diffs: ================================================================ Index: SPECS/amanda.spec diff -u SPECS/amanda.spec:1.162 SPECS/amanda.spec:1.163 --- SPECS/amanda.spec:1.162 Mon May 12 11:36:34 2008 +++ SPECS/amanda.spec Mon May 12 13:35:29 2008 @@ -29,7 +29,7 @@ URL: http://www.amanda.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake -BuildRequires: curl-devel +BuildRequires: curl-devel >= 7.10.0 BuildRequires: dump BuildRequires: flex BuildRequires: glib2-devel @@ -41,7 +41,7 @@ BuildRequires: ncurses-devel BuildRequires: openssh-clients BuildRequires: openssl-devel -BuildRequires: perl-devel +BuildRequires: perl-devel >= 5.6.0 BuildRequires: pkgconfig BuildRequires: readline-devel >= 4.2 BuildRequires: rpmbuild(macros) >= 1.268 @@ -101,7 +101,12 @@ Group: Networking/Utilities Requires: %{name}-libs = %{version}-%{release} Requires: rc-inetd -Conflicts: tar < 1.13 +Suggests: openssh-clients +Suggests: openssh-server +Suggests: tar +Suggests: gzip +Suggests: star +Conflicts: tar < 1.15 %description client The Amanda-client package should be installed on any machine that will @@ -125,9 +130,8 @@ Requires: mt-st Requires: mtx Requires: rc-inetd -Requires: tar -Requires: gzip -#Suggests: star +Suggests: openssh-clients +Suggests: openssh-server Obsoletes: amanda %description server @@ -225,7 +229,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/{amanda,cron.d,sysconfig/rc-inetd} \ - $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/gnutar-lists \ + $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/{.gnupg,.ssh,gnutar-lists} \ $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/debug/{amandad,client,server} %{__make} install \ @@ -240,6 +244,10 @@ install example/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.amandahosts +touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/{,client_}authorized_keys +touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amdump{,.pub} +touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amrecover{,.pub} + > $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/amandates find $RPM_BUILD_ROOT -name \*.la | xargs rm -f @@ -270,6 +278,17 @@ %post client %service -q rc-inetd reload +if [ -x /usr/bin/ssh-keygen -a ! -e /var/lib/amanda/.ssh/id_rsa_amrecover ] ; then + HOST="`hostname`" + if [ -z "$HOST" ] ; then + COMMENT="[EMAIL PROTECTED]" + else + COMMENT="[EMAIL PROTECTED]" + fi + /usr/bin/ssh-keygen -t rsa -C $COMMENT -f /var/lib/amanda/.ssh/id_rsa_amrecover -N "" || : + chown amanda:amanda /var/lib/amanda/.ssh/id_rsa_amrecover{,.pub} || : + chmod 600 /var/lib/amanda/.ssh/id_rsa_amrecover{,.pub} || : +fi %postun client if [ "$1" = 0 ]; then @@ -278,6 +297,17 @@ %post server %service -q rc-inetd reload +if [ -x /usr/bin/ssh-keygen -a ! -e /var/lib/amanda/.ssh/id_rsa_amdump ] ; then + HOST="`hostname`" + if [ -z "$HOST" ] ; then + COMMENT="[EMAIL PROTECTED]" + else + COMMENT="[EMAIL PROTECTED]" + fi + /usr/bin/ssh-keygen -t rsa -C $COMMENT -f /var/lib/amanda/.ssh/id_rsa_amdump -N "" || : + chown amanda:amanda /var/lib/amanda/.ssh/id_rsa_amdump{,.pub} || : + chmod 600 /var/lib/amanda/.ssh/id_rsa_amdump{,.pub} || : +fi if [ "$1" = "1" ]; then echo "Don't forget to edit /etc/cron.d/amanda-srv." 1>&2 fi @@ -294,9 +324,12 @@ %attr(750,amanda,amanda) %dir %{_sysconfdir}/amanda %dir %{_libdir}/amanda %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda +%attr(700,amanda,amanda) %dir %{_sharedstatedir}/amanda/.ssh +%attr(700,amanda,amanda) %dir %{_sharedstatedir}/amanda/.gnupg %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug/amandad %attr(600,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/.amandahosts +%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/authorized_keys %if %{with server} %files server @@ -306,6 +339,9 @@ %config(noreplace) %verify(not md5 mtime size) %attr(640,amanda,amanda) %{_sysconfdir}/amanda/amanda.conf +%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/client_authorized_keys +%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/id_rsa_amdump{,.pub} + %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/example %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/example/label-templates %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/template.d @@ -425,6 +461,7 @@ %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/amanda %config(noreplace) %verify(not md5 mtime size) %attr(640,root,amanda) %{_sysconfdir}/amanda/amanda-client.conf +%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/id_rsa_amrecover{,.pub} %attr(640,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/amandates %attr(755,root,root) %{_libdir}/amanda/libamclient*.so %attr(755,root,root) %{_libdir}/amanda/amandad @@ -486,6 +523,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.163 2008-05-12 11:35:29 baggins +- ssh auth setup +- cleaned R/BR + Revision 1.162 2008-05-12 09:36:34 baggins - moved /etc/amanda to libs (both client and server need it) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amanda.spec?r1=1.162&r2=1.163&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
