rpms/pyicq-t/devel import.log, NONE, 1.1 .cvsignore, 1.7, 1.8 config.patch, 1.2, 1.3 pyicq-t.init, 1.2, 1.3 pyicq-t.spec, 1.15, 1.16 sources, 1.7, 1.8
Stefan Schulze Frielinghaus
stefansf at fedoraproject.org
Fri Sep 18 08:28:50 UTC 2009
- Previous message (by thread): rpms/gcc/devel gcc44-ppc64-aixdesc.patch, NONE, 1.1 .cvsignore, 1.292, 1.293 gcc.spec, 1.71, 1.72 sources, 1.296, 1.297 gcc44-rh518303.patch, 1.1, NONE
- Next message (by thread): comps comps-f12.xml.in,1.118,1.119
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stefansf
Update of /cvs/pkgs/rpms/pyicq-t/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20824/devel
Modified Files:
.cvsignore config.patch pyicq-t.init pyicq-t.spec sources
Added Files:
import.log
Log Message:
- Daemon starts as user pyicqt and not as root
- New upstream release
- Several fixes for the init script to be more compliant with the guidelines
--- NEW FILE import.log ---
pyicq-t-0_8_1_5-5_fc11:HEAD:pyicq-t-0.8.1.5-5.fc11.src.rpm:1253262301
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 15 Jun 2009 07:43:37 -0000 1.7
+++ .cvsignore 18 Sep 2009 08:28:50 -0000 1.8
@@ -1 +1 @@
-pyicqt-0.8.1.3.tar.gz
+pyicqt-0.8.1.5.tar.gz
config.patch:
config_example.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- config.patch 11 Jul 2008 00:18:22 -0000 1.2
+++ config.patch 18 Sep 2009 08:28:50 -0000 1.3
@@ -1,5 +1,5 @@
---- config_example.xml.orig 2006-07-26 09:10:46.000000000 -0500
-+++ config_example.xml 2006-07-26 09:13:02.000000000 -0500
+--- config_example.xml 2009-09-15 09:02:36.000000000 -0500
++++ config_example.xml 2009-09-15 09:03:02.000000000 -0500
@@ -7,11 +7,11 @@
<!-- The location of the spool directory.. if relative, relative to -->
@@ -10,7 +10,7 @@
<!-- The location of the PID file.. if relative, relative to this dir. -->
<!-- Comment out if you do not want a pid file -->
- <pid>PyICQt.pid</pid>
-+ <pid>/var/run/pyicq-t.pid</pid>
++ <pid>/var/run/pyicq-t/pyicq-t.pid</pid>
<!-- The IP address of the main Jabberd server -->
<mainServer>127.0.0.1</mainServer>
Index: pyicq-t.init
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/pyicq-t.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pyicq-t.init 31 Oct 2006 21:39:22 -0000 1.2
+++ pyicq-t.init 18 Sep 2009 08:28:50 -0000 1.3
@@ -1,58 +1,96 @@
#!/bin/bash
-# pyicq-t
#
-# chkconfig: - 45 65
-# description: pyicq-t
-# processname: pyicq-t
-# pidfile: /var/run/pyicq-t.pid
+# PyICQt Start and stop pyicq-t.
+
+# chkconfig: - 99 01
+# description: PyICQt is an ICQ transport for Jabber/XMPP.
+# config: /etc/pyicq-t/config.xml
+# pidfile: /var/run/pyicq-t/pyicq-t.pid
+# lockfile: /var/lock/subsys/pyicq-t
. /etc/rc.d/init.d/functions
+prog="PyICQt"
+exec="/usr/share/pyicq-t/PyICQt.py"
+config="/etc/pyicq-t/config.xml"
+pidfile="/var/run/pyicq-t/pyicq-t.pid"
+lockfile="/var/lock/subsys/pyicq-t"
+
start() {
- echo -n $"Starting ICQ transport: "
- (cd /usr/share/pyicq-t; python ./PyICQt.py --background --config=/etc/pyicq-t/config.xml) && success || failure
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pyicq-t
- echo
- return $RETVAL
+ [ -x $exec ] || exit 5
+ [ -f $config ] || exit 6
+ echo -n $"Starting $prog: "
+ daemon --user=pyicqt --pidfile=$pidfile $exec \
+ --background \
+ --config=${config} \
+ --log=/var/log/pyicq-t.log
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch $lockfile
+ return $RETVAL
}
stop() {
- # Stop daemons.
- echo -n "Shutting down ICQ transport: "
- killproc pyicq-t
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/pyicq-t
- echo
- return $RETVAL
+ echo -n $"Shutting down $prog: "
+ killproc -p $pidfile
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && rm -f $lockfile
+ return $RETVAL
}
restart() {
- stop
- start
+ stop
+ sleep 1
+ start
+}
+
+reload() {
+ echo -n $"Reloading $prog: "
+ killproc -p $pidfile $prog -HUP
+ RETVAL=$?
+ echo
+ return $RETVAL
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status -p $pidfile $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
}
-# See how we were called.
case "$1" in
start)
- start
- ;;
+ start
+ ;;
stop)
- stop
- ;;
+ stop
+ ;;
restart)
- restart
- ;;
- condrestart)
- [ -f /var/lock/subsys/pyicq-t ] && restart || :
- ;;
+ restart
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ reload)
+ reload
+ ;;
+ force-reload)
+ force_reload
+ ;;
status)
- status pyicq-t
- RETVAL=$?
+ rh_status
;;
*)
- echo "Usage: pyicq-t {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
+ echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+ exit 2
esac
-exit $RETVAL
+exit $?
Index: pyicq-t.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/pyicq-t.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- pyicq-t.spec 26 Jul 2009 19:52:18 -0000 1.15
+++ pyicq-t.spec 18 Sep 2009 08:28:50 -0000 1.16
@@ -1,14 +1,14 @@
%{!?python_standard_lib: %define python_standard_lib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(standard_lib=1)")}
Name: pyicq-t
-Version: 0.8.1.3
-Release: 2%{?dist}
+Version: 0.8.1.5
+Release: 5%{?dist}
Summary: ICQ Transport for Jabber Servers
Group: Applications/Internet
License: GPLv2+
URL: http://code.google.com/p/pyicqt/
-Source0: http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
+Source0: http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
Source1: pyicq-t.init
Patch0: config.patch
@@ -16,12 +16,15 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
BuildArch: noarch
BuildRequires: python-devel
-Requires: python-twisted-core
+Requires: python-twisted-core
Requires: python-twisted-web
-Requires: python-twisted-words
+Requires: python-twisted-words
Requires: python-imaging
Requires: pyOpenSSL
+Requires(pre): shadow-utils
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
@@ -55,24 +58,32 @@ MySQL backend for ICQ transport
%install
rm -rf %{buildroot}
+chmod 644 src/chardet_utf/*.py
+chmod 644 tools/managessi.py
+chmod 644 tools/migrate.py
+
mkdir -p %{buildroot}/etc/pyicq-t
mkdir -p %{buildroot}%{_datadir}/pyicq-t
+mkdir -p %{buildroot}%{_localstatedir}/run/pyicq-t
mkdir -p %{buildroot}/var/spool/pyicq-t
mkdir -p %{buildroot}%{_initrddir}
cp %{S:1} %{buildroot}%{_initrddir}/pyicq-t
-chmod a+x %{buildroot}%{_initrddir}/pyicq-t
-touch %{buildroot}/etc/pyicq-t/config.xml
+cp config_example.xml %{buildroot}/etc/pyicq-t/config.xml
cp PyICQt.py* %{buildroot}%{_datadir}/pyicq-t
-chmod a+x %{buildroot}%{_datadir}/pyicq-t/PyICQt.py
cp -r data %{buildroot}%{_datadir}/pyicq-t
cp -r src %{buildroot}%{_datadir}/pyicq-t
-
+
%clean
rm -rf %{buildroot}
+%pre
+/usr/sbin/groupadd -f -r pyicqt
+/usr/sbin/useradd -c "PyICQt" -g pyicqt \
+ -s /sbin/nologin -r -d /var/spool/pyicq-t pyicqt 2> /dev/null || :
+
%post
/sbin/chkconfig --add pyicq-t
@@ -91,15 +102,22 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog config_example.xml COPYING INSTALL NEWS README tools/managessi.py tools/migrate.py
-%{_initrddir}/pyicq-t
+%attr(0755,root,root) %{_initrddir}/pyicq-t
-%dir %{_sysconfdir}/pyicq-t
-%ghost %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
+%attr(0700,pyicqt,pyicqt) %dir %{_sysconfdir}/pyicq-t
+%attr(0600,pyicqt,pyicqt) %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
%exclude %{_datadir}/pyicq-t/src/xdb/mysql.py*
-%{_datadir}/pyicq-t
+%dir %{_datadir}/pyicq-t
+%{_datadir}/pyicq-t/data
+%attr(0755,root,root) %{_datadir}/pyicq-t/PyICQt.py
+%{_datadir}/pyicq-t/PyICQt.pyc
+%{_datadir}/pyicq-t/PyICQt.pyo
+%{_datadir}/pyicq-t/src
-%dir %{_localstatedir}/spool/pyicq-t
+%attr(0700,pyicqt,pyicqt) %dir %{_localstatedir}/spool/pyicq-t
+
+%attr(0755,pyicqt,pyicqt) %dir %{_localstatedir}/run/pyicq-t
%files mysql
%defattr(-,root,root,-)
@@ -108,6 +126,34 @@ fi
%{_datadir}/pyicq-t/src/xdb/mysql.py*
%changelog
+* Tue Sep 15 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-5
+- Fixed inclusion of /usr/share/pyicq-t
+- Create a default config file, removed ghost entry
+- Fixed init script, status didn't show the application name
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-4
+- Make init script more compatible, e.g. "exit 2" if invalid arguments supplied,
+ killproc needs prog name otherwise the signal won't be used and a couple of
+ other minor fixes.
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-3
+- Added try-restart, reload and force-reload to the init script
+- Fixed permissions
+- Fixed typo in config.patch
+
+* Mon Sep 14 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-2
+- Some whitespace fixes
+- Added shadow-utils as a requirement
+- Removed empty config file creation and changed it to copy an example config file
+
+* Fri Sep 11 2009 Stefan Schulze Frielinghaus <stefan at seekline.net> - 0.8.1.5-1
+- New upstream release.
+- Changed init script to run pyicq-t as non root user and changed permissions of the config
+ file because it contains a cleartext password.
+- Changed start/stop time of the init script to fix race condition with ejabberd.
+- Changed init script to call "PyICQt.py" directly and not via
+ "python PyICQt.py" this makes it easier to write a SELinux policy for.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pyicq-t/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 15 Jun 2009 07:43:37 -0000 1.7
+++ sources 18 Sep 2009 08:28:50 -0000 1.8
@@ -1 +1 @@
-0a94e1aaa3079b68a3f180705f961836 pyicqt-0.8.1.3.tar.gz
+d1c544f82ed416bbe987a5e419820fa8 pyicqt-0.8.1.5.tar.gz
- Previous message (by thread): rpms/gcc/devel gcc44-ppc64-aixdesc.patch, NONE, 1.1 .cvsignore, 1.292, 1.293 gcc.spec, 1.71, 1.72 sources, 1.296, 1.297 gcc44-rh518303.patch, 1.1, NONE
- Next message (by thread): comps comps-f12.xml.in,1.118,1.119
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list