rpms/dbmail/FC-6 dbmail-short-write.patch, NONE, 1.1 dbmail.spec, 1.4, 1.5
Bernard Johnson (bjohnson)
fedora-extras-commits at redhat.com
Thu Mar 22 16:08:01 UTC 2007
Author: bjohnson
Update of /cvs/extras/rpms/dbmail/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2324/FC-6
Modified Files:
dbmail.spec
Added Files:
dbmail-short-write.patch
Log Message:
minor spec file updates
patch to fix short writes
dbmail-short-write.patch:
--- NEW FILE dbmail-short-write.patch ---
Index: dbmail-message.c
===================================================================
--- dbmail-message.c (revision 2472)
+++ dbmail-message.c (revision 2473)
@@ -372,7 +372,7 @@
if ((type==DBMAIL_STREAM_LMTP) && (strncmp(buf,".\r\n",3)==0))
break;
- putslen = g_mime_stream_write_string(fstream, buf);
+ putslen = g_mime_stream_write(fstream, buf, getslen);
if (g_mime_stream_flush(fstream)) {
TRACE(TRACE_ERROR, "Failed to flush, is your /tmp filesystem full?");
Index: dbmail.spec
===================================================================
RCS file: /cvs/extras/rpms/dbmail/FC-6/dbmail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbmail.spec 21 Mar 2007 18:42:25 -0000 1.4
+++ dbmail.spec 22 Mar 2007 16:07:28 -0000 1.5
@@ -12,7 +12,7 @@
Name: dbmail
Version: 2.2.4
-Release: 2%{?dist}%{?repotag:.%{repotag}}
+Release: 3%{?dist}%{?repotag:.%{repotag}}
Summary: The DBMail mail storage system
Group: System Environment/Daemons
@@ -28,12 +28,12 @@
Source7: README.fedora
Patch0: kill-module-path.patch
Patch1: dbmail-expunge.patch
+Patch2: dbmail-short-write.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fileutils, openssl >= 0.9.7a
BuildRequires: glib2-devel >= 2.8, gmime-devel >= 2.1.19
BuildRequires: libsieve-devel >= 2.1.13
-BuildRequires: asciidoc, xmlto
BuildRequires: mysql-devel >= 4.1.3, postgresql-devel
BuildRequires: openldap-devel
%if 0%{?with_sqlite}
@@ -41,8 +41,7 @@
%endif
Requires: glib2 >= 2.8, logrotate, initscripts, vixie-cron
-Requires(post): /sbin/chkconfig
-Requires(preun):/sbin/chkconfig
+Requires: initscripts
Requires(pre): fedora-usermgmt
Requires(postun):fedora-usermgmt
Requires: dbmail-database-driver = %{version}-%{release}
@@ -129,7 +128,7 @@
%preun
if [ $1 = 0 ]; then
for s in %services; do
- %{_initrddir}/$s stop &> /dev/null || :
+ /sbin/service $s stop &> /dev/null || :
/sbin/chkconfig --del $s &> /dev/null || :
done
fi
@@ -142,7 +141,7 @@
/usr/sbin/fedora-groupdel %registry_name &> /dev/null || :
elif [ "$1" -ge "1" ]; then
for s in %services; do
- %{_initrddir}/$s condrestart &> /dev/null || :
+ /sbin/service $s condrestart &> /dev/null || :
done
fi
@@ -221,7 +220,13 @@
%endif
%changelog
-* Thu Mar 20 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-2
+* Thu Mar 22 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-3
+- patch to eliminate short write messages
+- use /sbin/service instead of running init scripts directly
+- requires for initscripts because daemon function in initfile requires it
+- modern tarballs do not require xmlto and asciidoc to build the docs
+
+* Tue Mar 20 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-2
- patch to fix expunge bug
* Tue Mar 13 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.4-1
More information about the fedora-extras-commits
mailing list