Attachment 4590 Details for Bug 11923 – proposed patch for splitting into a server and normal package

[patch] proposed patch for splitting into a server and normal package

tor.spec.patch (text/plain), 1.97 KB, created by Hartmut Goebel on 2013-12-07 17:19:23 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Hartmut Goebel

Created: 2013-12-07 17:19:23 CET

Size: 1.97 KB

patch

obsolete

>Index: SPECS/tor.spec
>===================================================================
>--- SPECS/tor.spec	(Revision 555812)
>+++ SPECS/tor.spec	(Arbeitskopie)
>@@ -50,7 +50,18 @@
> strength of the anonymity provided. Tor is not presently suitable
> for high-stakes anonymity.
> 
>+%package server
>+Summary:	Anonymizing overlay network for TCP (The onion router) - server
>+Requires:	tor
>+Group:		Networking/Other
> 
>+%description server
>+Tor is a connection-based low-latency anonymous communication system.
>+
>+Install this package if you want to start Tor automatically with the
>+computer. If you want to start Tor on demand, we suggest installing
>+'vidalia' instead, a controller GUI for Tor.
>+
> %prep
> %setup -q
>  
>@@ -87,14 +98,14 @@
> install -D -p -m 0644 %SOURCE4 $RPM_BUILD_ROOT%_unitdir/%name.service
> install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
> 
>-%pre
>+%pre server
> %_pre_useradd %{runuser} / /bin/false
> 
>-%post
>+%post server
> %_tmpfilescreate %{name}
> %_post_service %{name}
> 
>-%preun
>+%preun server
> %_preun_service %{name}
> rm -f %{_localstatedir}/%{name}/cached-directory
> rm -f %{_localstatedir}/%{name}/bw_accounting
>@@ -102,7 +113,7 @@
> rm -f %{_localstatedir}/%{name}/router.desc
> rm -f %{_localstatedir}/%{name}/fingerprint
> 
>-%postun
>+%postun server
> %_postun_userdel %{runuser}
> %_postun_groupdel %{runuser}
> 
>@@ -113,6 +124,11 @@
> %{_bindir}/torify
> %{_bindir}/tor-resolve
> %{_bindir}/tor-gencert
>+%dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/
>+%config(noreplace) %{_sysconfdir}/%{name}/torrc.sample
>+%{_sysconfdir}/bash_completion.d/%{name}
>+
>+%files server
> %config(noreplace) %attr(0755,%{runuser},%{runuser}) %{_initrddir}/%{name}
> %_unitdir/%name.service
> %{_tmpfilesdir}/%{name}.conf
>@@ -123,5 +139,4 @@
> %attr(0700,%{runuser},%{runuser}) %dir %{_localstatedir}/lib/%{name}
> %attr(0750,%{runuser},%{runuser}) %dir %{_var}/%{name}
> %attr(0750,%{runuser},%{runuser}) %dir %{_logdir}/%{name}
>-%{_sysconfdir}/bash_completion.d/%{name}
> %{_datadir}/%{name}

Index: SPECS/tor.spec
===================================================================
--- SPECS/tor.spec	(Revision 555812)
+++ SPECS/tor.spec	(Arbeitskopie)
@@ -50,7 +50,18 @@
 strength of the anonymity provided. Tor is not presently suitable
 for high-stakes anonymity.
 
+%package server
+Summary:	Anonymizing overlay network for TCP (The onion router) - server
+Requires:	tor
+Group:		Networking/Other
 
+%description server
+Tor is a connection-based low-latency anonymous communication system.
+
+Install this package if you want to start Tor automatically with the
+computer. If you want to start Tor on demand, we suggest installing
+'vidalia' instead, a controller GUI for Tor.
+
 %prep
 %setup -q
  
@@ -87,14 +98,14 @@
 install -D -p -m 0644 %SOURCE4 $RPM_BUILD_ROOT%_unitdir/%name.service
 install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
-%pre
+%pre server
 %_pre_useradd %{runuser} / /bin/false
 
-%post
+%post server
 %_tmpfilescreate %{name}
 %_post_service %{name}
 
-%preun
+%preun server
 %_preun_service %{name}
 rm -f %{_localstatedir}/%{name}/cached-directory
 rm -f %{_localstatedir}/%{name}/bw_accounting
@@ -102,7 +113,7 @@
 rm -f %{_localstatedir}/%{name}/router.desc
 rm -f %{_localstatedir}/%{name}/fingerprint
 
-%postun
+%postun server
 %_postun_userdel %{runuser}
 %_postun_groupdel %{runuser}
 
@@ -113,6 +124,11 @@
 %{_bindir}/torify
 %{_bindir}/tor-resolve
 %{_bindir}/tor-gencert
+%dir %attr(0755,root,%{runuser}) %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/torrc.sample
+%{_sysconfdir}/bash_completion.d/%{name}
+
+%files server
 %config(noreplace) %attr(0755,%{runuser},%{runuser}) %{_initrddir}/%{name}
 %_unitdir/%name.service
 %{_tmpfilesdir}/%{name}.conf
@@ -123,5 +139,4 @@
 %attr(0700,%{runuser},%{runuser}) %dir %{_localstatedir}/lib/%{name}
 %attr(0750,%{runuser},%{runuser}) %dir %{_var}/%{name}
 %attr(0750,%{runuser},%{runuser}) %dir %{_logdir}/%{name}
-%{_sysconfdir}/bash_completion.d/%{name}
 %{_datadir}/%{name}

Actions: View | Diff

Attachments on bug 11923: 4590 | 4591