From owner-svn-ports-all@FreeBSD.ORG Tue May 13 06:24:52 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 D04C2935; Tue, 13 May 2014 06:24:52 +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 A52382111; Tue, 13 May 2014 06:24:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4D6Oq9L002336; Tue, 13 May 2014 06:24:52 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4D6OqNK002331; Tue, 13 May 2014 06:24:52 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201405130624.s4D6OqNK002331@svn.freebsd.org> From: Eitan Adler Date: Tue, 13 May 2014 06:24:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353915 - in head/devel/bugzilla44: . 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.18 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: Tue, 13 May 2014 06:24:52 -0000 Author: eadler Date: Tue May 13 06:24:51 2014 New Revision: 353915 URL: http://svnweb.freebsd.org/changeset/ports/353915 QAT: https://qat.redports.org/buildarchive/r353915/ Log: devel/bugzilla44: add FreeBSD specific patch. Abuse our position as the owner of the ports tree to commit a project specific option and patch to the bugzilla port. Approved by: ohauer (maintainer) Added: head/devel/bugzilla44/files/freebsd-project-ldap.diff (contents, props changed) Modified: head/devel/bugzilla44/Makefile head/devel/bugzilla44/Makefile.options Modified: head/devel/bugzilla44/Makefile ============================================================================== --- head/devel/bugzilla44/Makefile Tue May 13 05:01:14 2014 (r353914) +++ head/devel/bugzilla44/Makefile Tue May 13 06:24:51 2014 (r353915) @@ -154,6 +154,10 @@ RUN_DEPENDS+= p5-File-MimeInfo>=0.16:${P p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy .endif +.if ${PORT_OPTIONS:MFREEBSD} +EXTRA_PATCHES= ${FILESDIR}/freebsd-project-ldap.diff +.endif + post-extract: @${RM} -rf ${WRKSRC}/.bzr @${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \ Modified: head/devel/bugzilla44/Makefile.options ============================================================================== --- head/devel/bugzilla44/Makefile.options Tue May 13 05:01:14 2014 (r353914) +++ head/devel/bugzilla44/Makefile.options Tue May 13 06:24:51 2014 (r353915) @@ -2,7 +2,8 @@ OPTIONS_DEFINE= \ DOCS \ - MODPERL + MODPERL \ + FREEBSD OPTIONS_GROUP= UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN @@ -54,6 +55,7 @@ BMP2PNG_DESC= BMP Attachments to PNGs CHARTING_MODULES_DESC= Bug charting support CONTRIB_DESC= Install user-contributed scripts EXPORT_IMPORT_DESC= Import/export bugs (via XML) +FREEBSD_DESC= Patch used for the FreeBSD project GRAPH_REPORTS_DESC= Graphical Reports INBOUND_EMAIL_DESC= Inbound Email JSONRPC_DESC= JSON-RPC Interface Added: head/devel/bugzilla44/files/freebsd-project-ldap.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/bugzilla44/files/freebsd-project-ldap.diff Tue May 13 06:24:51 2014 (r353915) @@ -0,0 +1,11 @@ +--- Bugzilla/Auth/Verify/LDAP.pm 2014-05-06 17:26:02.000000000 +0100 ++++ Bugzilla/Auth/Verify/LDAP.pm 2014-05-11 20:59:58.715356171 +0100 +@@ -132,7 +132,7 @@ + } + + } else { +- $params->{bz_username} = $username; ++ $params->{bz_username} = $username . '@freebsd.org'; + } + + $params->{realname} ||= $user_entry->get_value("displayName");