From 9aa0732e56ee9300907d195a35515c3aa0edb46c Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 24 Jan 2022 19:02:16 +0100 Subject: [PATCH] Replace reference to MIT/X or X/MIT to MIT (fixes #5154) --- .zenodo.json | 2 +- CMakeLists.txt | 2 +- LICENSE.TXT | 2 +- PROVENANCE.TXT | 42 +++++++++---------- README.md | 2 +- alg/CMakeLists.txt | 2 +- alg/llrasterize.cpp | 2 +- apps/CMakeLists.txt | 2 +- autotest/CMakeLists.txt | 2 +- autotest/cpp/CMakeLists.txt | 2 +- autotest/gcore/CMakeLists.txt | 2 +- autotest/gcore/basic_test.py | 2 +- autotest/gdrivers/data/vrt/n43_hillshade.vrt | 2 +- autotest/ogr/data/gpx/test.gpx | 2 +- cmake/helpers/CheckDependentLibraries.cmake | 2 +- cmake/helpers/GdalDriverHelper.cmake | 2 +- cmake/helpers/GdalStandardIncludes.cmake | 2 +- cmake/helpers/GdalSwigBindings.cmake | 2 +- cmake/helpers/GdalVersion.cmake | 2 +- cmake/helpers/TargetPublicHeader.cmake | 2 +- cmake/helpers/configure.cmake | 2 +- cmake/modules/packages/FindMRSID.cmake | 2 +- doc/CMakeLists.txt | 2 +- doc/source/about_no_title.rst | 2 +- .../development/rfc/rfc34_license_policy.rst | 6 +-- doc/source/development/rfc/rfc3_commiters.rst | 4 +- doc/source/drivers/raster/vrt.rst | 2 +- doc/source/license.rst | 2 +- docker/README.md | 4 +- docker/alpine-normal/Dockerfile | 2 +- docker/alpine-normal/build.sh | 2 +- docker/alpine-small/Dockerfile | 2 +- docker/alpine-small/build.sh | 2 +- docker/build-all.sh | 2 +- docker/ubuntu-full/Dockerfile | 2 +- docker/ubuntu-full/build.sh | 2 +- docker/ubuntu-small/Dockerfile | 2 +- docker/ubuntu-small/build.sh | 2 +- docker/util.sh | 2 +- doxygen_index.md | 2 +- frmts/CMakeLists.txt | 2 +- frmts/aaigrid/CMakeLists.txt | 2 +- frmts/adrg/CMakeLists.txt | 2 +- frmts/aigrid/CMakeLists.txt | 2 +- frmts/airsar/CMakeLists.txt | 2 +- frmts/bsb/README.dist | 2 +- fuzzers/CMakeLists.txt | 2 +- fuzzers/tests/CMakeLists.txt | 2 +- gcore/CMakeLists.txt | 2 +- gcore/gdal_misc.cpp | 2 +- gcore/mdreader/CMakeLists.txt | 2 +- gdal.cmake | 2 +- gnm/CMakeLists.txt | 2 +- gnm/gnm_frmts/CMakeLists.txt | 2 +- gnm/gnm_frmts/db/CMakeLists.txt | 2 +- ogr/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/dgn/web/index.html | 4 +- ogr/ogrsf_frmts/mitab/HISTORY.TXT | 2 +- port/CMakeLists.txt | 2 +- swig/CMakeLists.txt | 2 +- swig/perl/CMakeLists.txt | 2 +- swig/python/CMakeLists.txt | 2 +- 62 files changed, 87 insertions(+), 87 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 6ee856790b65..20ba39fe09cf 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -61,7 +61,7 @@ "orcid": "0000-0001-9812-7584" } ], - "description": "GDAL is a translator library for raster and vector geospatial data formats that is released under an X/MIT style Open Source License by the Open Source Geospatial Foundation. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing.", + "description": "GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source License by the Open Source Geospatial Foundation. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing.", "keywords": [ "GDAL", "geospatial", diff --git a/CMakeLists.txt b/CMakeLists.txt index fa7ef06a8cd2..9744d4f54ba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. cmake_minimum_required(VERSION 3.10) # cmake version 3.12 or later diff --git a/LICENSE.TXT b/LICENSE.TXT index 11fa09921e34..111ee317827a 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -12,7 +12,7 @@ switch. GDAL/OGR General ---------------- -In general GDAL/OGR is licensed under an MIT/X style license with the +In general GDAL/OGR is licensed under an MIT style license with the following terms: Permission is hereby granted, free of charge, to any person obtaining a diff --git a/PROVENANCE.TXT b/PROVENANCE.TXT index 6a5cfc666a1a..3c4d1b792efd 100644 --- a/PROVENANCE.TXT +++ b/PROVENANCE.TXT @@ -109,12 +109,12 @@ Note: all the following are build options, not required. === gdal/alg === * contour.cpp: Joint copyright between FrankW and ACT. -* gdal_crs.c: derived from old GRASS/UMichigan code also under MIT/X license, properly noted in headers. +* gdal_crs.c: derived from old GRASS/UMichigan code also under MIT license, properly noted in headers. * gdalmediancut.cpp: derived from libtiff tiffmedian.c utility under a GDAL compatible license. Properly noted in headers. -* gdalrasterize.cpp: Derived from OpenEV code. Relicensed from LGPL to MIT/X by explicit grant from copyright holder (Frank Warmerdam). +* gdalrasterize.cpp: Derived from OpenEV code. Relicensed from LGPL to MIT by explicit grant from copyright holder (Frank Warmerdam). * gvgcpfit.c: Believed to be derived from Numerical Recipes in C. It has not been used for some time, but was still in the CVS repository. I have now removed it. -* llrasterize.c: Derived from GD which has compatible MIT/X license. Properly noted in header. -* thinplatespline.cpp: Contributed by VIZRT Inc., Relicensed to MIT/X with their explicit permission as noted in the header. +* llrasterize.c: Derived from GD which has compatible MIT license. Properly noted in header. +* thinplatespline.cpp: Contributed by VIZRT Inc., Relicensed to MIT with their explicit permission as noted in the header. === gdal/data === @@ -144,11 +144,11 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/generic === -* Some files here (and elsewhere in OGR) copyright Softmap Inc (but MIT/X). +* Some files here (and elsewhere in OGR) copyright Softmap Inc (but MIT). === gdal/ogr/ogrsf_frmts/avc === -* Some copyright Daniel Morissette, MIT/X. +* Some copyright Daniel Morissette, MIT. * Included copy of dbfopen.h from Shapelib. We really ought to reference the one in ../shape. === gdal/ogr/ogrsf_frmts/csv === @@ -157,7 +157,7 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/dgn === -* Copyright Avenza Systems (MIT/X). +* Copyright Avenza Systems (MIT). * dgn_pge.cpp, dgn_pge.h, pge_test.cpp, vbe_pge.cpp: copyright Pacific Gas and Electric, all rights reserved! (this has all been removed from trunk) * web/* docs lack any copyright message. The isff.txt originally came from Intergraph and dgn.html is a reformatted version of that. Perhaps these ought to move out of GDAL CVS tree - action: this has been removed from svn. (#1813) @@ -167,7 +167,7 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/fme === -* All code is Copyright Safe Software, "All Rights Reserved"! - License changed to MIT/X with explicit permission from Dale Lutz. Copyright still held by Safe. +* All code is Copyright Safe Software, "All Rights Reserved"! - License changed to MIT with explicit permission from Dale Lutz. Copyright still held by Safe. === gdal/ogr/ogrsf_frmts/gml === @@ -176,11 +176,11 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/grass === -* copyright Radim Blazek, MIT/X. +* copyright Radim Blazek, MIT. === gdal/ogr/ogrsf_frmts/ili === -* ili level code copyright Pirmin Kalberer (Sourcepole), MIT/X. +* ili level code copyright Pirmin Kalberer (Sourcepole), MIT. * iom/ili2c.jar is ambiguous. (#1812) (removed - ok) * iom source code is all LGPL (per iom/README.src.txt) but none of the source files have a copyright or license header. Action: this file has been removed. (#1812) @@ -190,7 +190,7 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/mitab === -* Copyright Daniel Morissette, Stepane Villeneuve, Frank Warmerdam (MIT/X). +* Copyright Daniel Morissette, Stepane Villeneuve, Frank Warmerdam (MIT). * Some code derived from MapServer with credit in headers, no problem foreseen. * All clean. @@ -213,7 +213,7 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/ogdi === -* Copyright Daniel Morrissette, MIT/X. +* Copyright Daniel Morrissette, MIT. === gdal/ogr/ogrsf_frmts/pg === @@ -242,9 +242,9 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts/shape === -* inline copy of Shapelib which is dual licensed MIT/X and LGPL. +* inline copy of Shapelib which is dual licensed MIT and LGPL. * Note, Shapelib code was written while I was at PCI, but permission was given to release it as open source. -* Some (OGR) code is Copyright Softmap Inc, MIT/X. +* Some (OGR) code is Copyright Softmap Inc, MIT. === gdal/ogr/ogrsf_frmts/sqlite === @@ -260,14 +260,14 @@ Note: all the following are build options, not required. === gdal/ogr/ogrsf_frmts === -* Some copyright softmap Inc, all MIT/X. +* Some copyright softmap Inc, all MIT. === gdal/ogr === * SpatialReferenceIdl.idl, GeometryIdl.idl, CoverageIdl.idl: From OGC spec package I believe. (removed) * ogr_capi_test.c: no copyright message, written by Daniel Morissette. Added copyright. * oledbgis.h: No copyright message, mostly OGC spec constants. -* ogr_swq.h, swq.c: Has alternate form of MIT/X license. On review this license is functionally equivalent to the general GDAL license. +* ogr_swq.h, swq.c: Has alternate form of MIT license. On review this license is functionally equivalent to the general GDAL license. * Copyright holders include Frank Warmerdam, Daniel Morissette, Softmap Inc., Stephane Villeneuve., Andrey Kiselev, Information Interoperability Institute === gdal/frmts/aaigrid === @@ -276,7 +276,7 @@ Note: all the following are build options, not required. === gdal/frmts/aigrid === -* aigccitt.c: Derived from libtiff - MIT/X. +* aigccitt.c: Derived from libtiff - MIT. * FrankW, clean. === gdal/frmts/airsar === @@ -337,7 +337,7 @@ See [http://home.gdal.org/projects/bsb/ipi.html] === gdal/frmts/gif === * FrankW, clean. -* libungif is under the MIT/X license as established in ticket #1818. +* libungif is under the MIT license as established in ticket #1818. === gdal/frmts/grass === @@ -346,10 +346,10 @@ See [http://home.gdal.org/projects/bsb/ipi.html] === gdal/frmts/gtiff === -* tif_float.c: Industrial Light and Magic - MIT/X style, but with a credit requirement. Added license notice in gdal/LICENSE.TXT, setup ticket #1819 to streamline it's use. -* tif_memio.c: FrankW, Mike Johnson and MancTec AB - MIT/X. +* tif_float.c: Industrial Light and Magic - MIT style, but with a credit requirement. Added license notice in gdal/LICENSE.TXT, setup ticket #1819 to streamline it's use. +* tif_memio.c: FrankW, Mike Johnson and MancTec AB - MIT. * Contains copy of libtiff, license terms explicit in source files. -* Contains copy of libgeotiff, license terms not made clear. A review of libgeotiff's LICENSE file makes it clear code is public domain unless otherwise noted (which would be FrankW's MIT/X code) +* Contains copy of libgeotiff, license terms not made clear. A review of libgeotiff's LICENSE file makes it clear code is public domain unless otherwise noted (which would be FrankW's MIT code) === gdal/frmts/gxf === diff --git a/README.md b/README.md index dca9cb7910ed..63aaeb0a2a2e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ GDAL - Geospatial Data Abstraction Library [![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A )](http://numfocus.org) -GDAL is an open source X/MIT licensed translator library for raster and vector geospatial data formats. +GDAL is an open source MIT licensed translator library for raster and vector geospatial data formats. * Main site: https://gdal.org - Developer and user docs, links to other resources * GIT repository: https://github.com/OSGeo/gdal diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt index 5fdd0bf19df9..290e75104ade 100644 --- a/alg/CMakeLists.txt +++ b/alg/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library( alg OBJECT diff --git a/alg/llrasterize.cpp b/alg/llrasterize.cpp index 2104bdd3ee3b..9971a8b53ed0 100644 --- a/alg/llrasterize.cpp +++ b/alg/llrasterize.cpp @@ -70,7 +70,7 @@ CPL_CVSID("$Id$") * http://www.boutell.com/gd/ * * It was later adapted for direct inclusion in GDAL and relicensed under - * the GDAL MIT/X license (pulled from the OpenEV distribution). + * the GDAL MIT license (pulled from the OpenEV distribution). */ void GDALdllImageFilledPolygon(int nRasterXSize, int nRasterYSize, diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 26e5fc909a05..aaae4137df72 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. include(GdalStandardIncludes) add_library( diff --git a/autotest/CMakeLists.txt b/autotest/CMakeLists.txt index ee876f707b7f..e48835cc021c 100644 --- a/autotest/CMakeLists.txt +++ b/autotest/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. #[[ option(AUTOTEST_DOWNLOAD_TEST_DATA "Autotest to download test data" OFF) diff --git a/autotest/cpp/CMakeLists.txt b/autotest/cpp/CMakeLists.txt index 2ea8dee76edc..fad15a422786 100644 --- a/autotest/cpp/CMakeLists.txt +++ b/autotest/cpp/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. set(GDAL_ROOT_TEST_DIR "${PROJECT_SOURCE_DIR}/autotest") diff --git a/autotest/gcore/CMakeLists.txt b/autotest/gcore/CMakeLists.txt index 75961f31147f..93440516e596 100644 --- a/autotest/gcore/CMakeLists.txt +++ b/autotest/gcore/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. foreach ( test_target IN diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py index 7c181078c62c..9b9cd02addc9 100755 --- a/autotest/gcore/basic_test.py +++ b/autotest/gcore/basic_test.py @@ -173,7 +173,7 @@ def test_basic_test_8(): license_text = gdal.VersionInfo('LICENSE') assert ( - license_text.startswith('GDAL/OGR is released under the MIT/X license') + license_text.startswith('GDAL/OGR is released under the MIT license') or 'GDAL/OGR Licensing' in license_text ) diff --git a/autotest/gdrivers/data/vrt/n43_hillshade.vrt b/autotest/gdrivers/data/vrt/n43_hillshade.vrt index 6f8f1349a234..5a9568491983 100644 --- a/autotest/gdrivers/data/vrt/n43_hillshade.vrt +++ b/autotest/gdrivers/data/vrt/n43_hillshade.vrt @@ -15,7 +15,7 @@ - + 2 diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake index 864a822d989a..25c5be8c9783 100644 --- a/cmake/helpers/CheckDependentLibraries.cmake +++ b/cmake/helpers/CheckDependentLibraries.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying file LICENSE.TXT. +# Distributed under the GDAL/OGR MIT style License. See accompanying file LICENSE.TXT. #[=======================================================================[.rst: CheckDependentLibraries.cmake diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake index 27704357d718..076729304699 100644 --- a/cmake/helpers/GdalDriverHelper.cmake +++ b/cmake/helpers/GdalDriverHelper.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying +# Distributed under the GDAL/OGR MIT style License. See accompanying # file LICENSE.TXT. #[=======================================================================[.rst: diff --git a/cmake/helpers/GdalStandardIncludes.cmake b/cmake/helpers/GdalStandardIncludes.cmake index c38c057b1261..e138d2175838 100644 --- a/cmake/helpers/GdalStandardIncludes.cmake +++ b/cmake/helpers/GdalStandardIncludes.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying +# Distributed under the GDAL/OGR MIT style License. See accompanying # file LICENSE.TXT. #[=======================================================================[.rst: diff --git a/cmake/helpers/GdalSwigBindings.cmake b/cmake/helpers/GdalSwigBindings.cmake index c4a0a725722a..9ae0800d11c6 100644 --- a/cmake/helpers/GdalSwigBindings.cmake +++ b/cmake/helpers/GdalSwigBindings.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying +# Distributed under the GDAL/OGR MIT style License. See accompanying # file LICENSE.TXT. #[=======================================================================[.rst: diff --git a/cmake/helpers/GdalVersion.cmake b/cmake/helpers/GdalVersion.cmake index 7769ab52b4bd..ff3d527b306b 100644 --- a/cmake/helpers/GdalVersion.cmake +++ b/cmake/helpers/GdalVersion.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying +# Distributed under the GDAL/OGR MIT style License. See accompanying # file LICENSE.TXT. #[=======================================================================[.rst: diff --git a/cmake/helpers/TargetPublicHeader.cmake b/cmake/helpers/TargetPublicHeader.cmake index 1393cd460a2c..05732a0a8fec 100644 --- a/cmake/helpers/TargetPublicHeader.cmake +++ b/cmake/helpers/TargetPublicHeader.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying +# Distributed under the GDAL/OGR MIT style License. See accompanying # file LICENSE.TXT. #[=======================================================================[.rst: diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake index d93acc6b7ae8..a6976ab11bfc 100644 --- a/cmake/helpers/configure.cmake +++ b/cmake/helpers/configure.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying file LICENSE.TXT. +# Distributed under the GDAL/OGR MIT style License. See accompanying file LICENSE.TXT. #[=======================================================================[.rst: configure diff --git a/cmake/modules/packages/FindMRSID.cmake b/cmake/modules/packages/FindMRSID.cmake index 738bd369346b..0004ca57c2a2 100644 --- a/cmake/modules/packages/FindMRSID.cmake +++ b/cmake/modules/packages/FindMRSID.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying +# Distributed under the GDAL/OGR MIT style License. See accompanying # file LICENSE.TXT. #[=======================================================================[.rst: diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 3ba536b74f83..46489587a200 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. # Documentation rules find_package(Doxygen) diff --git a/doc/source/about_no_title.rst b/doc/source/about_no_title.rst index 9a660954de11..4ec310bd5610 100644 --- a/doc/source/about_no_title.rst +++ b/doc/source/about_no_title.rst @@ -1,6 +1,6 @@ .. include:: ./substitutions.rst -GDAL is a translator library for raster and vector geospatial data formats that is released under an X/MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the December 2021 GDAL/OGR 3.4.1 release. +GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the December 2021 GDAL/OGR 3.4.1 release. .. image:: ../images/OSGeo_project.png :alt: OSGeo project diff --git a/doc/source/development/rfc/rfc34_license_policy.rst b/doc/source/development/rfc/rfc34_license_policy.rst index 14d21ab701ef..a0b0e12341c0 100644 --- a/doc/source/development/rfc/rfc34_license_policy.rst +++ b/doc/source/development/rfc/rfc34_license_policy.rst @@ -27,7 +27,7 @@ executable and distributed beyond the creator to also be offered under open source terms. Non-Reciprocal FOSS License: A open source software license, such as -MIT/X, BSD or LGPL, that does not place any requirements on other linked +MIT, BSD or LGPL, that does not place any requirements on other linked components in the same executable at distribution time. Proprietary License: Software provided under terms that do not adhere to @@ -40,7 +40,7 @@ distributor or end user. Rationale --------- -GDAL/OGR is distributed under the Non-Reciprocal MIT/X open source +GDAL/OGR is distributed under the Non-Reciprocal MIT open source license which facilitates it's use by proprietary and open source applications, and facilitates the inclusion of proprietary format drivers along side the open source format drivers. However, it is still @@ -76,7 +76,7 @@ the driver: such as the GPL, and should not be mixed with proprietary drivers or applications. - "NONRECIPROCAL": the driver is available under a non-reciprocal FOSS - license such as MIT/X, or LGPL. This is the default if no licensing + license such as MIT, or LGPL. This is the default if no licensing policy is declared and is the natural policy of drivers provided as part of GDAL without outside dependencies. - "PROPRIETARY": the driver, usually due to use of proprietary diff --git a/doc/source/development/rfc/rfc3_commiters.rst b/doc/source/development/rfc/rfc3_commiters.rst index 6a552cca4075..39dccabde0a5 100644 --- a/doc/source/development/rfc/rfc3_commiters.rst +++ b/doc/source/development/rfc/rfc3_commiters.rst @@ -155,7 +155,7 @@ the project without it being clearly licensed under the project license. Generally speaking the key issues are that those providing code to be included in the repository understand that the code will be released -under the MIT/X license, and that the person providing the code has the +under the MIT license, and that the person providing the code has the right to contribute the code. For the committer themselves understanding about the license is hopefully clear. For other contributors, the committer should verify the understanding unless the committer is very @@ -165,7 +165,7 @@ frequent contributors). If the contribution was developed on behalf of an employer (on work time, as part of a work project, etc) then it is important that an appropriate representative of the employer understand that the code will -be contributed under the MIT/X license. The arrangement should be +be contributed under the MIT license. The arrangement should be cleared with an authorized supervisor/manager, etc. The code should be developed by the contributor, or the code should be diff --git a/doc/source/drivers/raster/vrt.rst b/doc/source/drivers/raster/vrt.rst index 85d20ac5c05a..0b18e1de5fb6 100644 --- a/doc/source/drivers/raster/vrt.rst +++ b/doc/source/drivers/raster/vrt.rst @@ -1119,7 +1119,7 @@ with hillshading.py: .. code-block:: python - # Licence: X/MIT + # Licence: MIT # Copyright 2016, Even Rouault import math diff --git a/doc/source/license.rst b/doc/source/license.rst index 164b47e6f2d6..b4a083375072 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -9,7 +9,7 @@ License License -------------------------------------------------------------------------------- -In general GDAL/OGR is licensed under an MIT/X style license with the +In general GDAL/OGR is licensed under an MIT style license with the following terms: Permission is hereby granted, free of charge, to any person obtaining a diff --git a/docker/README.md b/docker/README.md index b40b08d9c069..229d8e7af10e 100644 --- a/docker/README.md +++ b/docker/README.md @@ -18,7 +18,7 @@ best of our knowledge and not guaranteed. Users should check by themselves. * External libraries enabled: ultrasmall + libexpat, libpq, libssl * No GDAL Python * Base PROJ grid package (http://download.osgeo.org/proj/proj-datumgrid-1.8.zip) -* Overall licensing terms of the GDAL build: permissive (X/MIT, BSD style, Apache, etc..) +* Overall licensing terms of the GDAL build: permissive (MIT, BSD style, Apache, etc..) See [alpine-small/Dockerfile](alpine-small/Dockerfile) @@ -48,7 +48,7 @@ See [alpine-normal/Dockerfile](alpine-normal/Dockerfile) libzstd, libexpat, libxerces-c, libpq, libssl, libgeos * GDAL Python (Python 3.8) * Base PROJ grid package (http://download.osgeo.org/proj/proj-datumgrid-1.8.zip) -* Overall licensing terms of the GDAL build: LGPL + permissive (X/MIT, BSD style, Apache, etc..) +* Overall licensing terms of the GDAL build: LGPL + permissive (MIT, BSD style, Apache, etc..) See [ubuntu-small/Dockerfile](ubuntu-small/Dockerfile) diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile index f8ca7f71c093..c64fb2762d46 100644 --- a/docker/alpine-normal/Dockerfile +++ b/docker/alpine-normal/Dockerfile @@ -3,7 +3,7 @@ # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault ARG ALPINE_VERSION=3.15 FROM alpine:${ALPINE_VERSION} as builder diff --git a/docker/alpine-normal/build.sh b/docker/alpine-normal/build.sh index 98fe5f003a2c..c074d30ebc46 100755 --- a/docker/alpine-normal/build.sh +++ b/docker/alpine-normal/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault set -eu diff --git a/docker/alpine-small/Dockerfile b/docker/alpine-small/Dockerfile index 8d18fd1b7182..ee3c452e38c5 100644 --- a/docker/alpine-small/Dockerfile +++ b/docker/alpine-small/Dockerfile @@ -3,7 +3,7 @@ # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault ARG ALPINE_VERSION=3.15 FROM alpine:${ALPINE_VERSION} as builder diff --git a/docker/alpine-small/build.sh b/docker/alpine-small/build.sh index bef92563a394..cfab69d98c5d 100755 --- a/docker/alpine-small/build.sh +++ b/docker/alpine-small/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault set -eu diff --git a/docker/build-all.sh b/docker/build-all.sh index db460e5f6a62..e43d5542f9db 100755 --- a/docker/build-all.sh +++ b/docker/build-all.sh @@ -1,7 +1,7 @@ #!/bin/sh # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault set -eu diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile index 83f937472e9d..c0a2f2dc51e1 100644 --- a/docker/ubuntu-full/Dockerfile +++ b/docker/ubuntu-full/Dockerfile @@ -3,7 +3,7 @@ # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault ARG BASE_IMAGE=ubuntu:20.04 ARG TARGET_BASE_IMAGE=ubuntu:20.04 diff --git a/docker/ubuntu-full/build.sh b/docker/ubuntu-full/build.sh index 761bb7173eb7..1f2a8250bc7e 100755 --- a/docker/ubuntu-full/build.sh +++ b/docker/ubuntu-full/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault set -eu diff --git a/docker/ubuntu-small/Dockerfile b/docker/ubuntu-small/Dockerfile index d3420bd3ec5f..684db1134713 100644 --- a/docker/ubuntu-small/Dockerfile +++ b/docker/ubuntu-small/Dockerfile @@ -3,7 +3,7 @@ # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault ARG PROJ_INSTALL_PREFIX=/usr/local ARG BASE_IMAGE=ubuntu:20.04 diff --git a/docker/ubuntu-small/build.sh b/docker/ubuntu-small/build.sh index adf6bc1b2887..85996e80a39e 100755 --- a/docker/ubuntu-small/build.sh +++ b/docker/ubuntu-small/build.sh @@ -1,7 +1,7 @@ #!/bin/sh # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault set -eu diff --git a/docker/util.sh b/docker/util.sh index 132e09bd2a07..a943f240712f 100755 --- a/docker/util.sh +++ b/docker/util.sh @@ -1,7 +1,7 @@ #!/bin/bash # This file is available at the option of the licensee under: # Public domain -# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault +# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault set -e diff --git a/doxygen_index.md b/doxygen_index.md index 1f05dc233026..f34a898f0e78 100644 --- a/doxygen_index.md +++ b/doxygen_index.md @@ -5,7 +5,7 @@ Introduction ---- [GDAL](https://gdal.org) is a translator library for raster and -vector geospatial data formats that is released under an X/MIT style Open +vector geospatial data formats that is released under an MIT style Open Source license by the [Open Source Geospatial Foundation](http://www.osgeo.org/). As a library, it presents a single raster abstract data model and a single vector abstract data diff --git a/frmts/CMakeLists.txt b/frmts/CMakeLists.txt index e4a67ce5c9c1..0892985b4806 100644 --- a/frmts/CMakeLists.txt +++ b/frmts/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library(gdal_frmts OBJECT gdalallregister.cpp) include(GdalDriverHelper) diff --git a/frmts/aaigrid/CMakeLists.txt b/frmts/aaigrid/CMakeLists.txt index 632a6ad46511..63b1076de63b 100644 --- a/frmts/aaigrid/CMakeLists.txt +++ b/frmts/aaigrid/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. # it provides AAIGrid and GRASSASCIIGrid add_gdal_driver( diff --git a/frmts/adrg/CMakeLists.txt b/frmts/adrg/CMakeLists.txt index a8ad4891cc83..58bb24d0929b 100644 --- a/frmts/adrg/CMakeLists.txt +++ b/frmts/adrg/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. There are gdal_ADRG and +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. There are gdal_ADRG and # gdal_SRP driver add_gdal_driver( TARGET gdal_ADRG diff --git a/frmts/aigrid/CMakeLists.txt b/frmts/aigrid/CMakeLists.txt index 82bb0b648eed..d36183ab4d9f 100644 --- a/frmts/aigrid/CMakeLists.txt +++ b/frmts/aigrid/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_gdal_driver( TARGET gdal_AIGrid diff --git a/frmts/airsar/CMakeLists.txt b/frmts/airsar/CMakeLists.txt index 2bdc9819e58a..1480f9caba15 100644 --- a/frmts/airsar/CMakeLists.txt +++ b/frmts/airsar/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_gdal_driver(TARGET gdal_AirSAR SOURCES airsardataset.cpp PLUGIN_CAPABLE NO_DEPS) gdal_standard_includes(gdal_AirSAR) diff --git a/frmts/bsb/README.dist b/frmts/bsb/README.dist index df0292b2a647..d09df9bdfff0 100644 --- a/frmts/bsb/README.dist +++ b/frmts/bsb/README.dist @@ -24,7 +24,7 @@ changes may be needed in cpl_config.h for Windows. License ------- -MIT/X license ... see header of bsb_read.c. +MIT license ... see header of bsb_read.c. On the Web ---------- diff --git a/fuzzers/CMakeLists.txt b/fuzzers/CMakeLists.txt index 5dc7ac2ca271..3f7de175ad35 100644 --- a/fuzzers/CMakeLists.txt +++ b/fuzzers/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. if (NOT TARGET ogr_SQLite) return() diff --git a/fuzzers/tests/CMakeLists.txt b/fuzzers/tests/CMakeLists.txt index fe311d3f2a5a..6186227cc30f 100644 --- a/fuzzers/tests/CMakeLists.txt +++ b/fuzzers/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. set(TEST_ENV) # Set PATH / LD_LIBRARY_PATH diff --git a/gcore/CMakeLists.txt b/gcore/CMakeLists.txt index 6df1dd4b2030..8fb086c895f5 100644 --- a/gcore/CMakeLists.txt +++ b/gcore/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library( gcore OBJECT gdalopeninfo.cpp diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp index 73e3b0789f52..12db612b82ed 100644 --- a/gcore/gdal_misc.cpp +++ b/gcore/gdal_misc.cpp @@ -2270,7 +2270,7 @@ const char * CPL_STDCALL GDALVersionInfo( const char *pszRequest ) if (!pszResultLicence) { pszResultLicence = CPLStrdup( - "GDAL/OGR is released under the MIT/X license.\n" + "GDAL/OGR is released under the MIT license.\n" "The LICENSE.TXT distributed with GDAL/OGR should\n" "contain additional details.\n" ); } diff --git a/gcore/mdreader/CMakeLists.txt b/gcore/mdreader/CMakeLists.txt index 5d020ff32607..2451c81be500 100644 --- a/gcore/mdreader/CMakeLists.txt +++ b/gcore/mdreader/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library( gcore_mdreader OBJECT reader_alos.h diff --git a/gdal.cmake b/gdal.cmake index 570a0160d33e..82a6a2b8f0ed 100644 --- a/gdal.cmake +++ b/gdal.cmake @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. # Switches to control build targets(cached) option(ENABLE_GNM "Build GNM (Geography Network Model) component" ON) diff --git a/gnm/CMakeLists.txt b/gnm/CMakeLists.txt index b8c5c2cfd1c0..4b3bfe4f2c0e 100644 --- a/gnm/CMakeLists.txt +++ b/gnm/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. if (ENABLE_GNM) add_subdirectory(gnm_frmts) diff --git a/gnm/gnm_frmts/CMakeLists.txt b/gnm/gnm_frmts/CMakeLists.txt index f3350683b7d0..47cfb856076f 100644 --- a/gnm/gnm_frmts/CMakeLists.txt +++ b/gnm/gnm_frmts/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library(gnm_frmts OBJECT gnm_frmts.h gnmregisterall.cpp) gdal_standard_includes(gnm_frmts) diff --git a/gnm/gnm_frmts/db/CMakeLists.txt b/gnm/gnm_frmts/db/CMakeLists.txt index f74c726efe73..f48904e619c6 100644 --- a/gnm/gnm_frmts/db/CMakeLists.txt +++ b/gnm/gnm_frmts/db/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library(gnm_frmts_db OBJECT gnmdb.h gnmdbdriver.cpp gnmdbnetwork.cpp) gdal_standard_includes(gnm_frmts_db) diff --git a/ogr/CMakeLists.txt b/ogr/CMakeLists.txt index 44062dc20d70..54c074d993c3 100644 --- a/ogr/CMakeLists.txt +++ b/ogr/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. add_library( ogr OBJECT diff --git a/ogr/ogrsf_frmts/dgn/web/index.html b/ogr/ogrsf_frmts/dgn/web/index.html index c8512192c71a..7f05914733d4 100644 --- a/ogr/ogrsf_frmts/dgn/web/index.html +++ b/ogr/ogrsf_frmts/dgn/web/index.html @@ -10,7 +10,7 @@

DGNLib: a Microstation DGN (ISFF) Reader

I (Frank Warmerdam) have implemented a Microstation DGN reading library on contract to Avenza Systems Inc., makers of -MAPublisher. The library will be OpenSource (under my usual X/MIT license), +MAPublisher. The library will be OpenSource (under my usual MIT license), portable and callable from C/C++. While it has been incorporated into my OGR Simple Features library, it is also be usable standalone with minimal overhead. The dgnlib library, and this @@ -66,7 +66,7 @@

DGNLib

  • What is the license?

    -DGNLib is under my usual MIT/X style open source license. Thus is can be +DGNLib is under my usual MIT style open source license. Thus is can be easily used in commercial, and free products with no concern about licensing issues. See the header of any source file for the full license text.

    diff --git a/ogr/ogrsf_frmts/mitab/HISTORY.TXT b/ogr/ogrsf_frmts/mitab/HISTORY.TXT index 296f223e6132..4c5233683817 100644 --- a/ogr/ogrsf_frmts/mitab/HISTORY.TXT +++ b/ogr/ogrsf_frmts/mitab/HISTORY.TXT @@ -835,7 +835,7 @@ Version 1.0.1 - (2000-04-21) Version 1.0 - (2000-03-26) -------------------------- -- Changed to use same MIT/X-Consortium license as other CPL + OGR libs. +- Changed to use same MIT-Consortium license as other CPL + OGR libs. - Fixed problem opening datasets with 0 features in them. diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt index 8f504afd64ef..0a7265bc6ff4 100644 --- a/port/CMakeLists.txt +++ b/port/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. include(TargetPublicHeader) target_public_header( diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index e8ec5ceaa287..b0c735f41ea9 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. set(GDAL_SWIG_COMMON_INTERFACE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/Band.i diff --git a/swig/perl/CMakeLists.txt b/swig/perl/CMakeLists.txt index ccb02b992231..675e9a1f729a 100644 --- a/swig/perl/CMakeLists.txt +++ b/swig/perl/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. find_package(Perl) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/Geo/GDAL) diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index d5e4eb6e42fc..d268e668988b 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -1,4 +1,4 @@ -# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt. +# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt. # SWIG generates wrapper sources option(SWIG_REGENERATE_PYTHON "Generate python source with SWIG." OFF)