[smstools/el6/master] Update to 3.1.14
Patrick Charles François Ernzer
pcfe at fedoraproject.org
Fri Jan 21 15:25:25 UTC 2011
commit 63299f5dd1afb5b1d2b1603796bae65e596e3027
Author: Patrick C. F. Ernzer <pcfe at redhat.com>
Date: Fri Jan 21 17:22:29 2011 +0200
Update to 3.1.14
.gitignore | 1 +
smstools.spec | 86 +++++++++++++++++++++++++++++++++++++++++++++++++--------
sources | 2 +-
3 files changed, 76 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d41ac5b..4639bea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
smstools3-3.1.3.tar.gz
+/smstools3-3.1.14.tar.gz
diff --git a/smstools.spec b/smstools.spec
index 3b4e191..ec4bf8e 100644
--- a/smstools.spec
+++ b/smstools.spec
@@ -1,6 +1,9 @@
+%define _varlogdir %{_localstatedir}/log/smsd
+%define _varrundir %{_localstatedir}/run/smsd
+
Name: smstools
-Version: 3.1.3
-Release: 7%{?dist}
+Version: 3.1.14
+Release: 1%{?dist}
Summary: Tools to send and receive short messages through GSM modems or mobile phones
License: GPLv2+
@@ -9,7 +12,7 @@ URL: http://smstools3.kekekasvi.com
Source0: http://smstools3.kekekasvi.com/packages/smstools3-%{version}.tar.gz
Source1 : smsd.init
Source2: smsd.logrotate
-Patch0: smstools3-3.1.3-perm.patch
+Patch0: smstools3-3.1.5-loglocation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
@@ -24,14 +27,14 @@ programs for automatic actions.
%prep
%setup -q -n smstools3
-%patch0 -p1 -b .perm
+%patch0 -p1 -b .loglocation
mv doc manual
mv examples/.procmailrc examples/procmailrc
mv examples/.qmailrc examples/qmailrc
find scripts/ examples/ manual/ -type f -print0 |xargs -0 chmod 644
%build
-make -C src 'CFLAGS=%{optflags} -DNOSTATS' %{_smp_mflags}
+make -C src 'CFLAGS=%{optflags} -DNOSTATS -D NUMBER_OF_MODEMS=64' %{_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -49,6 +52,14 @@ install -dm 750 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/failed
install -dm 750 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/incoming
install -dm 770 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/outgoing
install -dm 750 $RPM_BUILD_ROOT%{_localstatedir}/spool/sms/sent
+mkdir -p ${RPM_BUILD_ROOT}%{_varlogdir}
+mkdir -p ${RPM_BUILD_ROOT}%{_varlogdir}/smsd_stats
+mkdir -p ${RPM_BUILD_ROOT}%{_varrundir}
+
+# Create ghost files
+for n in smsd.log smsd_trouble.log; do
+ touch ${RPM_BUILD_ROOT}%{_varlogdir}/$n
+done
%clean
rm -rf $RPM_BUILD_ROOT
@@ -56,11 +67,29 @@ rm -rf $RPM_BUILD_ROOT
%pre
getent group smstools >/dev/null || groupadd -r smstools
+# on older releases we need to use uucp (here it seems only the uucp group exists)
+# on newer releases it's dialout (here it seems both groups exist)
+# it would be more elegant to base my if clause on the udev rules instead of the group existence
+if [ `getent group dialout` ]
+ then
+ getent passwd smstools >/dev/null || useradd -r -d /var/lib/smstools -m -g smstools -G dialout smstools
+ else
+ getent passwd smstools >/dev/null || useradd -r -d /var/lib/smstools -m -g smstools -G uucp smstools
+fi
+
+
%post
if [ $1 -eq 0 ]; then
/sbin/chkconfig --add smsd
fi
+# Create initial log files so that logrotate doesn't complain
+for n in smsd.log smsd_trouble.log; do
+ [ -f %{_varlogdir}/$n ] || touch %{_varlogdir}/$n
+ chown smstools:smstools %{_varlogdir}/$n
+ chmod 640 %{_varlogdir}/$n
+done
+
%preun
if [ $1 -eq 0 ]; then
/sbin/service smsd stop >/dev/null 2>&1
@@ -81,15 +110,48 @@ fi
%{_initrddir}/smsd
%config(noreplace) %{_sysconfdir}/logrotate.d/smstools
%config(noreplace) %{_sysconfdir}/smsd.conf
-%dir %{_localstatedir}/spool/sms/
-%dir %{_localstatedir}/spool/sms/checked
-%dir %{_localstatedir}/spool/sms/failed
-%dir %{_localstatedir}/spool/sms/incoming
-%attr(-,root,smstools) %dir %{_localstatedir}/spool/sms/outgoing
-%dir %{_localstatedir}/spool/sms/sent
-
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/checked
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/failed
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/incoming
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/outgoing
+%attr(-,smstools,smstools) %dir %{_localstatedir}/spool/sms/sent
+%attr(0750,smstools,smstools) %dir %{_varlogdir}
+%attr(0640,smstools,smstools) %ghost %{_varlogdir}/smsd.log
+%attr(0640,smstools,smstools) %ghost %{_varlogdir}/smsd_trouble.log
+%attr(0750,smstools,smstools) %dir %{_varlogdir}/smsd_stats
+%attr(0700,smstools,smstools) %dir %{_varrundir}
%changelog
+* Fri Jan 21 2011 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.14-1
+- New upstream release
+
+* Fri Jan 21 2011 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.8-3
+- corrected missing /var/run/smsd directory (BZ#605203)
+
+* Thu Jan 20 2011 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.8-2
+- added if clause for deciding between uucp and dialout group (BZ#605211)
+
+* Mon May 31 2010 Marek Mahut <mmahut at fedoraproject.org> 3.1.8-1
+- New upstream release
+
+* Thu Oct 15 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-4
+- added flag -m to useradd
+
+* Tue Oct 13 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-3
+- after deliberation, decided on having system user (mysql user also has shell, so this should be OK)
+
+* Sun Oct 11 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-2
+- corrected typo in my name in previous changelog entry
+- log files now go to /var/log/smsd (copied that bit from the uucp RPM)
+- creating smstools user if it does not exist
+- will run as user smstools now, did not manage to make it work as system user without login though
+
+* Sun Sep 6 2009 Patrick C. F. Ernzer <smstools.spec at pcfe.net> 3.1.5-1
+- bump to 3.1.5
+- removed perm patch
+- added -D NUMBER_OF_MODEMS=64 to make line
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index 4fa918a..2ee828e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfec9dc1f8ae37fd5b189676f60c657c smstools3-3.1.3.tar.gz
+e0f9f84240f0db9a286aa3a5fa3bd8fb smstools3-3.1.14.tar.gz
More information about the scm-commits
mailing list