# # # patch "AUTHORS" # from [65ed4da856c8c7010c49103f997830621b167150] # to [df340c5609a2e8b2796e1cf2ace6fdf77e07df1b] # # patch "NEWS" # from [12eed0cf8d2b2b8760944e5eae27a739c256a515] # to [ad6f5dba99fdb66ac129ff4d6df0b641aec9cecb] # ============================================================ --- AUTHORS 65ed4da856c8c7010c49103f997830621b167150 +++ AUTHORS df340c5609a2e8b2796e1cf2ace6fdf77e07df1b @@ -291,75 +291,6 @@ in themselves'. contributed code to them). They are 'separate and independent works in themselves'. - -The files in sqlite/ comprise the SQLite database library, written by -D. Richard Hipp and others. The SQLite distribution -may be retrieved from http://www.sqlite.org/. It is declared to be in -the public domain: - -# The author disclaims copyright to this source code. In place of -# a legal notice, here is a blessing: -# -# May you do good and not evil. -# May you find forgiveness for yourself and forgive others. -# May you share freely, never taking more than you give. - - -The files in idna/ are copies of the core portion of the GNU libidn -library for manipulating internationalized domain names, written by -Simon Josefsson. The libidn distribution may be retrieved from -http://josefsson.org/libidn/. It is licensed under the GNU LGPL -version 2.1 or later, with the additional requirement that the -following text be reproduced in any copies made: - -# Libidn AUTHORS -- Information about the authors. -# Copyright (C) 2002, 2003 Simon Josefsson -# See the end for copying conditions. -# -# Simon Josefsson -# Designed and implemented libidn. -# -# -----BEGIN PGP PUBLIC KEY BLOCK----- -# Comment: This 0xB565716F key is used to sign releases of Libidn. -# -# mKsEPNUHKwEFALqJSBHn6Qk5ex138kwymxA3idCFoTi5Q6mVooEVVaYVfeDG+5uV -# T5rhTFDfDcT9SO0eIlfKOraSRnVEHyDDH2PAgJFxyneFELcmLUQ66D+m8z+ziGro -# 6bcDSBBDMRkHIX6/kH/vnevjqivIld+j8WTcVX+SArcKyzgQ58uMTrfQdLqzh6D9 -# sE/838+ZPZkabmKKWMVWccoaUbWGYOcNwO0ABim0IVNpbW9uIEpvc2Vmc3NvbiA8 -# amFzQGV4dHVuZG8uY29tPojYBBMBAgAiAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAUC -# P6QrUQUJA7xyJgAKCRDtoh6UtWVxbwueBP4uh9ZEOuSjt2n5OpfuAablsrRzhlgP -# fluBMfjHNynEFsGjn81l81TCqStRln7wDUj95ZufSi3YvoYSFG1jffGMk/k2trgI -# NtT3kxaGkfns6dykBuV7Ki2wWqdJkTe1ibyai+RCqt+J1ldSUuHdfQZ5wALPJQRb -# 4Hqi7M29azFHcfxbMLf3yGYyBuKC7eBVNVaR58UTFK6r0CX3T7eGuk8biEYEExEC -# AAYFAj1Y8r8ACgkQV5Mp08AbKiIX9wCfR2rMiXdKzZB95acA5YSQ4MLQyygAn1Nv -# 7M36SAofR/73WjqlPpVAQ+fRiEwEExECAAwFAj1esHUFgwFXijYACgkQvLvElXGK -# klYZnQCeOXIzmEoZ5yOVNygphYmUwON/S8IAn32gWDyaTMpqyDcJEQeLdjcW7boS -# tCVTaW1vbiBKb3NlZnNzb24gPHNpbW9uQGpvc2Vmc3Nvbi5vcmc+iNgEEwECACIC -# GwMECwcDAgMVAgMDFgIBAh4BAheABQI/pCtUBQkDvHImAAoJEO2iHpS1ZXFvPREE -# /j3fX+cLxCCZNTjMhThGFujiT7ty4x1jVc91J6QOA+Jp+78NIIeyg3JTeR3WIv7/ -# WFNzLKJXJEEcga+0ViPjoLfvGsHMAnwXqPYAxu1cDY4jId0bCYgoVlnfF9gwOWxe -# btotLpCiuXGL/168zEAXWJpPg6r2MfPhAKUJ9G8q52OOWJW3cObxoZ2gyXjuWOFt -# ygZ1vUAqP/8UGeZNdajHD5uIRgQTEQIABgUCPVjywgAKCRBXkynTwBsqImY3AKCS -# COO5LlNxmritUFY1i7VXBCUlZgCgll/6kE0G/NP3E6AdyzVwAzBPgUeITAQTEQIA -# DAUCPV6wdQWDAVeKNgAKCRC8u8SVcYqSVleXAJ9NZKUvb/erk53fMFUwpUeClOjh -# qwCcC3Du9UQjCn2k+7LWgqNMH+huqW24qwQ81Qd7AQUA2PTaoT8RNkFDlX7UCOB9 -# vaRFxrX+dN7l6QO+O0Mg7dVdjItEnaaYkJ+r4LXecI47HogsUGExRdDYGT0Dq7aZ -# 8GkC4UKPXc3q2KWQ3ib3wj3qnCGm3IX/I249ydYLAzQyWqMW09wLB5vxhPi4yjet -# 4FTGWmtYUlGzDb7+6VZilYRTty0vhFF4cVXlO2R+vgPxFMvUc7o8WGDnQ3iyWAiz -# kQAGKYjFBBgBAgAPAhsMBQI/pCt8BQkDvHIBAAoJEO2iHpS1ZXFvEeIE/ixQWhAC -# pnKjQZeTA7zcshH683NU/bBAjbOq7lJ51aWMXOdXExGJsBD0fyPtRJywMtSB4vrM -# F1WjKZlA0jBOxzxWaWpLvMwdwgkSiql8KTNActxIoijtu0e5GI3V+55Z+Cv/jsPD -# lzeYiob0cO6u/2todt6XVTyCIFKWjf6/5i/LdhXlw7J9gzrCwm28ITC4is3voTNh -# Uceqods6zDrk0qo= -# =1RsN -# -----END PGP PUBLIC KEY BLOCK----- -# -# -------------------------------------------------------------------- -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. - - The files in netxx/ comprise the NetXX library, written by Peter Jones. It is no longer available from its author. It is distributed under a BSD-like license, reproduced here: @@ -394,115 +325,6 @@ under a BSD-like license, reproduced her # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. - -The files in lua/ comprise the Lua interpreter, written by -R. Ierusalimschy, L. H. de Figueiredo, and W. Celes, of Tecgraf -PUC-Rio, and others. The Lua distribution may be retrieved from -http://www.lua.org/. It is licensed under an MIT-like license, -reproduced here: - -# Copyright (C) 1994-2007 Lua.org, PUC-Rio. -# -# 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 files in botan/ comprise the Botan cryptography library, written -by Jack Lloyd with contributions as noted in -botan/thanks.txt. The Botan distribution may be retrieved from -http://botan.randombit.net/. It is licensed under a BSD-like license: - -# Copyright (C) 1999-2008 Jack Lloyd -# 2001 Peter J Jones -# 2004-2007 Justin Karneges -# 2005 Matthew Gregan -# 2005-2006 Matt Johnston -# 2006 Luca Piccarreta -# 2007 Yves Jerschow -# 2007-2008 FlexSecure GmbH -# 2007-2008 Falko Strenzke -# -# Redistribution and use in source and binary forms, for any use, -# with or without modification, is permitted provided that the -# following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions, and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions, and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "AS IS" AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, -# ARE DISCLAIMED. -# -# IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -The files in pcre/ comprise the Perl-Compatible Regular Expression -(PCRE) library, written by Philip Hazel . The PCRE -distribution may be retrieved from http://www.pcre.org/. It is licensed -under a BSD-like license: - -# Copyright (c) 1997-2008 University of Cambridge. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the University of Cambridge nor the names of -# its contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. - - the contrib directory: ---------------------- ============================================================ --- NEWS 12eed0cf8d2b2b8760944e5eae27a739c256a515 +++ NEWS ad6f5dba99fdb66ac129ff4d6df0b641aec9cecb @@ -1,26 +1,3 @@ -Changes from nvm.stripped, please move down when landing on mainline: - - Changes - - - Monotone is now compiled against external libraries and does no - longer ship included variants. This means monotone now requires - these libraries: - - * botan (1.7.8 or newer) - * lua5.1 - * sqlite (3.3.8 or newer) - * pcre (7.6 or newer) - - This reduces maintenance of third-party libraries for monotone - developers and allows us to concentrate on monotone itself. For - the user this means faster adoption of improvements in those - libraries. For example, monotone can now be build against an up - to date sqlite 3.6.3, botan 1.7.17 and pcre 7.8, whereas we - shipped with sqlite 3.4.1, botan 1.7.12 and pcre 7.6 before. - - - - ??? ??? ?? ??:??:?? UTC 2009 0.43 release. @@ -32,6 +9,18 @@ Changes from nvm.stripped, please move d requests more compact. You still see all available global options by executing 'mtn help' without any arguments. + - The Monotone source distribution no longer includes copies of + several third-party libraries. This means they must be downloaded + and built separately, before building monotone. See INSTALL for a + complete list of necessary libraries. + + This allows monotone's developers to concentrate on monotone + itself, rather than tracking external library updates, which in + practice did not happen. By way of illustration, we were still + shipping sqlite 3.4.1, which is years out of date. This has also + been a long-standing request of various redistributors of binary + packages, who prefer the use of globally shared libraries. + Bugs fixed - Several bugfixes to `mtn automate stdio':