From owner-svn-ports-all@FreeBSD.ORG Sun Apr 13 18:10:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B571618A; Sun, 13 Apr 2014 18:10:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 886E81678; Sun, 13 Apr 2014 18:10:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DIAocP069586; Sun, 13 Apr 2014 18:10:50 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DIAovR069585; Sun, 13 Apr 2014 18:10:50 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404131810.s3DIAovR069585@svn.freebsd.org> From: Bryan Drewery Date: Sun, 13 Apr 2014 18:10:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351235 - head/mail/qmailadmin/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2014 18:10:50 -0000 Author: bdrewery Date: Sun Apr 13 18:10:50 2014 New Revision: 351235 URL: http://svnweb.freebsd.org/changeset/ports/351235 QAT: https://qat.redports.org/buildarchive/r351235/ Log: - Fix build with vpopmail-5.4.33 Reported by: daily QAT Added: head/mail/qmailadmin/files/patch-vpopmail-quota (contents, props changed) Added: head/mail/qmailadmin/files/patch-vpopmail-quota ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/qmailadmin/files/patch-vpopmail-quota Sun Apr 13 18:10:50 2014 (r351235) @@ -0,0 +1,54 @@ +Index: qmailadmin.h +=================================================================== +--- qmailadmin.h.orig ++++ qmailadmin.h +@@ -59,8 +59,3 @@ + void del_id_files( char *); + void init_globals(); + void quickAction (char *username, int action); +- +-/* copied from maildirquota.c in vpopmail +- * it really needs to get into vpopmail.h somehow +- */ +-int readuserquota(const char* dir, long *sizep, int *cntp); +Index: template.c +=================================================================== +--- template.c.orig ++++ template.c +@@ -426,8 +426,8 @@ int send_template_now(char *filename) + case 'Q': + vpw = vauth_getpw(ActionUser, Domain); + if (strncmp(vpw->pw_shell, "NOQUOTA", 2) != 0) { +- long diskquota = 0; +- int maxmsg = 0; ++ storage_t diskquota = 0; ++ storage_t maxmsg = 0; + char path[256]; + + quota_to_megabytes(qconvert, vpw->pw_shell); +@@ -547,8 +547,8 @@ int send_template_now(char *filename) + * then again, with recent changes, the non-admin shouldn't + * even get to this page. + */ +- long diskquota = 0; +- int maxmsg = 0; ++ storage_t diskquota = 0; ++ storage_t maxmsg = 0; + char path[256]; + vpw = vauth_getpw(Username, Domain); + +Index: user.c +=================================================================== +--- user.c.orig ++++ user.c +@@ -170,8 +170,8 @@ int show_user_lines(char *user, char *do + (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) { + if (AdminType==DOMAIN_ADMIN || + (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)) { +- long diskquota = 0; +- int maxmsg = 0; ++ storage_t diskquota = 0; ++ storage_t maxmsg = 0; + + /* display account name and user name */ + printf ("", get_color_text("000"));