SPECS: inspircd.spec - add conf file (should be secure by default)

[aredridel]

Author: aredridel                    Date: Mon Apr 23 18:55:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add conf file (should be secure by default)

---- Files affected:
SPECS:
   inspircd.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/inspircd.spec
diff -u SPECS/inspircd.spec:1.1 SPECS/inspircd.spec:1.2
--- SPECS/inspircd.spec:1.1	Mon Apr 23 17:59:20 2007
+++ SPECS/inspircd.spec	Mon Apr 23 20:54:57 2007
@@ -7,8 +7,8 @@
 Group:		Networking/Daemons
 URL:		http://www.inspircd.org/
 BuildRequires:	gcc-c++
+BuildRequires:	gnutls-devel
 BuildRequires:	mysql-devel
-BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
 BuildRequires:	postgresql-devel
@@ -18,6 +18,7 @@
 Source0:	http://www.inspircd.org/downloads/InspIRCd-%{version}.tar.bz2
 # Source0-md5:	b94e33527a10d15edc5a5b9291428cc0
 Source1:	%{name}.init
+Source2:	%{name}.conf
 Patch1:		%{name}-1.1b8_default_config.patch
 Patch2:		%{name}-1.1.2-m_no_op_on_channel_create.patch
 
@@ -55,7 +56,7 @@
 	--enable-ipv6 \
 	--enable-remote-ipv6 \
 	--enable-epoll \
-	--enable-openssl \
+	--enable-gnutls \
 	--prefix=%{_prefix}/lib/%{name}/ \
 	--config-dir=%{_sysconfdir}/%{name} \
 	--library-dir=%{_libdir}/%{name}/ \
@@ -66,10 +67,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/%{name},/var/run/%{name},/var/log/%{name},%{_sysconfdir}/init.d}
+install -d $RPM_BUILD_ROOT{/var/lib/%{name},/var/run/%{name},/var/log/%{name},%{_sysconfdir}/rc.d/init.d}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT INSTMODE="0755"
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+
+for file in $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/*.example; do
+	mv $file `echo $file | sed -e 's/.example//'`
+done
+
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 %pre
 %groupadd -g 216 inspircd
@@ -109,27 +116,15 @@
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.conf
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.quotes
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.rules
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.conf.example
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.quotes.example
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.rules.example
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.censor
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.censor.example
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.filter
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.filter.example
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.helpop
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.helpop-full
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.helpop-full.example
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.helpop.example
 %config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.motd
-%config(noreplace) %attr(640,root,inspircd) %{_sysconfdir}/%{name}/inspircd.motd.example
 %attr(750,inspircd,inspircd) /var/lib/%{name}
 %attr(750,inspircd,inspircd) /var/run/%{name}
 %attr(750,inspircd,inspircd) /var/log/%{name}
-#
-%dir %{_prefix}/lib/%{name}
-%{_prefix}/lib/%{name}/%{name}
-%{_prefix}/lib/%{name}/.gdbargs
-#
+
 %dir %{_libdir}/%{name}/
 %attr(755,root,root) %{_libdir}/%{name}/cmd_*.so
 %attr(755,root,root) %{_libdir}/%{name}/libIRCD*.so
@@ -210,7 +205,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/modules/m_spanningtree.so
 %attr(755,root,root) %{_libdir}/%{name}/modules/m_spy.so
 %attr(755,root,root) %{_libdir}/%{name}/modules/m_ssl_dummy.so
-%attr(755,root,root) %{_libdir}/%{name}/modules/m_ssl_openssl.so
+%attr(755,root,root) %{_libdir}/%{name}/modules/m_ssl_gnutls.so
 %attr(755,root,root) %{_libdir}/%{name}/modules/m_sslmodes.so
 %attr(755,root,root) %{_libdir}/%{name}/modules/m_stripcolor.so
 %attr(755,root,root) %{_libdir}/%{name}/modules/m_svshold.so
@@ -256,6 +251,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/04/23 18:54:57  aredridel
+- add conf file (should be secure by default)
+
 Revision 1.1  2007/04/23 15:59:20  aredridel
 - added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/inspircd.spec?r1=1.1&r2=1.2&f=u