[tor/f17] Remove dependency on fedora-usermgmt

[Jamie Nguyen]

commit d60cc26f7c0acc50b15b29dcd714aba6cad70309
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Mar 11 07:13:28 2013 +0000

    Remove dependency on fedora-usermgmt

 tor.spec |   52 +++++++++++++++++++++++-----------------------------
 1 files changed, 23 insertions(+), 29 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 29fbc67..f776a6b 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,14 +1,11 @@
-## This package understands the following switches:
-%bcond_without      fedora
-%bcond_without      noarch
 %bcond_with         upstart
 
 %global _hardened_build 1
 
-%global username    toranon
-%global uid         19
-%global homedir     %_var/lib/%{name}
-%global logdir      %_var/log/%{name}
+%global toruser     toranon
+%global torgroup    toranon
+%global homedir     %{_localstatedir}/lib/%{name}
+%global logdir      %{_localstatedir}/log/%{name}
 
 Name:           tor
 Version:        0.2.3.25
@@ -33,12 +30,9 @@ Obsoletes:      tor-doc < 0.2.2
 
 BuildRequires:  libevent-devel openssl-devel asciidoc
 BuildRequires:  fedora-usermgmt-devel
-Provides:       user(%{username})  = %uid
-Provides:       group(%{username}) = %uid
 Requires:       init(%{name})
 Requires(pre):     /etc/logrotate.d
 Requires(postun):  /etc/logrotate.d
-%{?FE_USERADD_REQ}
 
 
 %package -n torify
@@ -46,7 +40,7 @@ Summary:        The torify wrapper script
 Group:          System Environment/Daemons
 Requires:       torsocks
 Requires:       %{name}-core = %{version}-%{release}
-%{?noarch}
+BuildArch:      noarch
 
 
 %package systemd
@@ -58,7 +52,7 @@ Requires:       %{name}-core = %{version}-%{release}
 Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
-%{?noarch}
+BuildArch:      noarch
 
 
 %package upstart
@@ -70,7 +64,7 @@ Requires:       %{name}-core = %{version}-%{release}
 Requires(pre):     /etc/init
 Requires(post):    /usr/bin/killall
 Requires(postun):  /sbin/initctl
-%{?noarch}
+BuildArch:      noarch
 
 
 %description
@@ -125,7 +119,7 @@ daemon.
 
 %build
 export LDFLAGS='-Wl,--as-needed'
-%configure --with-tor-user=%{username} --with-tor-group=%{username}
+%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup}
 make %{?_smp_mflags}
 
 
@@ -137,7 +131,7 @@ sed -i -e "s|#DataDirectory.*$|DataDirectory %{homedir}/.tor|g" \
     $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
 cat << EOF >> $RPM_BUILD_ROOT%{_sysconfdir}/tor/torrc
 Log notice syslog
-User %{username}
+User %{toruser}
 EOF
 
 mkdir -p $RPM_BUILD_ROOT%{logdir}
@@ -159,15 +153,12 @@ mv _doc/torify.html _doc-torify
 %{!?with_upstart:  rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init}
 
 
-%pre core
-%__fe_groupadd %uid -r %{username} &>/dev/null || :
-%__fe_useradd  %uid -r -s /sbin/nologin -d %{homedir} -M \
-                    -c 'TOR anonymizing user' \
-                    -g %{username} %{username} &>/dev/null || :
-
-%postun core
-%__fe_userdel  %{username} &>/dev/null || :
-%__fe_groupdel %{username} &>/dev/null || :
+%pre
+getent group %{torgroup} >/dev/null || groupadd -r %{torgroup}
+getent passwd %{toruser} >/dev/null || \
+    useradd -r -s /sbin/nologin -d %{homedir} -M \
+    -c 'TOR anonymizing user' -g %{torgroup} %{toruser}
+exit 0
 
 %post systemd
 if [ $1 -eq 1 ]; then
@@ -187,7 +178,7 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %postun upstart
-/usr/bin/killall -u %{username} -s INT tor 2>/dev/null || :
+/usr/bin/killall -u %{toruser} -s INT tor 2>/dev/null || :
 
 %preun upstart
 test "$1" != "0" || /sbin/initctl -q stop tor || :
@@ -205,12 +196,14 @@ test "$1" != "0" || /sbin/initctl -q stop tor || :
 %{_mandir}/man1/tor.1*
 %{_mandir}/man1/tor-gencert.1*
 %{_mandir}/man1/tor-resolve.1*
+
 %dir %{_sysconfdir}/tor
-%attr(0640,root,%{username}) %config(noreplace) %{_sysconfdir}/tor/torrc
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/tor/torrc
 %config(noreplace) %{_sysconfdir}/logrotate.d/tor
-%attr(0700,%{username},%{username}) %dir %{homedir}
-%attr(0750,%{username},%{username}) %dir %{logdir}
-%attr(0750,%{username},%{username}) %dir %{_localstatedir}/run/tor
+
+%attr(0700,%{toruser},%{torgroup}) %dir %{homedir}
+%attr(0750,%{toruser},%{torgroup}) %dir %{logdir}
+%attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/run/tor
 
 %exclude %{_mandir}/man1/torify.1*
 %exclude %{_bindir}/torify
@@ -237,6 +230,7 @@ test "$1" != "0" || /sbin/initctl -q stop tor || :
 %changelog
 * Mon Mar 11 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1702
 - add missing %%{?dist}
+- remove dependency on fedora-usermgmt
 
 * Thu Feb 07 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1701
 - torify subpackage should depend on torsocks not tsocks (#908569)