SPECS: portmap.spec - reverted rpc_user patch to use "rpc" user, b...

qboosh qboosh at pld-linux.org
Sat Mar 11 20:28:12 CET 2006


Author: qboosh                       Date: Sat Mar 11 19:28:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted rpc_user patch to use "rpc" user, but this time creating this user on install
- release 18

---- Files affected:
SPECS:
   portmap.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/portmap.spec
diff -u SPECS/portmap.spec:1.53 SPECS/portmap.spec:1.54
--- SPECS/portmap.spec:1.53	Mon Jan 30 17:28:07 2006
+++ SPECS/portmap.spec	Sat Mar 11 20:28:07 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Portmapper RPC
 Name:		portmap
 Version:	5beta
-Release:	17
+Release:	18
 Group:		Daemons
 License:	BSD
 Source0:	ftp://ftp.porcupine.org/pub/security/%{name}_%{version}.tar.gz
@@ -22,10 +22,11 @@
 Patch6:		%{name}-sigpipe.patch
 Patch7:		%{name}-man.patch
 BuildRequires:	libwrap-devel
-Conflicts:	libwrap < 7.6-38
+Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 Requires:	/sbin/chkconfig
-Requires(post,preun):	/sbin/chkconfig
+Provides:	user(rpc)
+Conflicts:	libwrap < 7.6-38
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -64,7 +65,9 @@
 %patch7 -p1
 
 %build
-%{__make} OPT="%{rpmcflags}" \
+%{__make} \
+	CC="%{__cc}" \
+	OPT="%{rpmcflags}" \
 	FACILITY=LOG_AUTH \
 	AUX= \
 	ZOMBIES=-DIGNORE_SIGCHLD
@@ -72,7 +75,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8}
-install -d $RPM_BUILD_ROOT{/var/lib/misc,%{_sysconfdir}/{sysconfig,rc.d/init.d}}
+install -d $RPM_BUILD_ROOT{/var/lib/misc,/etc/{sysconfig,rc.d/init.d}}
 
 install pmap_dump pmap_set portmap $RPM_BUILD_ROOT%{_sbindir}
 install pmap_dump.8 pmap_set.8 portmap.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -82,6 +85,12 @@
 
 touch $RPM_BUILD_ROOT/var/lib/misc/portmap.dump
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre
+%useradd -u 22 -d /usr/share/empty -s /bin/false -c "Portmapper RPC User" -g nobody rpc
+
 %post
 /sbin/chkconfig --add portmap
 if [ -f /var/lock/subsys/portmap ]; then
@@ -98,8 +107,10 @@
 	/sbin/chkconfig --del portmap
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%postun
+if [ "$1" = "0" ]; then
+	%userremove rpc
+fi
 
 %triggerpostun -- portmap <= portmap-4.0-9
 /sbin/chkconfig --add portmap
@@ -119,6 +130,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/03/11 19:28:07  qboosh
+- reverted rpc_user patch to use "rpc" user, but this time creating this user on install
+- release 18
+
 Revision 1.53  2006/01/30 16:28:07  baggins
 - release 17
 - vserver friendly fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/portmap.spec?r1=1.53&r2=1.54&f=u



More information about the pld-cvs-commit mailing list