packages: bitlbee/bitlbee.spec, bitlbee/config.patch (NEW)=?UTF-8?Q?=20?=- add dedicated ...

[glen]

Author: glen                         Date: Sun Apr 15 08:35:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add dedicated bitlbee user

---- Files affected:
packages/bitlbee:
   bitlbee.spec (1.11 -> 1.12) , config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bitlbee/bitlbee.spec
diff -u packages/bitlbee/bitlbee.spec:1.11 packages/bitlbee/bitlbee.spec:1.12
--- packages/bitlbee/bitlbee.spec:1.11	Sun Apr 15 00:20:55 2012
+++ packages/bitlbee/bitlbee.spec	Sun Apr 15 10:35:37 2012
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO
 # - sync pl
-# - bilbee user
 #
 # Conditional build:
 %bcond_without	otr		# build without OTR
@@ -10,16 +9,26 @@
 Summary(pl.UTF-8):	Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi
 Name:		bitlbee
 Version:	3.0.5
-Release:	0.6
+Release:	0.8
 License:	GPL v2+ and MIT
 Group:		Daemons
 Source0:	http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 # Source0-md5:	9ff97260a2a7f3a7d102db158a8d9887
 URL:		http://www.bitlbee.org/
+Patch0:		config.patch
 BuildRequires:	asciidoc
 BuildRequires:	gnutls-devel
 %{?with_otr:BuildRequires:	libotr-devel >= 3.2.0}
+BuildRequires:	rpmbuild(macros) >= 1.461
 BuildRequires:	systemd-units
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Provides:	group(bitlbee)
+Provides:	user(bitlbee)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,6 +72,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 # fix wrong assumption with $DESTDIR
 %{__sed} -i -e 's,$(shell id -u),0,' Makefile
@@ -103,18 +113,28 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 280 bitlbee
+%useradd -u 280 -d /var/lib/bitlbee -g bitlbee -c "Bitlbee User" bitlbee
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove bitlbee
+	%groupremove bitlbee
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/bitlbee.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/motd.txt
+%dir %attr(750,root,bitlbee) %{_sysconfdir}/%{name}
+%attr(640,root,bitlbee) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/bitlbee.conf
+%attr(640,root,bitlbee) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/motd.txt
 %attr(755,root,root) %{_sbindir}/bitlbee
 %{_mandir}/man5/bitlbee.conf.5*
 %{_mandir}/man8/bitlbee.8*
 %{_datadir}/bitlbee
 %dir %{_libdir}/%{name}
-%attr(700,root,root) %{_localstatedir}/lib/bitlbee
+%attr(770,root,bitlbee) %{_localstatedir}/lib/bitlbee
 %{systemdunitdir}/bitlbee.service
 %{systemdunitdir}/bitlbee.socket
 %{systemdunitdir}/bitlbee at .service
@@ -134,9 +154,9 @@
 %files protocol-skype
 %defattr(644,root,root,755)
 %doc protocols/skype/{HACKING,NEWS,README,skyped.txt}
-%dir %{_sysconfdir}/skyped
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/skyped/skyped.cnf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/skyped/skyped.conf
+%dir %attr(750,root,bitlbee) %{_sysconfdir}/skyped
+%attr(640,root,bitlbee) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/skyped/skyped.cnf
+%attr(640,root,bitlbee) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/skyped/skyped.conf
 %attr(755,root,root) %{_libdir}/%{name}/skype.so
 %attr(755,root,root) %{_sbindir}/skyped
 %{_mandir}/man1/skyped.1*
@@ -147,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2012/04/15 08:35:37  glen
+- add dedicated bitlbee user
+
 Revision 1.11  2012/04/14 22:20:55  glen
 - enable skype protocol plugin
 

================================================================
Index: packages/bitlbee/config.patch
diff -u /dev/null packages/bitlbee/config.patch:1.1
--- /dev/null	Sun Apr 15 10:35:42 2012
+++ packages/bitlbee/config.patch	Sun Apr 15 10:35:37 2012
@@ -0,0 +1,21 @@
+Index: bitlbee-3.0.3/bitlbee.conf
+===================================================================
+--- bitlbee-3.0.3.orig/bitlbee.conf
++++ bitlbee-3.0.3/bitlbee.conf
+@@ -23,14 +23,14 @@
+ ## If BitlBee is started by root as a daemon, it can drop root privileges,
+ ## and change to the specified user.
+ ##
+-# User = bitlbee
++User = bitlbee
+ 
+ ## DaemonPort/DaemonInterface:
+ ##
+ ## For daemon mode, you can specify on what interface and port the daemon
+ ## should be listening for connections.
+ ##
+-# DaemonInterface = 0.0.0.0
++DaemonInterface = 127.0.0.1
+ # DaemonPort = 6667
+ 
+ ## ClientInterface:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/bitlbee/bitlbee.spec?r1=1.11&r2=1.12