Skip to content

Back-merge 1.7 changes into develop #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Back-merge 1.7 changes into develop #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d48ddf1
Merge branch 'develop'
pmconrad May 18, 2020
c8d1fea
Merge branch 'master' into r1.7
pmconrad Jun 9, 2020
8b3393b
Preparing release 1.7
pmconrad Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.tinydnssec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Build
1. Download and unpack the original djbdns sources from
http://cr.yp.to/djbdns/install.html .
2. Download and apply the patches listed above.
3. Download and unpack http://tinydnssec.org/tinydnssec-1.05-1.5.tar.bz2 in
3. Download and unpack http://tinydnssec.org/tinydnssec-1.05-1.7.tar.bz2 in
the top-level source directory.
4. Apply djbdns-1.05-dnssec.patch.
5. Install as per usual instructions (see http://cr.yp.to/djbdns/install.html ).
Expand Down
2 changes: 1 addition & 1 deletion README.tinydnssec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ update:
LICENSE
-------

(C) 2012,2015,2017,2019 Peter Conrad <conrad@quisquis.de>
(C) 2012,2015,2017,2019,2020 Peter Conrad <conrad@quisquis.de>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3 as
Expand Down
7 changes: 4 additions & 3 deletions html/install.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ <h2>Requirements</h2>
Unfortunately, fefe refuses to name a license for this patch, which means
that I cannot redistribute it.</li>

<li>My own fixes to the Makefile (IPv6-related): djbdns-ipv6-make.patch</li>
<li>My own fixes to the Makefile (IPv6-related):
<a href="http://www.tinydnssec.org/djbdns-ipv6-make.patch">djbdns-ipv6-make.patch</a></li>
</ol>

<h2>Build</h2>

<ol>
<li>Download and unpack the <a href="http://cr.yp.to/djbdns/install.html">original djbdns sources</a>.</li>
<li>Download and apply the patches listed above.</li>
<li>Download and unpack <a href="tinydnssec-1.05-1.5.tar.gz">tinydnssec</a> in
<li>Download and unpack <a href="tinydnssec-1.05-1.7.tar.gz">tinydnssec</a> in
the top-level source directory.</li>
<li>Apply djbdns-1.05-dnssec.patch.</li>
<li>Install as per
Expand Down Expand Up @@ -72,7 +73,7 @@ <h2>Test</h2>
<h2>License information</h2>

<p>
(C) 2012,2015,2017,2019 Peter Conrad
(C) 2012,2015,2017,2019,2020 Peter Conrad
</p>
<p>
This program is free software: you can redistribute it and/or modify
Expand Down