rpms/dbmail/EL-5 .cvsignore, 1.5, 1.6 dbmail-imapd, 1.1, 1.2 dbmail-lmtpd, 1.1, 1.2 dbmail-pop3d, 1.1, 1.2 dbmail-timsieved, 1.1, 1.2 dbmail.spec, 1.15, 1.16 sources, 1.6, 1.7 dbmail-hup.patch, 1.1, NONE dbmail-imapd-gmime-segv.patch, 1.1, NONE dbmail-thread-references.patch, 1.1, NONE

Bernard Johnson (bjohnson) fedora-extras-commits at redhat.com
Wed Oct 31 17:50:35 UTC 2007


Author: bjohnson

Update of /cvs/pkgs/rpms/dbmail/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9121/EL-5

Modified Files:
	.cvsignore dbmail-imapd dbmail-lmtpd dbmail-pop3d 
	dbmail-timsieved dbmail.spec sources 
Removed Files:
	dbmail-hup.patch dbmail-imapd-gmime-segv.patch 
	dbmail-thread-references.patch 
Log Message:
- 2.2.7-1
- removed unused thread references patch
- removed unused hup patch
- removed unused gmime segv patch
- license clarification
- dbmail: Initscript Review (bz #246901)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Jun 2007 15:05:39 -0000	1.5
+++ .cvsignore	31 Oct 2007 17:50:02 -0000	1.6
@@ -1 +1 @@
-dbmail-2.2.5.tar.gz
+dbmail-2.2.7.tar.gz


Index: dbmail-imapd
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail-imapd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbmail-imapd	21 Feb 2007 06:35:36 -0000	1.1
+++ dbmail-imapd	31 Oct 2007 17:50:02 -0000	1.2
@@ -7,6 +7,15 @@
 # processname: dbmail-imapd
 # pidfile: /var/run/dbmail-imapd.pid
 # config: /etc/dbmail.conf
+### BEGIN INIT INFO
+# Provides:          dbmail-imapd
+# Required-Start:    $local_fs $network $syslog
+# Should-Start:
+# Required-Stop:
+# Default-Stop:      0 1 2 6
+# Short-Description: Start dbmail-imapd daemon
+# Description:       dbmail-imapd is the imap interface to the dbmail system.
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -28,7 +37,7 @@
     daemon $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+    [ $RETVAL -eq  0 ] && touch /var/lock/subsys/$prog
     return $RETVAL
 }
 stop() {
@@ -36,7 +45,7 @@
     killproc $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
+    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
 }
 reload() {
     echo -n $"Reloading $prog: "
@@ -60,19 +69,21 @@
   restart)
     stop
     start
+    RETVAL=$?
     ;;
   condrestart)
     if [ -f /var/run/$prog.pid ] ; then
         stop
         start
     fi
+    RETVAL=$?
     ;;
   reload)
     reload
-	;;
+    ;;
   *)
     echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-    exit 1
+    RETVAL=3 
 esac
 
 exit $RETVAL


Index: dbmail-lmtpd
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail-lmtpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbmail-lmtpd	21 Feb 2007 06:35:36 -0000	1.1
+++ dbmail-lmtpd	31 Oct 2007 17:50:02 -0000	1.2
@@ -7,6 +7,15 @@
 # processname: dbmail-lmtpd
 # pidfile: /var/run/dbmail-lmtpd.pid
 # config: /etc/dbmail.conf
+### BEGIN INIT INFO
+# Provides:          dbmail-lmtpd
+# Required-Start:    $local_fs $network $syslog
+# Should-Start:
+# Required-Stop:
+# Default-Stop:      0 1 2 6
+# Short-Description: Start dbmail-lmtpd daemon
+# Description:       dbmail-lmtpd is the lmtp interface to the dbmail system.
+### END INIT INFO
 #
 
 # Source function library.
@@ -29,7 +38,7 @@
     daemon $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+    [ $RETVAL = -eq ] && touch /var/lock/subsys/$prog
     return $RETVAL
 }
 stop() {
@@ -37,7 +46,7 @@
     killproc $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
+    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
 }
 reload() {
     echo -n $"Reloading $prog: "
@@ -61,19 +70,21 @@
   restart)
     stop
     start
+    RETVAL=$?
     ;;
   condrestart)
     if [ -f /var/run/$prog.pid ] ; then
         stop
         start
+        RETVAL=$?
     fi
     ;;
   reload)
     reload
-	;;
+    ;;
   *)
     echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-    exit 1
+    RETVAL=3
 esac
 
 exit $RETVAL


Index: dbmail-pop3d
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail-pop3d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbmail-pop3d	21 Feb 2007 06:35:36 -0000	1.1
+++ dbmail-pop3d	31 Oct 2007 17:50:02 -0000	1.2
@@ -7,6 +7,15 @@
 # processname: dbmail-pop3d
 # pidfile: /var/run/dbmail-pop3d.pid
 # config: /etc/dbmail.conf
+## BEGIN INIT INFO
+# Provides:          dbmail-pop3d
+# Required-Start:    $local_fs $network $syslog
+# Should-Start:
+# Required-Stop:
+# Default-Stop:      0 1 2 6
+# Short-Description: Start dbmail-pop3d daemon
+# Description:       dbmail-pop3d is the pop3 interface to the dbmail system.
+### END INIT INFO
 #
 
 # Source function library.
@@ -29,7 +38,7 @@
     daemon $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
     return $RETVAL
 }
 stop() {
@@ -37,7 +46,7 @@
     killproc $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
+    [ $RETVAL -eq= 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
 }
 reload() {
     echo -n $"Reloading $prog: "
@@ -61,19 +70,21 @@
   restart)
     stop
     start
+    RETVAL=$?
     ;;
   condrestart)
     if [ -f /var/run/$prog.pid ] ; then
         stop
         start
+        RETVAL=$?
     fi
     ;;
   reload)
     reload
-	;;
+    ;;
   *)
     echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-    exit 1
+    RETVAL=3
 esac
 
 exit $RETVAL


Index: dbmail-timsieved
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail-timsieved,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbmail-timsieved	21 Feb 2007 06:35:36 -0000	1.1
+++ dbmail-timsieved	31 Oct 2007 17:50:02 -0000	1.2
@@ -7,6 +7,16 @@
 # processname: dbmail-timsieved
 # pidfile: /var/run/dbmail-timsieved.pid
 # config: /etc/dbmail.conf
+### BEGIN INIT INFO
+# Provides:          dbmail-timsieved
+# Required-Start:    $local_fs $network $syslog
+# Should-Start:
+# Required-Stop:
+# Default-Stop:      0 1 2 6
+# Short-Description: Start dbmail-timsieved daemon
+# Description:       dbmail-timsieved is the sieve interface to the dbmail \
+#                    system.
+### END INIT INFO
 #
 
 # Source function library.
@@ -29,7 +39,7 @@
     daemon $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
     return $RETVAL
 }
 stop() {
@@ -37,7 +47,7 @@
     killproc $exe
     RETVAL=$?
     echo
-    [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
+    [ $RETVAL = -eq ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
 }
 reload() {
     echo -n $"Reloading $prog: "
@@ -61,19 +71,21 @@
   restart)
     stop
     start
+    RETVAL=$?
     ;;
   condrestart)
     if [ -f /var/run/$prog.pid ] ; then
         stop
         start
+        RETVAL=$?
     fi
     ;;
   reload)
     reload
-	;;
+    ;;
   *)
     echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}"
-    exit 1
+    RETVAL=3
 esac
 
 exit $RETVAL


Index: dbmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/dbmail.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dbmail.spec	3 Jul 2007 22:32:56 -0000	1.15
+++ dbmail.spec	31 Oct 2007 17:50:02 -0000	1.16
@@ -10,12 +10,13 @@
 %endif
 
 Name:           dbmail
-Version:        2.2.5
-Release:        6%{?dist}
+Version:        2.2.7
+Release:        1%{?dist}
 Summary:        The DBMail mail storage system
 
 Group:          System Environment/Daemons
-License:        GPL
+# db_getopot.c is licensed MIT
+License:        GPLv2+ and MIT
 URL:            http://www.dbmail.org
 Source0:        http://www.dbmail.org/download/2.2/dbmail-%{version}.tar.gz
 Source1:        dbmail-imapd
@@ -25,9 +26,6 @@
 Source5:        dbmail.cron
 Source6:        dbmail.logrotate
 Source7:        README.fedora
-Patch0:         dbmail-thread-references.patch
-Patch1:         dbmail-hup.patch
-Patch2:         dbmail-imapd-gmime-segv.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,10 +66,6 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .thread-references
-%patch1 -p0 -b .hup
-%patch2 -p0 -b .gmime-segv
-
 # we don't need README.solaris and we don't want it caught up in the %%doc
 # README* wildcard - but we do want our shiny new README.fedora file to be
 # installed
@@ -237,6 +231,17 @@
 %{_libdir}/dbmail/libpgsql*
 
 %changelog
+* Wed Oct 31 2007 Bernard Johnson <bjohnson at symetrix.com> - 2.2.7-1
+- 2.2.7-1
+- removed unused thread references patch
+- removed unused hup patch
+- removed unused gmime segv patch
+- license clarification
+- dbmail: Initscript Review (bz #246901)
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.2.5-7
+- Rebuild for selinux ppc32 issue.
+
 * Tue Jul 03 2007 Bernard Johnson <bjohnson at symetrix.com> 2.2.5-6
 - patch to fix SEGV in dbmail-imapd
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbmail/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Jun 2007 15:05:39 -0000	1.6
+++ sources	31 Oct 2007 17:50:02 -0000	1.7
@@ -1 +1 @@
-1abce87992700ff84f6164a03eab0152  dbmail-2.2.5.tar.gz
+2d50867e5833de28a3ec19a968ecfd86  dbmail-2.2.7.tar.gz


--- dbmail-hup.patch DELETED ---


--- dbmail-imapd-gmime-segv.patch DELETED ---


--- dbmail-thread-references.patch DELETED ---




More information about the fedora-extras-commits mailing list