diff options
author | Alin Năstac <mrness@gentoo.org> | 2005-03-05 12:01:51 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2005-03-05 12:01:51 +0000 |
commit | 252fca0a2c59240859f53c7bae9e4529d8ffb5f7 (patch) | |
tree | be4db6d6387db141f5c6eeceadfce37aef5a4850 | |
parent | Version bumped. (diff) | |
download | gentoo-2-252fca0a2c59240859f53c7bae9e4529d8ffb5f7.tar.gz gentoo-2-252fca0a2c59240859f53c7bae9e4529d8ffb5f7.tar.bz2 gentoo-2-252fca0a2c59240859f53c7bae9e4529d8ffb5f7.zip |
fix #25960 and #40324
(Portage version: 2.0.51.19)
-rw-r--r-- | net-mail/vmailmgr/ChangeLog | 12 | ||||
-rw-r--r-- | net-mail/vmailmgr/Manifest | 14 | ||||
-rw-r--r-- | net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2 | 1 | ||||
-rw-r--r-- | net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch | 123 | ||||
-rw-r--r-- | net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff | 35 | ||||
-rw-r--r-- | net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild | 70 |
6 files changed, 207 insertions, 48 deletions
diff --git a/net-mail/vmailmgr/ChangeLog b/net-mail/vmailmgr/ChangeLog index 2f02d80cc9e8..638f88df0aae 100644 --- a/net-mail/vmailmgr/ChangeLog +++ b/net-mail/vmailmgr/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-mail/vmailmgr -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.16 2004/11/24 09:39:58 ticho Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.17 2005/03/05 12:01:51 mrness Exp $ + +*vmailmgr-0.96.9-r2 (05 Mar 2005) + + 05 Mar 2005; Alin Nastac <mrness@gentoo.org> + +files/vmailmgr-0.96.9-gentoo-r2.patch, + -files/vmailmgr-0.96.9-gentoo.diff, +vmailmgr-0.96.9-r2.ebuild: + Fix bugs 25960 and 40324. This version is incompatible with + net-mail/courier-imap-4*. 24 Nov 2004; Andrej Kacian <ticho@gentoo.org> vmailmgr-0.96.9-r1.ebuild: Inherit eutils, use epatch instead of patch. diff --git a/net-mail/vmailmgr/Manifest b/net-mail/vmailmgr/Manifest index d4ff7d3347c8..fcc261ce503c 100644 --- a/net-mail/vmailmgr/Manifest +++ b/net-mail/vmailmgr/Manifest @@ -1,20 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 fc003581d1b4801ba5d4bccc4e9cd1cb vmailmgr-0.96.9-r1.ebuild 1620 MD5 c50e04f4011745abecfee92b7a0b4875 ChangeLog 2138 +MD5 2dcf800f06691f2e9cfc2040d4f904fd vmailmgr-0.96.9-r2.ebuild 1644 MD5 911634f611838bc9b119dfb48b047c35 metadata.xml 250 MD5 9c31bdc6361d69e632bda1dc65587fb9 files/vmailmgr-0.96.9-gentoo-r1.diff 4249 MD5 fcb3e0b872a5f1719f7b9aa76eac8eba files/vmailmgr-0.96.9-gcc3.3.patch 3494 MD5 0279b46d6d44e209fead5769b6fdea30 files/checkvpw-loginfail 45 +MD5 d8e019e2a0047f70578608f16b233489 files/vmailmgr-0.96.9-gentoo-r2.patch 4939 MD5 3a361d677a497af106a197e48acbc129 files/separators 3 MD5 dada9de263c4a08a0d043350821a42b4 files/digest-vmailmgr-0.96.9-r1 67 +MD5 dada9de263c4a08a0d043350821a42b4 files/digest-vmailmgr-0.96.9-r2 67 MD5 bf55605617fc5acfdca3a28a796e82a4 files/socket-file 35 -MD5 c9005c51279499d79e056a5bbab5cac5 files/vmailmgr-0.96.9-gentoo.diff 1349 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFCKAVHjiC39V7gKu0RAg9eAKCDvN4dIEnttjanttjpB1+ZOfs9hwCgvmLq -8ZCD0RJWrMnNWA13nFV1RBo= -=H5n8 ------END PGP SIGNATURE----- diff --git a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2 b/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2 new file mode 100644 index 000000000000..27e6b788aa4d --- /dev/null +++ b/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r2 @@ -0,0 +1 @@ +MD5 c8d2bb288eeacb799985e8af2c7101c1 vmailmgr-0.96.9.tar.gz 362379 diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch new file mode 100644 index 000000000000..a5b12a4fb920 --- /dev/null +++ b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r2.patch @@ -0,0 +1,123 @@ +diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.am vmailmgr-0.96.9/authenticate/Makefile.am +--- vmailmgr-0.96.9.orig/authenticate/Makefile.am 2000-09-23 23:23:32.000000000 +0300 ++++ vmailmgr-0.96.9/authenticate/Makefile.am 2005-03-05 13:25:48.178155952 +0200 +@@ -1,6 +1,6 @@ + bin_PROGRAMS = checkvpw vauthenticate + authlib_PROGRAMS = authvmailmgr +-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/ ++authlibdir = ${prefix}/lib/courier-imap/authlib/ + + noinst_PODS = checkvpw.pod vauthenticate.pod + noinst_HTMLS = $(noinst_PODS:.pod=.html) +diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.in vmailmgr-0.96.9/authenticate/Makefile.in +--- vmailmgr-0.96.9.orig/authenticate/Makefile.in 2000-10-01 07:33:29.000000000 +0300 ++++ vmailmgr-0.96.9/authenticate/Makefile.in 2005-03-05 13:25:48.178155952 +0200 +@@ -83,7 +83,7 @@ + + bin_PROGRAMS = checkvpw vauthenticate + authlib_PROGRAMS = authvmailmgr +-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/ ++authlibdir = ${prefix}/lib/courier-imap/authlib/ + + noinst_PODS = checkvpw.pod vauthenticate.pod + noinst_HTMLS = $(noinst_PODS:.pod=.html) +diff -Nru vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc vmailmgr-0.96.9/authenticate/authvmailmgr.cc +--- vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc 2000-08-01 20:09:27.000000000 +0300 ++++ vmailmgr-0.96.9/authenticate/authvmailmgr.cc 2005-03-05 13:25:48.179155800 +0200 +@@ -15,6 +15,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include <config.h> ++#include <string.h> + #include "misc/exec.h" + #include "authvlib.h" + // Courier-IMAP includes +diff -Nru vmailmgr-0.96.9.orig/authenticate/checkvpw.cc vmailmgr-0.96.9/authenticate/checkvpw.cc +--- vmailmgr-0.96.9.orig/authenticate/checkvpw.cc 2000-08-11 01:39:27.000000000 +0300 ++++ vmailmgr-0.96.9/authenticate/checkvpw.cc 2005-03-05 13:25:48.179155800 +0200 +@@ -18,6 +18,7 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <stdlib.h> + #include "config/configrc.h" + #include "misc/exec.h" + #include "misc/stat_fns.h" +diff -Nru vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc vmailmgr-0.96.9/authenticate/vauthenticate.cc +--- vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc 2000-08-01 21:05:31.000000000 +0300 ++++ vmailmgr-0.96.9/authenticate/vauthenticate.cc 2005-03-05 13:25:48.180155648 +0200 +@@ -17,6 +17,7 @@ + #include <config.h> + #include <errno.h> + #include <unistd.h> ++#include <stdlib.h> + #include "authvlib.h" + #include "fdbuf/fdbuf.h" + +diff -Nru vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure +--- vmailmgr-0.96.9.orig/configure 2000-10-01 07:24:23.000000000 +0300 ++++ vmailmgr-0.96.9/configure 2005-03-05 13:25:48.182155344 +0200 +@@ -2682,7 +2682,7 @@ + done + + +-cgidir='${prefix}/cgi-bin' ++cgidir='/var/www/localhost/cgi-bin' + + + trap '' 1 2 15 +diff -Nru vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h vmailmgr-0.96.9/lib/cdb++/cdb++.h +--- vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h 2000-04-05 22:11:45.000000000 +0300 ++++ vmailmgr-0.96.9/lib/cdb++/cdb++.h 2005-03-05 13:27:26.573197632 +0200 +@@ -20,8 +20,9 @@ + #include "mystring/mystring.h" + #include "cdb++/datum.h" + #include "fdbuf/fdbuf.h" ++#include <inttypes.h> + +-typedef unsigned long uint32; ++typedef uint32_t uint32; + + #define CDBMAKE_HPLIST 1000 + +diff -Nru vmailmgr-0.96.9.orig/lib/misc/exec.cc vmailmgr-0.96.9/lib/misc/exec.cc +--- vmailmgr-0.96.9.orig/lib/misc/exec.cc 2000-08-03 19:35:09.000000000 +0300 ++++ vmailmgr-0.96.9/lib/misc/exec.cc 2005-03-05 13:25:48.182155344 +0200 +@@ -21,6 +21,7 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <unistd.h> ++#include <string.h> + #include "exec.h" + #include "config/configrc.h" + +diff -Nru vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc vmailmgr-0.96.9/lib/misc/keystrlist.cc +--- vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc 2000-04-03 21:22:13.000000000 +0300 ++++ vmailmgr-0.96.9/lib/misc/keystrlist.cc 2005-03-05 13:25:48.183155192 +0200 +@@ -15,6 +15,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include <config.h> ++#include <string.h> + #include "strlist.h" + + void keystrlist::set(const mystring& var, const mystring& val) +diff -Nru vmailmgr-0.96.9.orig/lib/misc/strlist.cc vmailmgr-0.96.9/lib/misc/strlist.cc +--- vmailmgr-0.96.9.orig/lib/misc/strlist.cc 2000-04-03 21:22:14.000000000 +0300 ++++ vmailmgr-0.96.9/lib/misc/strlist.cc 2005-03-05 13:25:48.183155192 +0200 +@@ -15,6 +15,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include <config.h> ++#include <string.h> + #include "strlist.h" + + static const char* compare(const char* ptr, const char* end, +diff -Nru vmailmgr-0.96.9.orig/lib/mystring/append.cc vmailmgr-0.96.9/lib/mystring/append.cc +--- vmailmgr-0.96.9.orig/lib/mystring/append.cc 2000-02-13 07:16:03.000000000 +0200 ++++ vmailmgr-0.96.9/lib/mystring/append.cc 2005-03-05 13:25:48.184155040 +0200 +@@ -1,3 +1,4 @@ ++#include <string.h> + #include "mystring.h" + #include "trace.h" + diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff deleted file mode 100644 index 044bf0b8b5bb..000000000000 --- a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur vmailmgr-0.96.9.orig/authenticate/Makefile.am vmailmgr-0.96.9/authenticate/Makefile.am ---- vmailmgr-0.96.9.orig/authenticate/Makefile.am Sat Sep 23 22:23:32 2000 -+++ vmailmgr-0.96.9/authenticate/Makefile.am Sun Apr 28 20:42:01 2002 -@@ -1,6 +1,6 @@ - bin_PROGRAMS = checkvpw vauthenticate - authlib_PROGRAMS = authvmailmgr --authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/ -+authlibdir = ${prefix}/lib/courier-imap/authlib/ - - noinst_PODS = checkvpw.pod vauthenticate.pod - noinst_HTMLS = $(noinst_PODS:.pod=.html) -diff -ur vmailmgr-0.96.9.orig/authenticate/Makefile.in vmailmgr-0.96.9/authenticate/Makefile.in ---- vmailmgr-0.96.9.orig/authenticate/Makefile.in Sun Oct 1 06:33:29 2000 -+++ vmailmgr-0.96.9/authenticate/Makefile.in Sun Apr 28 20:42:17 2002 -@@ -83,7 +83,7 @@ - - bin_PROGRAMS = checkvpw vauthenticate - authlib_PROGRAMS = authvmailmgr --authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/ -+authlibdir = ${prefix}/lib/courier-imap/authlib/ - - noinst_PODS = checkvpw.pod vauthenticate.pod - noinst_HTMLS = $(noinst_PODS:.pod=.html) -diff -ur vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure ---- vmailmgr-0.96.9.orig/configure Sun Oct 1 06:24:23 2000 -+++ vmailmgr-0.96.9/configure Sun Apr 28 20:40:59 2002 -@@ -2682,7 +2682,7 @@ - done - - --cgidir='${prefix}/cgi-bin' -+cgidir='/home/httpd/cgi-bin' - - - trap '' 1 2 15 diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild new file mode 100644 index 000000000000..4bab13678ce4 --- /dev/null +++ b/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r2.ebuild,v 1.1 2005/03/05 12:01:51 mrness Exp $ + +inherit gcc eutils + +DESCRIPTION="virtual domains for qmail" +SRC_URI="http://www.vmailmgr.org/current/${P}.tar.gz" +HOMEPAGE="http://www.vmailmgr.org/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 sparc ~ppc" +IUSE="" + +DEPEND="virtual/libc" +RDEPEND=">=sys-apps/ucspi-unix-0.34 + >=mail-mta/qmail-1.03-r7 + >=net-mail/qmail-autoresponder-0.95 + !>=net-mail/courier-imap-4*" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo-${PR}.patch + + if [ `gcc-major-version` -eq 3 ] && [ `gcc-minor-version` -ge 3 ]; then + epatch ${FILESDIR}/${P}-gcc3.3.patch + fi +} + +src_compile() { + export CXX=g++ + + if [ `gcc-major-version` -eq 3 ]; then + export LIBS="-lcrypt -lsupc++" + elif [ `gcc-major-version` -eq 2 ]; then + export LIBS="-lcrypt" + fi + + econf || die "./configure failed" + + emake || die "parallel make failed" +} + +src_install() { + make DESTDIR=${D} install || die "make install failed" + + dodoc AUTHORS INSTALL README TODO NEWS + + exeinto /var/lib/supervise/vmailmgrd + newexe ${S}/scripts/vmailmgrd.run run + + exeinto /var/lib/supervise/vmailmgrd/log + newexe ${S}/scripts/vmailmgrd-log.run run + + exeinto /etc/vmailmgr + newexe ${S}/scripts/autoresponder.sh vdeliver-postdeliver + + doexe ${FILESDIR}/checkvpw-loginfail + + insinto /etc/vmailmgr + doins ${FILESDIR}/socket-file + doins ${FILESDIR}/separators +} + +pkg_postinst() { + einfo "To start vmailmgrd you need to link" + einfo "/var/lib/supervise/vmailmgrd to /service" +} |