ports/106760: [patch] mail/dbmail: fix for leftovers, added forgotten rc-script
Mark Starovoytov
mark_sf at kikg.ifmo.ru
Fri Dec 15 09:10:11 UTC 2006
>Number: 106760
>Category: ports
>Synopsis: [patch] mail/dbmail: fix for leftovers, added forgotten rc-script
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 15 09:10:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Mark Starovoytov
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD kikg.ifmo.ru 4.11-STABLE FreeBSD 4.11-STABLE #0: Fri Mar 24 01:40:43 MSK 2006 root@:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Adds dbmail-timsieved.sh
- Adds workaround for installations after some previous revision which didn't deinstall completely
- Adds fix for bug #461 from dbmail bugtracker
>How-To-Repeat:
>Fix:
--- dbmail-2.2.1_1.diff begins here ---
diff -urN /usr/ports/mail/dbmail/Makefile /usr/home/mark/port-updates/dbmail/Makefile
--- /usr/ports/mail/dbmail/Makefile Fri Nov 24 01:09:54 2006
+++ /usr/home/mark/port-updates/dbmail/Makefile Thu Dec 14 18:42:12 2006
@@ -7,6 +7,7 @@
PORTNAME= dbmail
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dbmail.org/download/2.2/
@@ -27,7 +28,7 @@
USE_GMAKE= YES
USE_GCC= 3.2+
USE_LDCONFIG= ${PREFIX}/lib/dbmail
-USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh
+USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
USE_GNOME= glib20 pkgconfig
USE_OPENSSL= YES
@@ -108,6 +109,15 @@
post-configure:
@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
${WRKSRC}/dbmail.h
+
+# remove leftovers which are not removed by some revisions of port
+# fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error.
+pre-install:
+ @for f in 'a' 'la' 'so' 'so.0'; do \
+ if [ -f ${PREFIX}/lib/libdbmail.$$f ] ; then \
+ ${RM} ${PREFIX}/lib/libdbmail.$$f; \
+ fi; \
+ done
post-install:
@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
diff -urN /usr/ports/mail/dbmail/files/dbmail-timsieved.sh.in /usr/home/mark/port-updates/dbmail/files/dbmail-timsieved.sh.in
--- /usr/ports/mail/dbmail/files/dbmail-timsieved.sh.in Thu Jan 1 03:00:00 1970
+++ /usr/home/mark/port-updates/dbmail/files/dbmail-timsieved.sh.in Thu Dec 14 11:19:03 2006
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: dbmail-timsieved
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
+#
+#dbmail_timsieved_enable="YES"
+#
+# See dbmail-timsieved(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=dbmail_timsieved
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/dbmail-timsieved
+pidfile=/var/run/dbmail-timsieved.pid
+required_files=%%PREFIX%%/etc/dbmail.conf
+
+# read settings, set default values
+load_rc_config "$name"
+: ${dbmail_timsieved_enable="NO"}
+: ${dbmail_timsieved_flags=""}
+
+run_rc_command "$1"
diff -urN /usr/ports/mail/dbmail/files/patch-2.2.1_001_461 /usr/home/mark/port-updates/dbmail/files/patch-2.2.1_001_461
--- /usr/ports/mail/dbmail/files/patch-2.2.1_001_461 Thu Jan 1 03:00:00 1970
+++ /usr/home/mark/port-updates/dbmail/files/patch-2.2.1_001_461 Thu Dec 14 11:19:03 2006
@@ -0,0 +1,31 @@
+Index: misc.c
+===================================================================
+--- misc.c (revision 2388)
++++ misc.c (revision 2390)
+@@ -2112,8 +2112,14 @@
+ char prev,next=0;
+ unsigned incode=0, inquote=0;
+ size_t i, l;
+- GString *s = g_string_new("");
++ GString *s;
++
++ if (!a)
++ return g_strdup("");
++ if (!a[0])
++ return g_strdup("");
+
++ s = g_string_new("");
+ t = g_strdup(a);
+ inptr = t;
+ inptr = g_strstrip(inptr);
+@@ -2130,9 +2136,8 @@
+ }
+
+ l = strlen(inptr);
++ for (i = 0; i < l - 1; i++) {
+
+- for (i=0; i<l-1; i++) {
+-
+ next=inptr[i+1];
+
+ if (inptr[i] == '<')
--- dbmail-2.2.1_1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list