From 03811d4381c2f2849b40569c212cb09a1c443e01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Thu, 15 Jun 2006 04:46:09 +0000 Subject: [PATCH] Fix vcheckquota inability to cope with non-maildir subdirectories (#136478). Package-Manager: portage-2.1 --- net-mail/vmailmgr-tools/ChangeLog | 8 +++- net-mail/vmailmgr-tools/Manifest | 40 +++++++++++++--- .../files/digest-vmailmgr-tools-0.2 | 2 + .../files/digest-vmailmgr-tools-0.2-r1 | 3 ++ .../files/vmailmgr-tools-0.2-quota.patch | 46 +++++++++++++++++++ .../vmailmgr-tools-0.2-r1.ebuild | 39 ++++++++++++++++ 6 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2-r1 create mode 100644 net-mail/vmailmgr-tools/files/vmailmgr-tools-0.2-quota.patch create mode 100644 net-mail/vmailmgr-tools/vmailmgr-tools-0.2-r1.ebuild diff --git a/net-mail/vmailmgr-tools/ChangeLog b/net-mail/vmailmgr-tools/ChangeLog index 825e30cd20f0..f356450f7a76 100644 --- a/net-mail/vmailmgr-tools/ChangeLog +++ b/net-mail/vmailmgr-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/vmailmgr-tools # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr-tools/ChangeLog,v 1.2 2006/03/07 15:22:04 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr-tools/ChangeLog,v 1.3 2006/06/15 04:46:09 mrness Exp $ + +*vmailmgr-tools-0.2-r1 (15 Jun 2006) + + 15 Jun 2006; Alin Nastac + +files/vmailmgr-tools-0.2-quota.patch, +vmailmgr-tools-0.2-r1.ebuild: + Fix vcheckquota inability to cope with non-maildir subdirectories (#136478). 07 Mar 2006; Alin Nastac vmailmgr-tools-0.2.ebuild: Added to ~amd64. diff --git a/net-mail/vmailmgr-tools/Manifest b/net-mail/vmailmgr-tools/Manifest index cdcb91ea9d8b..6d5b8d6809d8 100644 --- a/net-mail/vmailmgr-tools/Manifest +++ b/net-mail/vmailmgr-tools/Manifest @@ -1,15 +1,41 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 19cee52cbf310943998d93e500b64d5e ChangeLog 568 -MD5 fd7b0cf08fa0095ff41711a753c66e63 files/digest-vmailmgr-tools-0.2 69 +AUX vmailmgr-tools-0.2-gcc34.patch 871 RMD160 c5bf6cba628d8582e7988cb8e9e7dd35885d8df4 SHA1 2fa02403e37db97431cfa70f1b02d4fe4ce70990 SHA256 0c7f31c4ea01ac253b7c46809d7428feb4e91e60ef1fa6193ac333daa55582db MD5 db03dc3441ee2b210d9e727cbf4247cd files/vmailmgr-tools-0.2-gcc34.patch 871 -MD5 911634f611838bc9b119dfb48b047c35 metadata.xml 250 +RMD160 c5bf6cba628d8582e7988cb8e9e7dd35885d8df4 files/vmailmgr-tools-0.2-gcc34.patch 871 +SHA256 0c7f31c4ea01ac253b7c46809d7428feb4e91e60ef1fa6193ac333daa55582db files/vmailmgr-tools-0.2-gcc34.patch 871 +AUX vmailmgr-tools-0.2-quota.patch 1655 RMD160 1040433c67b94a81fbdda08f8340d24bd758e34f SHA1 9a2a7ba340cab3def10faeca1c4972f269895643 SHA256 356361d85042ef636a5bea92cfd53d95ee2a76b80c614ee79c63bf791fb14643 +MD5 e863eecb7d8316c58029fc4efb5f2fd0 files/vmailmgr-tools-0.2-quota.patch 1655 +RMD160 1040433c67b94a81fbdda08f8340d24bd758e34f files/vmailmgr-tools-0.2-quota.patch 1655 +SHA256 356361d85042ef636a5bea92cfd53d95ee2a76b80c614ee79c63bf791fb14643 files/vmailmgr-tools-0.2-quota.patch 1655 +DIST vmailmgr-tools-0.2.tar.gz 33925 RMD160 d5ef695eb0886759f079bd6fa4016c9ccc6b4d28 SHA1 fc7ead13ce5034c8ec0f2c1843d064a44ba08a5c SHA256 94e72dff32148b2fbfacc150938c303afe68297f90fda7421b8e98076ef231a0 +EBUILD vmailmgr-tools-0.2-r1.ebuild 953 RMD160 68ed03cfb95add91a55f3d68649a72274e805799 SHA1 63135d7f91c6368a20806646db7998473d95272a SHA256 bc84ed275d1b91bdbe98adb4b32cf06a8e2746b0b7946901f67e4230f857af88 +MD5 7c230bdfa8d780769fdcfb4ab7e9cdad vmailmgr-tools-0.2-r1.ebuild 953 +RMD160 68ed03cfb95add91a55f3d68649a72274e805799 vmailmgr-tools-0.2-r1.ebuild 953 +SHA256 bc84ed275d1b91bdbe98adb4b32cf06a8e2746b0b7946901f67e4230f857af88 vmailmgr-tools-0.2-r1.ebuild 953 +EBUILD vmailmgr-tools-0.2.ebuild 912 RMD160 546efbca3861c25a20fac1d1e002893a3bd3c4bf SHA1 1a0bda4a9f4cdf0f682a1ddd97c7fb11d1d29383 SHA256 2bcca0d5ac9d5f547af76bf4991d821fb0c2ad6f02cec1f89dd04b150344ab8d MD5 3809f0c6b6f3aae594d4217d1f16678e vmailmgr-tools-0.2.ebuild 912 +RMD160 546efbca3861c25a20fac1d1e002893a3bd3c4bf vmailmgr-tools-0.2.ebuild 912 +SHA256 2bcca0d5ac9d5f547af76bf4991d821fb0c2ad6f02cec1f89dd04b150344ab8d vmailmgr-tools-0.2.ebuild 912 +MISC ChangeLog 805 RMD160 4a945dc2c176541d88852c1307d416af7763bad1 SHA1 17ac13d3b10cc71962894cff8cfb1b5433461918 SHA256 a8a801b3c5e1e0e073601272c7201d042da3c61d130ba661870f5473b580eda8 +MD5 ee397b9489e5a7f2bceea8bdf0e1c398 ChangeLog 805 +RMD160 4a945dc2c176541d88852c1307d416af7763bad1 ChangeLog 805 +SHA256 a8a801b3c5e1e0e073601272c7201d042da3c61d130ba661870f5473b580eda8 ChangeLog 805 +MISC metadata.xml 250 RMD160 b7b640f08b38ac03c0d05e894492d59f085915ab SHA1 192a308a4ecebe3a59f384ce5d21ab2ed129c543 SHA256 8d0be60fefa54f1b4cdd3d02e373a8b9e8162c2f022296cb224b8d36f99418b3 +MD5 911634f611838bc9b119dfb48b047c35 metadata.xml 250 +RMD160 b7b640f08b38ac03c0d05e894492d59f085915ab metadata.xml 250 +SHA256 8d0be60fefa54f1b4cdd3d02e373a8b9e8162c2f022296cb224b8d36f99418b3 metadata.xml 250 +MD5 3558f459873428870c1fab0412dd2cc8 files/digest-vmailmgr-tools-0.2 253 +RMD160 db1cf3569181d4ab9d5e5094a41d0b710c0f6f34 files/digest-vmailmgr-tools-0.2 253 +SHA256 e9d0712e075ef20104c294974ee104c07289465749025231b483000719720a2b files/digest-vmailmgr-tools-0.2 253 +MD5 3558f459873428870c1fab0412dd2cc8 files/digest-vmailmgr-tools-0.2-r1 253 +RMD160 db1cf3569181d4ab9d5e5094a41d0b710c0f6f34 files/digest-vmailmgr-tools-0.2-r1 253 +SHA256 e9d0712e075ef20104c294974ee104c07289465749025231b483000719720a2b files/digest-vmailmgr-tools-0.2-r1 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEDaUxjG8pv1lIUX4RAhBHAJ9zmHbOIxlVLnGv8B3pp+/CHpq+jgCfeMdi -2NWE6E9VgNYNLslv4mOjua8= -=gDiY +iD8DBQFEkOZpjG8pv1lIUX4RAu16AJ9MzkrH4VV/h2N8IVJZcBsIhpthvwCfcDIm +0w+cOOyfW+g5v2w11CDvE78= +=IbBc -----END PGP SIGNATURE----- diff --git a/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2 b/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2 index ceda1eac479f..6a78bd795da8 100644 --- a/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2 +++ b/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2 @@ -1 +1,3 @@ MD5 1c583f46a62821bc1a90cbf6ce83bf32 vmailmgr-tools-0.2.tar.gz 33925 +RMD160 d5ef695eb0886759f079bd6fa4016c9ccc6b4d28 vmailmgr-tools-0.2.tar.gz 33925 +SHA256 94e72dff32148b2fbfacc150938c303afe68297f90fda7421b8e98076ef231a0 vmailmgr-tools-0.2.tar.gz 33925 diff --git a/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2-r1 b/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2-r1 new file mode 100644 index 000000000000..6a78bd795da8 --- /dev/null +++ b/net-mail/vmailmgr-tools/files/digest-vmailmgr-tools-0.2-r1 @@ -0,0 +1,3 @@ +MD5 1c583f46a62821bc1a90cbf6ce83bf32 vmailmgr-tools-0.2.tar.gz 33925 +RMD160 d5ef695eb0886759f079bd6fa4016c9ccc6b4d28 vmailmgr-tools-0.2.tar.gz 33925 +SHA256 94e72dff32148b2fbfacc150938c303afe68297f90fda7421b8e98076ef231a0 vmailmgr-tools-0.2.tar.gz 33925 diff --git a/net-mail/vmailmgr-tools/files/vmailmgr-tools-0.2-quota.patch b/net-mail/vmailmgr-tools/files/vmailmgr-tools-0.2-quota.patch new file mode 100644 index 000000000000..214df9a6cb72 --- /dev/null +++ b/net-mail/vmailmgr-tools/files/vmailmgr-tools-0.2-quota.patch @@ -0,0 +1,46 @@ +diff -Nru vmailmgr-tools-0.2.orig/vcheckquota.c vmailmgr-tools-0.2/vcheckquota.c +--- vmailmgr-tools-0.2.orig/vcheckquota.c 2006-06-15 06:22:31.000000000 +0300 ++++ vmailmgr-tools-0.2/vcheckquota.c 2006-06-15 07:25:14.936298750 +0300 +@@ -33,10 +33,10 @@ + const char program[] = "vcheckquota"; + const int msg_show_pid = 0; + const char cli_help_prefix[] = "vmailmgr quota enforcement program\n"; +-const char cli_help_suffix[] = "\ +-Warning: the soft-message is linked into the users maildir once for each\ +-message that is received while the account is over its soft quota. This may\ +-result in multiple warning messages.\n"; ++const char cli_help_suffix[] = "\n" ++"Warning: the soft-message is linked into the users maildir once for each\n" ++"message that is received while the account is over its soft quota. This may\n" ++"result in multiple warning messages.\n"; + const char cli_args_usage[] = ""; + const int cli_args_min = 0; + const int cli_args_max = 0; +@@ -58,8 +58,13 @@ + static struct stat st; + static void wrap_stat(const char* path) + { +- if (stat(path, &st) == -1) +- die3sys(111, "Cannot stat '", path, "'"); ++ if (stat(path, &st) < 0) { ++ if (errno == ENOENT) { ++ st.st_blocks = 0; ++ st.st_mode = 0; ++ } else ++ die3sys(111, "Cannot stat '", path, "'"); ++ } + } + + static unsigned long stat_size(const char* path) +@@ -77,8 +82,10 @@ + DIR* dir; + direntry* entry; + +- if ((dir = opendir(path)) == 0) ++ if ((dir = opendir(path)) == 0) { ++ if (errno == ENOENT) return; + die3sys(111, "Could not open directory '", path, "'"); ++ } + + while((entry = readdir(dir)) != 0) { + const char* name = entry->d_name; diff --git a/net-mail/vmailmgr-tools/vmailmgr-tools-0.2-r1.ebuild b/net-mail/vmailmgr-tools/vmailmgr-tools-0.2-r1.ebuild new file mode 100644 index 000000000000..b917c3f63992 --- /dev/null +++ b/net-mail/vmailmgr-tools/vmailmgr-tools-0.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr-tools/vmailmgr-tools-0.2-r1.ebuild,v 1.1 2006/06/15 04:46:09 mrness Exp $ + +inherit toolchain-funcs eutils fixheadtails + +DESCRIPTION="Add-on tools for use with vmailmgr" +HOMEPAGE="http://untroubled.org/vmailmgr-tools/" +SRC_URI="http://untroubled.org/vmailmgr-tools/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="net-mail/vmailmgr" + +src_unpack() { + unpack ${A} + + epatch "${FILESDIR}/${P}-gcc34.patch" + epatch "${FILESDIR}/${P}-quota.patch" + ht_fix_file "${S}/Makefile" +} + +src_compile() { + echo "${D}/usr/bin" > conf-bin + echo "$(tc-getCC) ${CFLAGS}" > conf-cc + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld + make || die "make failed" +} + +src_install() { + dodir /usr/bin + ./installer || die "install failed" + + doman *.1 + dodoc ANNOUNCEMENT NEWS README VERSION +} -- 2.26.2