rpms/unbound/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 unbound.init, 1.4, 1.5 unbound.spec, 1.7, 1.8 unbound-1.1.0-log_open.patch, 1.1, NONE

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13223

Modified Files:
	.cvsignore sources unbound.init unbound.spec 
Removed Files:
	unbound-1.1.0-log_open.patch 
Log Message:
- removed all obsolete chroot related stuff
- label control certs after generation correctly



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Nov 2008 15:10:25 -0000	1.4
+++ .cvsignore	28 Nov 2008 09:46:49 -0000	1.5
@@ -1,2 +1 @@
-unbound-1.1.0.tar.gz
 unbound-1.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Nov 2008 15:10:25 -0000	1.5
+++ sources	28 Nov 2008 09:46:49 -0000	1.6
@@ -1,2 +1 @@
-f1c8110ed62e3aa0423e24b6c0f3a9c4  unbound-1.1.0.tar.gz
 43586f18b4d917887c92a35ff460c923  unbound-1.1.1.tar.gz


Index: unbound.init
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- unbound.init	19 Nov 2008 23:11:51 -0000	1.4
+++ unbound.init	28 Nov 2008 09:46:49 -0000	1.5
@@ -38,6 +38,8 @@
     then
 	echo -n $"Generating unbound control key and certificate: "
 	/usr/sbin/unbound-control-setup -d /etc/unbound/ > /dev/null 2> /dev/null
+	[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && \
+	    [ -x /sbin/restorecon ] && /sbin/restorecon /etc/unbound/*
 	echo
     fi
 


Index: unbound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unbound.spec	20 Nov 2008 15:10:25 -0000	1.7
+++ unbound.spec	28 Nov 2008 09:46:49 -0000	1.8
@@ -1,9 +1,7 @@
-%define rootdir %{_localstatedir}/lib/%{name}
-
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.1.1
-Release: 0%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -66,7 +64,6 @@
 %build
 %configure  --with-ldns= --with-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
-            --with-run-dir=%{rootdir} \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
             --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid
 %{__make} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" QUIET=no %{?_smp_mflags}
@@ -74,7 +71,6 @@
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{rootdir}
 install -d 0755 %{buildroot}%{_initrddir}
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
 install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
@@ -101,8 +97,6 @@
 %attr(0755,root,root) %{_initrddir}/%{name}
 %attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf
-# the chroot env
-%attr(0755,root,root) %dir %{rootdir}
 %{_sbindir}/*
 %{_mandir}/*/*
 
@@ -125,26 +119,13 @@
 %pre
 getent group unbound >/dev/null || groupadd -r unbound
 getent passwd unbound >/dev/null || \
-useradd -r -g unbound -d %{rootdir} -s /sbin/nologin \
+useradd -r -g unbound -d %{_sysconfdir}/unbound -s /sbin/nologin \
 -c "Unbound DNS resolver" unbound
 exit 0
 
 %post 
 /sbin/chkconfig --add %{name}
 
-# if our config lives in /var/lib/unbound, move it to /etc/unbound/unbound.conf
-if [ -f %{_localstatedir}/lib/%{name}/unbound.conf ]; then
-     rm -f %{_sysconfdir}/unbound.conf.rpmnew
-     mv  %{_sysconfdir}/unbound.conf  %{_sysconfdir}/unbound.conf.rpmnew
-     mv %{_localstatedir}/lib/%{name}/unbound.conf %{_sysconfdir}/unbound.conf
-     if [ -L %{_sysconfdir}/unbound.conf ]; then
-          rm -f %{_sysconfdir}/unbound.conf
-     fi
-fi
-# Remove old chroot stuff - not using rootdir in purpose in case it changes
-rm -rf %{_localstatedir}/lib/%{name}/dev %{_localstatedir}/lib/%{name}/etc \
-       %{_localstatedir}/lib/%{name}/var
-
 %post libs -p /sbin/ldconfig
 
 
@@ -162,6 +143,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Nov 28 2008 Adam Tkac <atkac redhat com> - 1.1.1-2
+- removed all obsolete chroot related stuff
+- label control certs after generation correctly
+
 * Thu Nov 20 2008 Paul Wouters <paul at xelerance.com> - 1.1.1-1
 - Updated to unbound 1.1.1 which fixes a crasher and
   addresses nlnetlabs bug #219


--- unbound-1.1.0-log_open.patch DELETED ---