zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,301 Commits 27 Branches 108 Tags 109 MiB
Commit Graph

257 Commits

Author SHA1 Message Date
Kris Nuttycombe dae937b5cd
Merge pull request #6405 from daira/patch-copyright 
Clarify that patches to a dependency are under the same license as that dependency
 2023-02-24 17:39:17 -07:00
Jack Grigg 56626bcb29 make-release.py: Updated release notes and changelog for 5.4.1. 2023-02-13 18:10:07 +00:00
Daira Hopwood a65b04a4f5 Update copyright date and email for tl_expected. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2023-02-09 00:48:40 +00:00
Jack Grigg 0e277800bb make-release.py: Updated release notes and changelog for 5.4.0. 2023-02-08 17:21:10 +00:00
Daira Hopwood 1156e43992 Clarify that patches to a dependency are under the same license as that dependency. 
The relevant licenses are:

* bdb: BDB (variant of Gnu Affero GPL)
* libevent: BSD-3-clause
* libsodium: ISC
* tl_expected: CC0-1.0
* zeromq: LGPL-3+ with ZeroMQ exception

In the case of zeromq, this is an explicit condition of the license --
specifically its static linking exception, which we rely on:
"If you modify this library, you must extend this exception to your
version of the library."

In all cases, patches are necessarily derived (even if only trivially)
from the code they are patching. We technically could relicense to MIT
in some cases, but using the original license for patches we've written
is a courtesy that makes it easier for upstream to adopt the patch, even
if we don't specifically file a PR.

native_cctools is also patched, but Debian copyright policy does not
require `contrib/debian/copyright` to mention this dependency, because
it is only part of the build process and its contents do not get compiled
into the resulting build:
https://www.debian.org/doc/debian-policy/ch-archive.html#s-pkgcopyright

In all cases I checked that we have the right to distribute the patch
under the relevant license (i.e. it doesn't depend on any incompatible
third-party contributions). Reviewers should satisfy themselves of this.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2023-02-06 15:17:51 +00:00
Kris Nuttycombe 7b28054e8b make-release.py: Updated release notes and changelog for 5.4.0-rc4. 2023-02-01 17:37:55 -07:00
Kris Nuttycombe d9a60c9d1e make-release.py: Updated release notes and changelog for 5.4.0-rc3. 2023-01-27 15:07:19 -07:00
Jack Grigg f5b123e494 make-release.py: Updated release notes and changelog for 5.4.0-rc2. 2023-01-24 02:13:05 +00:00
str4d d6e2fada84
Merge pull request #6362 from nuttycom/issue2921-fix-copyright-headers 
Replace fix-copyright-headers.py with a script that creates a scripted-diff git commit.
 2023-01-23 22:13:05 +00:00
Kris Nuttycombe 3cec519ce4 scripted-diff: Update Zcash copyrights to 2023 
-BEGIN VERIFY SCRIPT-
for party in "The Zcash developers" "The Bitcoin Core developers" "Bitcoin Developers"; do
  sed -i"" -e "s#Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? $party#Copyright (c) \1-2023 $party#" COPYING
  sed -i"" -e "s#\(.*\)\([0-9]\{4\}\)\(-[0-9]\{4\}\)\, $party#\1\2-2023, $party#" contrib/debian/copyright
done

sed -i"" -e "s/define(_COPYRIGHT_YEAR, [0-9]\{4\})/define(_COPYRIGHT_YEAR, 2023)/" configure.ac
sed -i"" -e "s/#define COPYRIGHT_YEAR [0-9]\{4\}/#define COPYRIGHT_YEAR 2023/" src/clientversion.h

git grep "^// Copyright (c) .* The Zcash developers" \
  | awk -F ':' '{print $1}' \
  | xargs -I {} sed -i"" -e "s#// Copyright (c) \([0-9]\{4\}\)\(-[0-9]\{4\}\)\? The Zcash developers#// Copyright (c) \1-2023 The Zcash developers#" {}
-END VERIFY SCRIPT-
 2023-01-23 11:31:54 -07:00
Kris Nuttycombe b8fe1d2b78 Replace fix-copyright-headers.py with a script that creates a scripted-diff git commit. 
Fixes #2921
Supersedes #4926
 2023-01-23 11:31:41 -07:00
Jack Grigg 227887490b make-release.py: Updated release notes and changelog for 5.4.0-rc1. 2023-01-19 22:57:59 +00:00
Daira Hopwood 4de0d85abf The std::expected proposal has unnecessary instances of undefined behaviour 
for operator->, operator*, and error(). Make these into assertion failures
(this still conforms to the proposal).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-12-08 20:53:54 +00:00
Daira Hopwood 7472b0dbca Add tl::expected. refs #4816 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-12-08 20:53:54 +00:00
Kris Nuttycombe 8b16094f66
Merge pull request #6284 from janisozaur/patch-1 
Update debian/compat to version 13
 2022-12-08 13:08:22 -07:00
Michał Janiszewski e80cd4dd19
Update debian/compat to version 13 
Compat version 13 is currently the recommended one.

An important change introduced in 10 was change of default to target parallel builds

5d1bb29841/debhelper.pod (compatibility-levels)
 2022-12-04 23:54:07 +01:00
Daira Hopwood ed0089d876 make-release.py: Updated release notes and changelog for 5.3.2. 2022-12-03 19:58:44 +00:00
Daira Hopwood 0972ffd785 make-release.py: Updated release notes and changelog for 5.3.1. 2022-12-02 02:46:42 +00:00
Greg Pfeil 761b764b51 make-release.py: Updated release notes and changelog for 5.3.1-rc1. 2022-11-23 22:18:55 -07:00
Greg Pfeil d557b6e5c5 make-release.py: Updated release notes and changelog for 5.3.0. 2022-10-20 10:52:37 -06:00
Jack Grigg 2b28a56c27 make-release.py: Updated release notes and changelog for 5.3.0-rc1. 2022-10-11 11:30:02 +00:00
Kris Nuttycombe df6e05173e
Merge pull request #6083 from zcash/leveldb-1.22 
Update LevelDB to 1.22+
 2022-08-10 18:14:43 -06:00
Daira Hopwood f38db34693 Add contrib/debian/copyright entry for crc32c. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-07-28 19:08:02 +01:00
Sean Bowe b63dc026c7
make-release.py: Updated release notes and changelog for 5.2.0. 2022-07-25 12:42:25 -06:00
Kris Nuttycombe 4a17098b72
Merge branch 'version-5.2.0' into narrow-too-many-args 2022-07-25 10:42:15 -06:00
Daira Hopwood a227652d7d Update cxx to 1.0.72. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-07-25 14:57:19 +01:00
Kris Nuttycombe c2f8318444 make-release.py: Updated release notes and changelog for 5.2.0-rc1. 2022-07-22 15:52:42 -06:00
Jack Grigg 4d7ce75ef1 make-release.py: Updated release notes and changelog for 5.1.0. 2022-07-08 03:01:54 +00:00
sasha eb43bc5c02 make-release.py: Updated release notes and changelog for 5.1.0-rc1. 2022-07-05 22:25:25 +00:00
Jack Grigg 0430fdf20d Upgrade to `orchard 0.2.0` 2022-07-01 01:24:15 +00:00
Daira Hopwood 5b85d9df20 halo2 is now under MIT/Apache-2.0, so does not need a declaration in `contrib/debian/copyright`. 
fixes #5203

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-06-07 18:59:28 +01:00
Jack Grigg 340b2c3a84 Update orchard license with current exception text 
Source: 21ad1ea5cb
which was committed directly on top of the orchard 0.1.0 release commit,
and therefore can be applied to it.
 2022-06-01 20:23:28 +00:00
Kris Nuttycombe 10fb705f45 make-release.py: Updated release notes and changelog for 5.0.0. 2022-05-10 19:52:28 -06:00
Jack Grigg 64ccad1a89 make-release.py: Updated release notes and changelog for 5.0.0-rc1. 2022-05-09 15:35:33 +00:00
Kris Nuttycombe 954e2b4aa6 Add parity-scale-codec licenses to contrib/debian/copyright 2022-05-05 13:06:56 -06:00
Kris Nuttycombe 44d0cf0c7c make-release.py: Updated release notes and changelog for 4.7.0. 2022-04-13 22:14:59 -06:00
therealyingtong 2f51461611 Merge remote-tracking branch 'upstream/hotfix-v4.6.0-2' into master 2022-04-06 17:38:51 +08:00
Jack Grigg f1b6e49998 make-release.py: Updated release notes and changelog for 4.6.0-2. 2022-04-04 21:53:34 +00:00
Daira Hopwood 65d96aaa10 Switch Jack Grigg's copyright on src/rust/{include/tracing.h, src/tracing_ffi.rs} to the 
Zcash developers (with his permission).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-03-26 18:56:34 +00:00
Daira Hopwood ac25936d0e contrib/debian/copyright: add license for Apache-2.0. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-03-26 18:48:31 +00:00
Daira Hopwood 21e5fa90af contrib/debian/copyright: add licenses of Rust dependencies that do not have Expat/MIT as an option. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-03-26 18:45:57 +00:00
Daira Hopwood 623f3568a7 contrib/debian/copyright: minor corrections and formatting 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-03-26 18:45:57 +00:00
Daira Hopwood 4d0c503ee5 contrib/debian/copyright: add license entries for Libtool macros. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2022-03-26 18:45:57 +00:00
Jack Grigg 1f3c145e4a make-release.py: Updated release notes and changelog for 4.7.0-rc1. 2022-03-22 21:14:02 +00:00
Kris Nuttycombe d724c81289
Merge pull request #5438 from sandakersmann/master 
Update copyright year to 2022
 2022-03-18 16:13:43 -06:00
Jack Grigg cf22fa7fe3 make-release.py: Updated release notes and changelog for 4.6.0-1. 2022-01-05 20:18:43 +00:00
Marius Kjærstad bf1cc206c0
Update copyright year to 2022 2021-12-27 00:30:51 +01:00
Sasha eeecf63dae make-release.py: Updated release notes and changelog for 4.6.0. 2021-12-23 00:35:41 +00:00
Jack Grigg 9c4a1e7ad7 make-release.py: Updated release notes and changelog for 4.6.0-rc1. 2021-12-18 04:25:50 +00:00
Kris Nuttycombe 78ee3d7357
Merge pull request #5354 from zcash/hotfix-v4.5.1-1 
Merge v4.5.1-1 hotfix branch
 2021-10-11 08:58:20 -06:00