From: Tom Yu Date: Mon, 7 Nov 2011 22:35:51 +0000 (+0000) Subject: pull up r25443 from trunk X-Git-Tag: krb5-1.10-alpha2~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=098252013308fa2c0b771bec82cdf91faab64a4f;p=krb5.git pull up r25443 from trunk ------------------------------------------------------------------------ r25443 | ghudson | 2011-11-05 15:55:34 -0400 (Sat, 05 Nov 2011) | 11 lines ticket: 7002 target_version: 1.10 tags: pullup Improve verto and libev documentation NOTICE was missing the copyright statement for verto (it's not quite the same as other Red Hat licenses). util/verto had no README file, and neither the verto nor k5ev README contained pointers to the upstream project pages. ticket: 7002 version_fixed: 1.10 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25454 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/NOTICE b/NOTICE index 40b851c85..ab7c6a59f 100644 --- a/NOTICE +++ b/NOTICE @@ -183,6 +183,32 @@ following copyright: ------------------- +The bundled verto source code is subject to the following license: + + Copyright 2011 Red Hat, Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + ------------------- + The implementations of GSSAPI mechglue in GSSAPI-SPNEGO in `src/lib/gssapi', including the following files: diff --git a/doc/copyright.texinfo b/doc/copyright.texinfo index 08d56319a..fb86f5182 100644 --- a/doc/copyright.texinfo +++ b/doc/copyright.texinfo @@ -199,6 +199,33 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @end quotation +@cdivider +The bundled verto source code is subject to the following license: + +@quotation +Copyright 2011 Red Hat, Inc. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation files +(the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +@end quotation + @cdivider The implementations of GSSAPI mechglue in GSSAPI-SPNEGO in diff --git a/src/util/k5ev/README b/src/util/k5ev/README index 10b49976b..7a14f1327 100644 --- a/src/util/k5ev/README +++ b/src/util/k5ev/README @@ -25,3 +25,7 @@ had support for making its API symbols static, but it currently does not.) The source file verto-k5ev.c wraps ev.c with appropriate embedding defines, and then defines the libverto module functions using the slightly modified contents of libverto's verto-ev.c. + +The libev upstream project page is at: + + http://software.schmorp.de/pkg/libev.html diff --git a/src/util/verto/README b/src/util/verto/README new file mode 100644 index 000000000..8e4761056 --- /dev/null +++ b/src/util/verto/README @@ -0,0 +1,6 @@ +This directory builds a verto library with only a private back-end +module, for use when the system has no installed verto library. + +The libverto upstream project page is at: + + https://fedorahosted.org/libverto/