From 17aca5ba0dd8228b921825b64c81370cd3f8427b Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Mon, 15 Apr 2013 12:29:09 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- databases/sqlite3-docs/Makefile | 6 +- databases/sqlite3-docs/PLIST | 3 +- databases/sqlite3-docs/distinfo | 8 +- databases/sqlite3-tcl/Makefile | 6 +- databases/sqlite3-tcl/distinfo | 8 +- databases/sqlite3/Makefile | 6 +- databases/sqlite3/distinfo | 8 +- devel/xulrunner/mozilla-common.mk | 4 +- doc/CHANGES-2013 | 7 +- fonts/Makefile | 3 +- fonts/ubuntu-fonts/DESCR | 16 ++ fonts/ubuntu-fonts/Makefile | 55 ++++ fonts/ubuntu-fonts/PLIST | 21 ++ fonts/ubuntu-fonts/distinfo | 5 + licenses/ubuntu-font-license | 96 +++++++ mail/imapproxy/Makefile | 3 +- mail/imapproxy/distinfo | 5 +- mail/imapproxy/patches/patch-include_imapproxy.h | 17 ++ mail/imapproxy/patches/patch-src_config.c | 19 ++ mail/imapproxy/patches/patch-src_imapcommon.c | 105 ++++++++ www/ap2-auth-mellon/MESSAGE | 26 +- www/ap2-auth-mellon/Makefile | 8 +- www/ap2-auth-mellon/distinfo | 10 +- www/ap2-auth-mellon/patches/patch-ai | 310 ----------------------- www/ap2-auth-mellon/patches/patch-aj | 105 ++++++++ 25 files changed, 513 insertions(+), 347 deletions(-) create mode 100644 fonts/ubuntu-fonts/DESCR create mode 100644 fonts/ubuntu-fonts/Makefile create mode 100644 fonts/ubuntu-fonts/PLIST create mode 100644 fonts/ubuntu-fonts/distinfo create mode 100644 licenses/ubuntu-font-license create mode 100644 mail/imapproxy/patches/patch-include_imapproxy.h create mode 100644 mail/imapproxy/patches/patch-src_config.c create mode 100644 mail/imapproxy/patches/patch-src_imapcommon.c delete mode 100644 www/ap2-auth-mellon/patches/patch-ai create mode 100644 www/ap2-auth-mellon/patches/patch-aj diff --git a/databases/sqlite3-docs/Makefile b/databases/sqlite3-docs/Makefile index 57c18786519..405bf4a616e 100644 --- a/databases/sqlite3-docs/Makefile +++ b/databases/sqlite3-docs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2013/01/10 17:12:30 adam Exp $ +# $NetBSD: Makefile,v 1.17 2013/04/01 18:56:41 adam Exp $ -DISTNAME= sqlite-doc-3071601 -PKGNAME= sqlite3-docs-3.7.16.1 +DISTNAME= sqlite-doc-3071602 +PKGNAME= sqlite3-docs-3.7.16.2 CATEGORIES= databases MASTER_SITES= http://www.hwaci.com/sw/sqlite/2013/ \ http://www.sqlite.org/2013/ diff --git a/databases/sqlite3-docs/PLIST b/databases/sqlite3-docs/PLIST index e45aea06532..33d1d70675e 100644 --- a/databases/sqlite3-docs/PLIST +++ b/databases/sqlite3-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2013/01/11 22:49:48 joerg Exp $ +@comment $NetBSD: PLIST,v 1.16 2013/04/01 18:56:41 adam Exp $ share/doc/sqlite3/34to35.html share/doc/sqlite3/35to36.html share/doc/sqlite3/about.html @@ -573,6 +573,7 @@ share/doc/sqlite3/releaselog/3_7_15_1.html share/doc/sqlite3/releaselog/3_7_15_2.html share/doc/sqlite3/releaselog/3_7_16.html share/doc/sqlite3/releaselog/3_7_16_1.html +share/doc/sqlite3/releaselog/3_7_16_2.html share/doc/sqlite3/releaselog/3_7_2.html share/doc/sqlite3/releaselog/3_7_3.html share/doc/sqlite3/releaselog/3_7_4.html diff --git a/databases/sqlite3-docs/distinfo b/databases/sqlite3-docs/distinfo index fc44f19c606..b91b2b7369c 100644 --- a/databases/sqlite3-docs/distinfo +++ b/databases/sqlite3-docs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.15 2013/01/10 17:12:30 adam Exp $ +$NetBSD: distinfo,v 1.16 2013/04/01 18:56:41 adam Exp $ -SHA1 (sqlite-doc-3071601.zip) = 254dbed306ceb4e9017497dbafaa47280a2fc4ff -RMD160 (sqlite-doc-3071601.zip) = 6978273b0fe9cd5f3f7f6df50f1d27089c77a00c -Size (sqlite-doc-3071601.zip) = 4132384 bytes +SHA1 (sqlite-doc-3071602.zip) = 998df3d9ada4a4a8a048bcf20613d1d02be77731 +RMD160 (sqlite-doc-3071602.zip) = a1757659a67d4be0ca2d6da226e062ebe7c9cd2a +Size (sqlite-doc-3071602.zip) = 4135295 bytes diff --git a/databases/sqlite3-tcl/Makefile b/databases/sqlite3-tcl/Makefile index 076666ed127..988f44471de 100644 --- a/databases/sqlite3-tcl/Makefile +++ b/databases/sqlite3-tcl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2013/01/26 21:37:16 adam Exp $ +# $NetBSD: Makefile,v 1.44 2013/04/01 18:56:42 adam Exp $ -DISTNAME= sqlite-autoconf-3071601 -PKGNAME= sqlite3-tcl-3.7.16.1 +DISTNAME= sqlite-autoconf-3071602 +PKGNAME= sqlite3-tcl-3.7.16.2 CATEGORIES= databases MASTER_SITES= http://www.hwaci.com/sw/sqlite/2013/ \ http://www.sqlite.org/2013/ diff --git a/databases/sqlite3-tcl/distinfo b/databases/sqlite3-tcl/distinfo index a37ba130c66..afad8b2b7c6 100644 --- a/databases/sqlite3-tcl/distinfo +++ b/databases/sqlite3-tcl/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.28 2013/01/10 17:12:30 adam Exp $ +$NetBSD: distinfo,v 1.29 2013/04/01 18:56:42 adam Exp $ -SHA1 (sqlite-autoconf-3071601.tar.gz) = b0d9b3e2ca3c50f72e5921e9532130787871b7ae -RMD160 (sqlite-autoconf-3071601.tar.gz) = b36f679e2c729d3088239fdbf6979d2f818d4bbc -Size (sqlite-autoconf-3071601.tar.gz) = 1854392 bytes +SHA1 (sqlite-autoconf-3071602.tar.gz) = 85bf857cf86f34831d55d7ba97606dba581b8d62 +RMD160 (sqlite-autoconf-3071602.tar.gz) = 2e4a7661ec1cea4ad1f7a9f95b932d36e59f1a6a +Size (sqlite-autoconf-3071602.tar.gz) = 1854396 bytes SHA1 (patch-aa) = d4d0424eec39ede995c2c408dcf51876072d3fea SHA1 (patch-ab) = 64a4352b9a8ed0518784837e390541cd4e1bc9aa diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 7ad8b00c870..011cc2556ff 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2013/02/21 15:14:46 gdt Exp $ +# $NetBSD: Makefile,v 1.63 2013/04/01 18:56:41 adam Exp $ -DISTNAME= sqlite-autoconf-3071601 -PKGNAME= sqlite3-3.7.16.1 +DISTNAME= sqlite-autoconf-3071602 +PKGNAME= sqlite3-3.7.16.2 CATEGORIES= databases MASTER_SITES= http://www.hwaci.com/sw/sqlite/2013/ \ http://www.sqlite.org/2013/ diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index 03e83e35d95..69fe294a37f 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.75 2013/01/10 17:12:30 adam Exp $ +$NetBSD: distinfo,v 1.76 2013/04/01 18:56:41 adam Exp $ -SHA1 (sqlite-autoconf-3071601.tar.gz) = b0d9b3e2ca3c50f72e5921e9532130787871b7ae -RMD160 (sqlite-autoconf-3071601.tar.gz) = b36f679e2c729d3088239fdbf6979d2f818d4bbc -Size (sqlite-autoconf-3071601.tar.gz) = 1854392 bytes +SHA1 (sqlite-autoconf-3071602.tar.gz) = 85bf857cf86f34831d55d7ba97606dba581b8d62 +RMD160 (sqlite-autoconf-3071602.tar.gz) = 2e4a7661ec1cea4ad1f7a9f95b932d36e59f1a6a +Size (sqlite-autoconf-3071602.tar.gz) = 1854396 bytes diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index d1fb9cd8ab9..61b929ce92a 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.45 2013/03/30 20:03:08 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.46 2013/03/30 20:46:29 tron Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -79,7 +79,7 @@ SUBST_SED.python+= -e 's,=1.1.0:../../devel/yasm CONFIGURE_ARGS+= --enable-libjpeg-turbo .else -CONFIGURE_ARGS+= --diable-libjpeg-turbo +CONFIGURE_ARGS+= --disable-libjpeg-turbo .endif # diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 959c7e63818..57e567bb030 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1380 2013/04/14 19:51:13 wiz Exp $ +$NetBSD: CHANGES-2013,v 1.1383 2013/04/15 15:42:53 adam Exp $ Changes to the packages collection and infrastructure in 2013: @@ -2167,3 +2167,8 @@ Changes to the packages collection and infrastructure in 2013: Updated biology/py-mol to 1.5.0.1 [joerg 2013-04-14] Updated multimedia/farsight2 to 0.0.31 [wiz 2013-04-14] Added devel/p5-Term-ReadLine-TTYtter version 1.4 [obache 2013-04-15] + Updated www/ap2-auth-mellon to 0.6.1 [manu 2013-04-15] + Updated databases/sqlite3 to 3.7.16.2 [adam 2013-04-15] + Updated databases/sqlite3-docs to 3.7.16.2 [adam 2013-04-15] + Updated databases/sqlite3-tcl to 3.7.16.2 [adam 2013-04-15] + Added fonts/ubuntu-fonts version 0.80 [uwe 2013-04-15] diff --git a/fonts/Makefile b/fonts/Makefile index 86ffddbc19f..9fce92c28b9 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.232 2013/02/11 08:56:24 taca Exp $ +# $NetBSD: Makefile,v 1.233 2013/03/11 18:48:14 wiz Exp $ # COMMENT= Fonts @@ -302,6 +302,7 @@ SUBDIR+= ttf2pt1 SUBDIR+= ttftot42 SUBDIR+= ttmkfdir2 SUBDIR+= type1inst +SUBDIR+= ubuntu-fonts SUBDIR+= umefont-ttf SUBDIR+= un-core-ttf SUBDIR+= un-extra-ttf diff --git a/fonts/ubuntu-fonts/DESCR b/fonts/ubuntu-fonts/DESCR new file mode 100644 index 00000000000..f74f577c8b6 --- /dev/null +++ b/fonts/ubuntu-fonts/DESCR @@ -0,0 +1,16 @@ +The Ubuntu Font Family are a set of matching new libre/open fonts. The +development is being funded by Canonical on behalf the wider Free +Software community and the Ubuntu project. The technical font design +work and implementation is being undertaken by Dalton Maag. + +Both the final font Truetype/OpenType files and the design files used +to produce the font family are distributed under an open licence and +you are expressly encouraged to experiment, modify, share and improve. +The typeface is sans-serif, uses OpenType features and is manually +hinted for clarity on desktop and mobile computing screens. + +The scope of the Ubuntu Font Family includes all the languages used by +the various Ubuntu users around the world in tune with Ubuntu's +philosophy which states that every user should be able to use their +software in the language of their choice. So the Ubuntu Font Family +project will be extended to cover many more written languages. diff --git a/fonts/ubuntu-fonts/Makefile b/fonts/ubuntu-fonts/Makefile new file mode 100644 index 00000000000..2d59fb512b4 --- /dev/null +++ b/fonts/ubuntu-fonts/Makefile @@ -0,0 +1,55 @@ +# $NetBSD$ + +VERSION= 0.80 +PKGNAME= ubuntu-fonts-${VERSION} +CATEGORIES= fonts +DISTNAME= ubuntu-font-family-${VERSION} +EXTRACT_SUFX= .zip +MASTER_SITES= http://font.ubuntu.com/download/ \ + ${MASTER_SITE_LOCAL} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://font.ubuntu.com/ +COMMENT= TrueType font family from Ubuntu +LICENSE= ubuntu-font-license + +NO_CONFIGURE= yes +NO_BUILD= yes + +DOCDIR= ${PREFIX}/share/doc/${PKGBASE} +FONTDIR= ${PREFIX}/lib/X11/fonts/TTF +FONTS_DIRS.ttf= ${FONTDIR} + +INSTALLATION_DIRS= ${DOCDIR} ${FONTDIR} + +INSTALL_FONTS= Ubuntu-B.ttf \ + Ubuntu-BI.ttf \ + Ubuntu-C.ttf \ + Ubuntu-L.ttf \ + Ubuntu-LI.ttf \ + Ubuntu-M.ttf \ + Ubuntu-MI.ttf \ + Ubuntu-R.ttf \ + Ubuntu-RI.ttf \ + UbuntuMono-B.ttf \ + UbuntuMono-BI.ttf \ + UbuntuMono-R.ttf \ + UbuntuMono-RI.ttf + +INSTALL_DOCS= CONTRIBUTING.txt \ + FONTLOG.txt \ + LICENCE-FAQ.txt \ + LICENCE.txt \ + README.txt \ + TRADEMARKS.txt \ + copyright.txt + +do-install: +.for fontfile in ${INSTALL_FONTS} + ${INSTALL_DATA} ${WRKSRC}/${fontfile} ${DESTDIR}${FONTDIR} +.endfor +.for docfile in ${INSTALL_DOCS} + ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCDIR} +.endfor + +.include "../../mk/bsd.pkg.mk" diff --git a/fonts/ubuntu-fonts/PLIST b/fonts/ubuntu-fonts/PLIST new file mode 100644 index 00000000000..a85e7ccf08a --- /dev/null +++ b/fonts/ubuntu-fonts/PLIST @@ -0,0 +1,21 @@ +@comment $NetBSD$ +lib/X11/fonts/TTF/Ubuntu-B.ttf +lib/X11/fonts/TTF/Ubuntu-BI.ttf +lib/X11/fonts/TTF/Ubuntu-C.ttf +lib/X11/fonts/TTF/Ubuntu-L.ttf +lib/X11/fonts/TTF/Ubuntu-LI.ttf +lib/X11/fonts/TTF/Ubuntu-M.ttf +lib/X11/fonts/TTF/Ubuntu-MI.ttf +lib/X11/fonts/TTF/Ubuntu-R.ttf +lib/X11/fonts/TTF/Ubuntu-RI.ttf +lib/X11/fonts/TTF/UbuntuMono-B.ttf +lib/X11/fonts/TTF/UbuntuMono-BI.ttf +lib/X11/fonts/TTF/UbuntuMono-R.ttf +lib/X11/fonts/TTF/UbuntuMono-RI.ttf +share/doc/ubuntu-fonts/CONTRIBUTING.txt +share/doc/ubuntu-fonts/FONTLOG.txt +share/doc/ubuntu-fonts/LICENCE-FAQ.txt +share/doc/ubuntu-fonts/LICENCE.txt +share/doc/ubuntu-fonts/README.txt +share/doc/ubuntu-fonts/TRADEMARKS.txt +share/doc/ubuntu-fonts/copyright.txt diff --git a/fonts/ubuntu-fonts/distinfo b/fonts/ubuntu-fonts/distinfo new file mode 100644 index 00000000000..ffb2e7efbf4 --- /dev/null +++ b/fonts/ubuntu-fonts/distinfo @@ -0,0 +1,5 @@ +$NetBSD$ + +SHA1 (ubuntu-font-family-0.80.zip) = 88276ba9d38d75b33a9640efa15cd80979cb21e2 +RMD160 (ubuntu-font-family-0.80.zip) = 4f50796443dfcb9bec32b7d6b90d5df559626686 +Size (ubuntu-font-family-0.80.zip) = 2091643 bytes diff --git a/licenses/ubuntu-font-license b/licenses/ubuntu-font-license new file mode 100644 index 00000000000..ae78a8f94ea --- /dev/null +++ b/licenses/ubuntu-font-license @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to +a new environment. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. These can be included either as stand-alone +text files, human-readable headers or in the appropriate machine- +readable metadata fields within text or binary files as long as those +fields can be easily viewed by the user. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile index 0a3b2b05fc9..5871f92ffb3 100644 --- a/mail/imapproxy/Makefile +++ b/mail/imapproxy/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2010/03/22 08:10:36 manu Exp $ +# $NetBSD: Makefile,v 1.12 2012/10/08 12:19:14 asau Exp $ # DISTNAME= up-imapproxy-1.2.7 PKGNAME= imapproxy-1.2.7 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.imapproxy.org/downloads/ diff --git a/mail/imapproxy/distinfo b/mail/imapproxy/distinfo index 69c86c0cf06..82bc4b73da4 100644 --- a/mail/imapproxy/distinfo +++ b/mail/imapproxy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2010/03/22 08:10:36 manu Exp $ +$NetBSD: distinfo,v 1.6 2010/04/07 15:24:16 joerg Exp $ SHA1 (up-imapproxy-1.2.7.tar.gz) = 1e09730c19cbde3590093b5b4c4599ab69bfced7 RMD160 (up-imapproxy-1.2.7.tar.gz) = 32eddc89fb35c49334eedc3135ede0fc1241e831 @@ -7,3 +7,6 @@ SHA1 (patch-aa) = 7818f16b5e9339672eef4fb0ec89303a11a2e72a SHA1 (patch-ba) = 8f3d8adbac5a147cc143d7737d56a83401736a9d SHA1 (patch-bb) = 348768062f5f9e314223fb7d385f749646ed04be SHA1 (patch-bc) = c3daf40715af721a0c4ff1b1071a892c94b59ce5 +SHA1 (patch-include_imapproxy.h) = 9e2326ece220e48c3baa2949b13d21448405e741 +SHA1 (patch-src_config.c) = 84ac9bde7cf64add665adb0f4d658ef856a91ae0 +SHA1 (patch-src_imapcommon.c) = 250b9d6edb9e0b475f673af8ca9bef235ddab796 diff --git a/mail/imapproxy/patches/patch-include_imapproxy.h b/mail/imapproxy/patches/patch-include_imapproxy.h new file mode 100644 index 00000000000..ad868cb625b --- /dev/null +++ b/mail/imapproxy/patches/patch-include_imapproxy.h @@ -0,0 +1,17 @@ +$NetBSD$ + +SASL PLAIN Support. Patch submitted upstream +http://sourceforge.net/tracker/?func=detail&aid=3610674&group_id=311&atid=300311 + +--- include/imapproxy.h.orig 2013-04-15 11:57:37.000000000 +0200 ++++ include/imapproxy.h 2013-04-15 11:58:33.000000000 +0200 +@@ -311,8 +311,9 @@ + unsigned char support_unselect; /* unselect support flag */ + unsigned char support_starttls; /* starttls support flag */ + unsigned char login_disabled; /* login disabled flag */ + char *chroot_directory; /* chroot(2) into this dir */ ++ char *auth_sasl_mech; /* SASL mechanism */ + }; + + + /* diff --git a/mail/imapproxy/patches/patch-src_config.c b/mail/imapproxy/patches/patch-src_config.c new file mode 100644 index 00000000000..c14ff32f714 --- /dev/null +++ b/mail/imapproxy/patches/patch-src_config.c @@ -0,0 +1,19 @@ +$NetBSD$ + +SASL PLAIN Support. Patch submitted upstream +http://sourceforge.net/tracker/?func=detail&aid=3610674&group_id=311&atid=300311 + +--- src/config.c.orig 2010-02-20 18:16:58.000000000 +0100 ++++ src/config.c 2013-04-15 12:00:50.000000000 +0200 +@@ -452,8 +452,11 @@ + &PC_Struct.force_tls, index ); + + ADD_TO_TABLE( "enable_admin_commands", SetBooleanValue, + &PC_Struct.enable_admin_commands, index ); ++ ++ ADD_TO_TABLE( "auth_sasl_mech", SetStringValue, ++ &PC_Struct.auth_sasl_mech, index ); + + ConfigTable[index].Keyword[0] = '\0'; + + FP = fopen( ConfigFile, "r" ); diff --git a/mail/imapproxy/patches/patch-src_imapcommon.c b/mail/imapproxy/patches/patch-src_imapcommon.c new file mode 100644 index 00000000000..1dd85a6f8b9 --- /dev/null +++ b/mail/imapproxy/patches/patch-src_imapcommon.c @@ -0,0 +1,105 @@ +$NetBSD$ + +SASL PLAIN Support. Patch submitted upstream +http://sourceforge.net/tracker/?func=detail&aid=3610674&group_id=311&atid=300311 + +--- src/imapcommon.c.orig 2010-02-20 18:16:58.000000000 +0100 ++++ src/imapcommon.c 2013-04-15 12:12:45.000000000 +0200 +@@ -689,13 +689,96 @@ + } + #endif /* HAVE_LIBSSL */ + + ++ /* ++ * If configured to do so, use SASL PLAIN instead of IMAP LOGIN ++ */ ++ if ( PC_Struct.auth_sasl_mech && ++ !strcmp( PC_Struct.auth_sasl_mech, "plain" ) ) ++ { ++ /* ++ * Build SASL AUTH PLAIN string: ++ * username\0username\0password ++ */ ++ char *ptr_username; ++ unsigned int username_size; ++ char *ptr_password; ++ unsigned int password_size; ++ unsigned int total_size; ++ unsigned int AuthBufIndex; ++ char AuthBuf[BUFSIZE]; ++ char EncodedAuthBuf[BUFSIZE]; ++ ++ /* ++ * Strip quotes From username ++ */ ++ ptr_username = Username; ++ username_size = strlen( Username ); ++ if ( *ptr_username == '"' && *(ptr_username + username_size - 1) == '"' ) ++ { ++ ++ptr_username; ++ username_size = username_size - 2; ++ } ++ ++ /* ++ * Same with password ++ */ ++ ptr_password = Password; ++ password_size = strlen( Password ); ++ if ( *ptr_password == '"' && *(ptr_password + password_size - 1) == '"' ) ++ { ++ ++ptr_password; ++ password_size = password_size - 2; ++ } ++ ++ /* ++ * Make sure output buffer is big enough ( +3 for three \0 ) ++ */ ++ total_size = username_size + username_size + password_size + 3; ++ if ( total_size > sizeof(AuthBuf) ) { ++ syslog( LOG_INFO, ++ "LOGIN: '%s' (%s:%s) failed: PLAIN AUTH needs %d/%d bytes", ++ Username, ClientAddr, portstr, total_size, sizeof(AuthBuf)); ++ goto fail; ++ } ++ ++ /* ++ * Prepare the buffer ++ */ ++ AuthBufIndex = 0; ++ ++ memcpy( AuthBuf + AuthBufIndex, ptr_username, username_size ); ++ AuthBufIndex += username_size; ++ AuthBuf[AuthBufIndex++] = '\0'; ++ ++ memcpy( AuthBuf + AuthBufIndex, ptr_username, username_size ); ++ AuthBufIndex += username_size; ++ AuthBuf[AuthBufIndex++] = '\0'; ++ ++ memcpy( AuthBuf + AuthBufIndex, ptr_password, password_size ); ++ AuthBufIndex += password_size; ++ AuthBuf[AuthBufIndex++] = '\0'; ++ ++ EVP_EncodeBlock( EncodedAuthBuf, AuthBuf, AuthBufIndex ); ++ ++ snprintf( SendBuf, BufLen, "A0001 AUTHENTICATE PLAIN %s\r\n", EncodedAuthBuf ); ++ ++ /* syslog( LOG_INFO, "sending auth plain '%s'", EncodedAuthBuf ); */ ++ ++ if ( IMAP_Write( Server.conn, SendBuf, strlen(SendBuf) ) == -1 ) ++ { ++ syslog( LOG_INFO, ++ "LOGIN: '%s' (%s:%s) failed: IMAP_Write() failed attempting to send AUTHENTICATE command to IMAP server: %s", ++ Username, ClientAddr, portstr, strerror( errno ) ); ++ goto fail; ++ } ++ } + /* + * Send the login command off to the IMAP server. Have to treat a literal + * password different. + */ +- if ( LiteralPasswd ) ++ else if ( LiteralPasswd ) + { + snprintf( SendBuf, BufLen, "A0001 LOGIN %s {%d}\r\n", + Username, strlen( Password ) ); + if ( IMAP_Write( Server.conn, SendBuf, strlen(SendBuf) ) == -1 ) diff --git a/www/ap2-auth-mellon/MESSAGE b/www/ap2-auth-mellon/MESSAGE index beb7708abdf..50bdc0b36a8 100644 --- a/www/ap2-auth-mellon/MESSAGE +++ b/www/ap2-auth-mellon/MESSAGE @@ -1,9 +1,33 @@ =========================================================================== -$NetBSD$ +$NetBSD: MESSAGE,v 1.1.1.1 2009/03/02 16:47:42 manu Exp $ In order to use this module in your Apache installation, you need to add the following to your httpd.conf file: LoadModule auth_mellon_module lib/httpd/mod_auth_mellon.so +If upgrading from version prior 0.6.0, please not the following +backward-incompatible changes: + +* The POST replay functionality has been disabled by default, and the + automatic creation of the MellonPostDirectory target directory has been + removed. If you want to use the POST replay functionality, create a + directory accessible only by the apache user (e.g.: /var/spool/mellon) + and add this after the LoadModule for mod_auth_mellon.so: + + MellonPostDirectory /var/spool/mellon + +* Start discovery service when accessing the login endpoint. We used + to bypass the discovery service in this case, and just pick the first + IdP. This has been changed to send a request to the discovery service + instead, if one is configured. + +* The MellonLockFile default path has been changed to: + /var/run/mod_auth_mellon.lock + This only affects platforms where a lock file is required and + where Apache doesn't have write access to that directory during + startup. (Apache can normally create files in that directory + during startup.) + + =========================================================================== diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile index 767a7de69ff..9f3aa107c75 100644 --- a/www/ap2-auth-mellon/Makefile +++ b/www/ap2-auth-mellon/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2012/12/16 01:52:36 obache Exp $ +# $NetBSD: Makefile,v 1.22 2012/09/15 10:06:44 obache Exp $ # PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/} -DISTNAME= mod_auth_mellon-0.4.0 -PKGREVISION= 7 +DISTNAME= mod_auth_mellon-0.6.1 +#PKGREVISION= 1 CATEGORIES= www security MASTER_SITES= http://modmellon.googlecode.com/files/ @@ -12,6 +12,8 @@ HOMEPAGE= http://code.google.com/p/modmellon/ COMMENT= SAML 2.0 authentication for Apache LICENSE= gnu-gpl-v2 # or later +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= pkg-config diff --git a/www/ap2-auth-mellon/distinfo b/www/ap2-auth-mellon/distinfo index 64235d9ac50..bee07fe3ae3 100644 --- a/www/ap2-auth-mellon/distinfo +++ b/www/ap2-auth-mellon/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2011/05/07 05:15:21 manu Exp $ +$NetBSD: distinfo,v 1.11 2011/12/06 09:58:01 manu Exp $ -SHA1 (mod_auth_mellon-0.4.0.tar.gz) = d09f7bbefe32c2eaa624612584eab1ea8e89820a -RMD160 (mod_auth_mellon-0.4.0.tar.gz) = 92ef003ae22c43ef81d22f5027486244e76e3d3f -Size (mod_auth_mellon-0.4.0.tar.gz) = 103708 bytes -SHA1 (patch-ai) = a7a4f729301bff79cb39d441f9fa48993cdc2899 +SHA1 (mod_auth_mellon-0.6.1.tar.gz) = c1704daaafdb2105ee5f1d488f88ec914f2dd646 +RMD160 (mod_auth_mellon-0.6.1.tar.gz) = 0cef669feeb0fba516cd934f1fe8a93e6bc67239 +Size (mod_auth_mellon-0.6.1.tar.gz) = 108734 bytes +SHA1 (patch-aj) = c8219d53538cf9e10acaec861a66a3f29e22a582 diff --git a/www/ap2-auth-mellon/patches/patch-ai b/www/ap2-auth-mellon/patches/patch-ai deleted file mode 100644 index 13e0f2e9279..00000000000 --- a/www/ap2-auth-mellon/patches/patch-ai +++ /dev/null @@ -1,310 +0,0 @@ -$NetBSD$ - -Honour MellonProbeDiscoveryIdP order when sending probes (from upstream) - ---- auth_mellon.h.orig 2011-05-18 12:39:00.000000000 +0200 -+++ auth_mellon.h 2011-12-06 09:54:08.000000000 +0100 -@@ -209,9 +209,9 @@ - - /* IdP discovery service */ - const char *discovery_url; - int probe_discovery_timeout; -- apr_hash_t *probe_discovery_idp; -+ apr_table_t *probe_discovery_idp; - - /* The configuration record we "inherit" the lasso server object from. */ - struct am_dir_cfg_rec *inherit_server_from; - /* Mutex to prevent us from creating several lasso server objects. */ ---- auth_mellon_config.c.orig 2011-05-18 12:39:00.000000000 +0200 -+++ auth_mellon_config.c 2011-12-06 09:54:08.000000000 +0100 -@@ -76,8 +76,9 @@ - * the MellonPostCount configuration directive if you change this. - */ - static const int post_count = 100; - -+#if unused - /* This function handles configuration directives which set a - * multivalued string slot in the module configuration (the destination - * strucure is a hash). - * -@@ -85,9 +86,8 @@ - * cmd_parms *cmd The command structure for this configuration - * directive. - * void *struct_ptr Pointer to the current directory configuration. - * NULL if we are not in a directory configuration. -- * This value isn't used by this function. - * const char *key The string argument following this configuration - * directive in the configuraion file. - * const char *value Optional value to be stored in the hash. - * -@@ -116,8 +116,49 @@ - apr_hash_set(*hash, apr_pstrdup(pconf, key), APR_HASH_KEY_STRING, value); - - return NULL; - } -+#endif /* unused */ -+ -+/* This function handles configuration directives which set a -+ * multivalued string slot in the module configuration (the destination -+ * strucure is a table). -+ * -+ * Parameters: -+ * cmd_parms *cmd The command structure for this configuration -+ * directive. -+ * void *struct_ptr Pointer to the current directory configuration. -+ * NULL if we are not in a directory configuration. -+ * const char *key The string argument following this configuration -+ * directive in the configuraion file. -+ * const char *value Optional value to be stored in the hash. -+ * -+ * Returns: -+ * NULL on success or an error string on failure. -+ */ -+static const char *am_set_table_string_slot(cmd_parms *cmd, -+ void *struct_ptr, -+ const char *key, -+ const char *value) -+{ -+ server_rec *s = cmd->server; -+ apr_pool_t *pconf = s->process->pconf; -+ am_dir_cfg_rec *cfg = (am_dir_cfg_rec *)struct_ptr; -+ int offset; -+ apr_table_t **table; -+ -+ /* -+ * If no value is given, we just store the key in the hash. -+ */ -+ if (value == NULL || *value == '\0') -+ value = key; -+ -+ offset = (int)(long)cmd->info; -+ table = (apr_table_t **)((char *)cfg + offset); -+ apr_table_set(*table, apr_pstrdup(pconf, key), value); -+ -+ return NULL; -+} - - /* This function handles configuration directives which set a file - * slot in the module configuration. If lasso is recent enough, it - * attempts to read the file immediatly. -@@ -1008,9 +1049,9 @@ - "Default is 1s" - ), - AP_INIT_TAKE12( - "MellonProbeDiscoveryIdP", -- am_set_hash_string_slot, -+ am_set_table_string_slot, - (void *)APR_OFFSETOF(am_dir_cfg_rec, probe_discovery_idp), - OR_AUTHCFG, - "An IdP that can be used for IdP probe discovery." - ), -@@ -1097,9 +1138,9 @@ - dir->idp_ignore = NULL; - dir->login_path = default_login_path; - dir->discovery_url = NULL; - dir->probe_discovery_timeout = -1; /* -1 means no probe discovery */ -- dir->probe_discovery_idp = apr_hash_make(p); -+ dir->probe_discovery_idp = apr_table_make(p, 0); - - dir->sp_org_name = apr_hash_make(p); - dir->sp_org_display_name = apr_hash_make(p); - dir->sp_org_url = apr_hash_make(p); -@@ -1292,12 +1333,12 @@ - (add_cfg->probe_discovery_timeout != -1 ? - add_cfg->probe_discovery_timeout : - base_cfg->probe_discovery_timeout); - -- new_cfg->probe_discovery_idp = apr_hash_copy(p, -- (apr_hash_count(add_cfg->probe_discovery_idp) > 0) ? -- add_cfg->probe_discovery_idp : -- base_cfg->probe_discovery_idp); -+ new_cfg->probe_discovery_idp = apr_table_copy(p, -+ (!apr_is_empty_table(add_cfg->probe_discovery_idp)) ? -+ add_cfg->probe_discovery_idp : -+ base_cfg->probe_discovery_idp); - - - if (cfg_can_inherit_lasso_server(add_cfg)) { - new_cfg->inherit_server_from = base_cfg->inherit_server_from; ---- auth_mellon_handler.c.orig 2011-05-18 12:39:00.000000000 +0200 -+++ auth_mellon_handler.c 2011-12-06 10:40:20.000000000 +0100 -@@ -2572,8 +2572,40 @@ - - return am_send_authn_request(r, idp, return_to, is_passive); - } - -+/* This function probes an URL (HTTP GET) -+ * -+ * Parameters: -+ * request_rec *r The request. -+ * const char *url The URL -+ * int timeout Timeout in seconds -+ * -+ * Returns: -+ * OK on success, or an error if any of the steps fail. -+ */ -+static int am_probe_url(request_rec *r, const char *url, int timeout) -+{ -+ void *dontcare; -+ apr_size_t len; -+ long status; -+ int error; -+ -+ status = 0; -+ if ((error = am_httpclient_get(r, url, &dontcare, &len, -+ timeout, &status)) != OK) -+ return error; -+ -+ if (status != HTTP_OK) { -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, -+ "Probe on \"%s\" returned HTTP %ld", -+ url, status); -+ return status; -+ } -+ -+ return OK; -+} -+ - /* This function handles requests to the probe discovery handler - * - * Parameters: - * request_rec *r The request. -@@ -2583,11 +2615,10 @@ - */ - static int am_handle_probe_discovery(request_rec *r) { - am_dir_cfg_rec *cfg = am_get_dir_cfg(r); - LassoServer *server; -- const char *idp = NULL; -+ const char *disco_idp = NULL; - int timeout; -- GHashTableIter iter; - char *return_to; - char *idp_param; - char *redirect_url; - int ret; -@@ -2644,82 +2675,77 @@ - - /* - * Proceed with built-in IdP discovery. - * -- * Send probes for all configured IdP to check availability. -- * The first to answer is chosen, but the list of usable -- * IdP can be restricted in configuration. -+ * First try sending probes to IdP configured for discovery. -+ * Second send probes for all configured IdP -+ * The first to answer is chosen. -+ * If none answer, use the first configured IdP - */ -- g_hash_table_iter_init(&iter, server->providers); -- while (g_hash_table_iter_next(&iter, (void**)&idp, NULL)) { -- void *dontcare; -- const char *ping_url; -- apr_size_t len; -- long status; -- -- ping_url = idp; -- -- /* -- * If a list of IdP was given for probe discovery, -- * skip any IdP that does not match. -- */ -- if (apr_hash_count(cfg->probe_discovery_idp) != 0) { -- char *value = apr_hash_get(cfg->probe_discovery_idp, -- idp, APR_HASH_KEY_STRING); -- -- if (value == NULL) { -- /* idp not in list, try the next one */ -- continue; -- } else { -- /* idp in list, use the value as the ping url */ -- ping_url = value; -+ if (!apr_is_empty_table(cfg->probe_discovery_idp)) { -+ const apr_array_header_t *header; -+ apr_table_entry_t *elts; -+ const char *url; -+ const char *idp; -+ int i; -+ -+ header = apr_table_elts(cfg->probe_discovery_idp); -+ elts = (apr_table_entry_t *)header->elts; -+ -+ for (i = 0; i < header->nelts; i++) { -+ idp = elts[i].key; -+ url = elts[i].val; -+ -+ if (am_probe_url(r, url, timeout) == OK) { -+ disco_idp = idp; -+ break; - } - } -- -- status = 0; -- if (am_httpclient_get(r, ping_url, &dontcare, &len, -- timeout, &status) != OK) -- continue; -- -- if (status != HTTP_OK) { -- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, -- "Cannot probe %s: \"%s\" returned HTTP %ld", -- idp, ping_url, status); -- continue; -+ } else { -+ GList *iter; -+ GList *idp_list; -+ const char *idp; -+ -+ idp_list = g_hash_table_get_keys(server->providers); -+ for (iter = idp_list; iter != NULL; iter = iter->next) { -+ idp = iter->data; -+ -+ if (am_probe_url(r, idp, timeout) == OK) { -+ disco_idp = idp; -+ break; -+ } - } -- -- /* We got some succes */ -- ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, -- "probeDiscovery using %s", idp); -- break; -+ g_list_free(idp_list); - } - - /* - * On failure, try default - */ -- if (idp == NULL) { -- idp = am_first_idp(r); -- if (idp == NULL) { -+ if (disco_idp == NULL) { -+ disco_idp = am_first_idp(r); -+ if (disco_idp == NULL) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - "probeDiscovery found no usable IdP."); - return HTTP_INTERNAL_SERVER_ERROR; - } else { - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "probeDiscovery " -- "failed, trying default IdP %s", idp); -+ "failed, trying default IdP %s", disco_idp); - } -+ } else { -+ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, -+ "probeDiscovery using %s", disco_idp); - } - - redirect_url = apr_psprintf(r->pool, "%s%s%s=%s", return_to, - strchr(return_to, '?') ? "&" : "?", - am_urlencode(r->pool, idp_param), -- am_urlencode(r->pool, idp)); -+ am_urlencode(r->pool, disco_idp)); - - apr_table_setn(r->headers_out, "Location", redirect_url); - - return HTTP_SEE_OTHER; - } - -- - /* This function takes a request for an endpoint and passes it on to the - * correct handler function. - * - * Parameters: diff --git a/www/ap2-auth-mellon/patches/patch-aj b/www/ap2-auth-mellon/patches/patch-aj new file mode 100644 index 00000000000..ed997cd06fd --- /dev/null +++ b/www/ap2-auth-mellon/patches/patch-aj @@ -0,0 +1,105 @@ +$NetBSD$ + +MellonSPentityId option to control entityID in autogenerated metadata +(patch from upstream) + +Index: auth_mellon_config.c +=================================================================== +--- auth_mellon_config.c (revision 204) ++++ auth_mellon_config.c (working copy) +@@ -1064,6 +1064,13 @@ + OR_AUTHCFG, + "List of IdP entityId to ignore." + ), ++ AP_INIT_TAKE1( ++ "MellonSPentityId", ++ ap_set_string_slot, ++ (void *)APR_OFFSETOF(am_dir_cfg_rec, sp_entity_id), ++ OR_AUTHCFG, ++ "SP entity Id to be used for metadata auto generation." ++ ), + AP_INIT_TAKE12( + "MellonOrganizationName", + am_set_langstring_slot, +@@ -1231,6 +1238,7 @@ + dir->probe_discovery_timeout = -1; /* -1 means no probe discovery */ + dir->probe_discovery_idp = apr_table_make(p, 0); + ++ dir->sp_entity_id = NULL; + dir->sp_org_name = apr_hash_make(p); + dir->sp_org_display_name = apr_hash_make(p); + dir->sp_org_url = apr_hash_make(p); +@@ -1400,6 +1408,10 @@ + add_cfg->idp_ignore : + base_cfg->idp_ignore; + ++ new_cfg->sp_entity_id = (add_cfg->sp_entity_id ? ++ add_cfg->sp_entity_id : ++ base_cfg->sp_entity_id); ++ + new_cfg->sp_org_name = apr_hash_copy(p, + (apr_hash_count(add_cfg->sp_org_name) > 0) ? + add_cfg->sp_org_name : +Index: auth_mellon_handler.c +=================================================================== +--- auth_mellon_handler.c (revision 204) ++++ auth_mellon_handler.c (working copy) +@@ -117,7 +117,10 @@ + am_dir_cfg_rec *cfg = am_get_dir_cfg(r); + char *url = am_get_endpoint_url(r); + char *cert = ""; ++ const char *sp_entity_id; + ++ sp_entity_id = cfg->sp_entity_id ? cfg->sp_entity_id : url; ++ + if (cfg->sp_cert_file) { + char *sp_cert_file; + char *cp; +@@ -171,7 +174,7 @@ + return apr_psprintf(p, + "\n\ + \n\ + \n\ + %s\n\ + ", +- url, cert, url, url, url, url, am_optional_metadata(p, r)); ++ sp_entity_id, cfg->sp_entity_id ? "" : "metadata", ++ cert, url, url, url, url, am_optional_metadata(p, r)); + } + #endif /* HAVE_lasso_server_new_from_buffers */ + +Index: auth_mellon.h +=================================================================== +--- auth_mellon.h (revision 204) ++++ auth_mellon.h (working copy) +@@ -195,6 +195,7 @@ + GList *idp_ignore; + + /* metadata autogeneration helper */ ++ char *sp_entity_id; + apr_hash_t *sp_org_name; + apr_hash_t *sp_org_display_name; + apr_hash_t *sp_org_url; +Index: README +=================================================================== +--- README (revision 204) ++++ README (working copy) +@@ -332,7 +332,11 @@ + # Default: None set. + MellonSPMetadataFile /etc/apache2/mellon/sp-metadata.xml + +- # If you choose to autogenerate metadata, these option ++ # If you choose to autogenerate metadata, this option ++ # can be used to control the SP entityId ++ # MellonSPentityId "https://www.example.net/foo" ++ # ++ # If you choose to autogenerate metadata, these options + # can be used to fill the element. They + # all follow the syntax "option [lang] value": + # MellonOrganizationName "random-service" -- 2.11.4.GIT