diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT new file mode 100644 index 0000000000..b5a630af4e --- /dev/null +++ b/CODE_OF_CONDUCT @@ -0,0 +1,79 @@ +CODE OF CONDUCT + +BIND 9 Code of Conduct + +Like the technical community as a whole, the BIND 9 team and community is +made up of a mixture of professionals and volunteers from all over the +world, working on every aspect of the mission - including mentorship, +teaching, and connecting people. + +Diversity is one of our huge strengths, but it can also lead to +communication issues and unhappiness. To that end, we have a few ground +rules that we ask people to adhere to. This code applies equally to the +core development team, open source contributors and those seeking help and +guidance. + +This isn't an exhaustive list of things that you can't do. Rather, take it +in the spirit in which it's intended - a guide to make it easier to enrich +all of us and the technical communities in which we participate. + +This code of conduct applies to all spaces managed by the BIND 9 project +or Internet Systems Consortium. This includes chat, the mailing lists, the +issue tracker, and any other fora created by the project team which the +community uses for communication. In addition, violations of this code +outside these spaces may affect a person's ability to participate within +them. + +If you believe someone is violating the code of conduct, we ask that you +report it by emailing conduct@isc.org. For more details please see our +Reporting Guidelines. + + * Be friendly and patient. + * Be welcoming. We strive to be a community that welcomes and supports + people of all backgrounds and identities. This includes, but is not + limited to members of any race, ethnicity, culture, national origin, + colour, immigration status, social and economic class, educational + level, sex, sexual orientation, gender identity and expression, age, + size, family status, political belief, religion, and mental and + physical ability. + * Be considerate. Your work will be used by other people, and you in + turn will depend on the work of others. Any decision you take will + affect users and colleagues, and you should take those consequences + into account when making decisions. Remember that we're a world-wide + community, so you might not be communicating in someone else's primary + language. + * Be respectful. Not all of us will agree all the time, but disagreement + is no excuse for poor behavior and poor manners. We might all + experience some frustration now and then, but we cannot allow that + frustration to turn into a personal attack. It's important to remember + that a community where people feel uncomfortable or threatened is not + a productive one. Members of the BIND 9 community should be respectful + when dealing with other members as well as with people outside the + BIND 9 community. + * Be careful in the words that you choose. We are a community of + professionals, and we conduct ourselves professionally. Be kind to + others. Do not insult or put down other participants. Harassment and + other exclusionary behavior aren't acceptable. This includes, but is + not limited to: + + Violent threats or language directed against another person. + + Discriminatory jokes and language. + + Posting sexually explicit or violent material. + + Posting (or threatening to post) other people's personally + identifying information ("doxing"). + + Personal insults, especially those using racist or sexist terms. + + Unwelcome sexual attention. + + Advocating for, or encouraging, any of the above behavior. + + Repeated harassment of others. In general, if someone asks you to + stop, then stop. + * When we disagree, try to understand why. Disagreements, both social + and technical, happen all the time and BIND 9 is no exception. It is + important that we resolve disagreements and differing views + constructively. Remember that we're different. The strength of BIND 9 + comes from its varied community, people from a wide range of + backgrounds. Different people have different perspectives on issues. + Being unable to understand why someone holds a viewpoint doesn't mean + that they're wrong. Don't forget that it is human to err and blaming + each other doesn't get us anywhere. Instead, focus on helping to + resolve issues and learning from mistakes. + +Original text courtesy of the Django Code of Conduct project. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..2f03710038 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,71 @@ +# BIND 9 Code of Conduct + +Like the technical community as a whole, the BIND 9 team and community is made +up of a mixture of professionals and volunteers from all over the world, working +on every aspect of the mission - including mentorship, teaching, and connecting +people. + +Diversity is one of our huge strengths, but it can also lead to communication +issues and unhappiness. To that end, we have a few ground rules that we ask +people to adhere to. This code applies equally to the core development team, open source contributors and those +seeking help and guidance. + +This isn't an exhaustive list of things that you can't do. Rather, take it in +the spirit in which it's intended - a guide to make it easier to enrich all of +us and the technical communities in which we participate. + +This code of conduct applies to all spaces managed by the BIND 9 project or +Internet Systems Consortium. This includes chat, the mailing lists, the issue +tracker, and any other fora created by the project team which the +community uses for communication. In addition, violations of this code outside +these spaces may affect a person's ability to participate within them. + +If you believe someone is violating the code of conduct, we ask that you report +it by emailing [conduct@isc.org](conduct@isc.org). For more details please see +our [Reporting Guidelines](https://www.isc.org/conductreporting/). + +* **Be friendly and patient.** +* **Be welcoming.** We strive to be a community that welcomes and supports + people of all backgrounds and identities. This includes, but is not limited to + members of any race, ethnicity, culture, national origin, colour, immigration + status, social and economic class, educational level, sex, sexual orientation, + gender identity and expression, age, size, family status, political belief, + religion, and mental and physical ability. +* **Be considerate.** Your work will be used by other people, and you in turn + will depend on the work of others. Any decision you take will affect users and + colleagues, and you should take those consequences into account when making + decisions. Remember that we're a world-wide community, so you might not be + communicating in someone else's primary language. +* **Be respectful.** Not all of us will agree all the time, but disagreement is + no excuse for poor behavior and poor manners. We might all experience some + frustration now and then, but we cannot allow that frustration to turn into a + personal attack. It's important to remember that a community where people feel + uncomfortable or threatened is not a productive one. Members of the BIND 9 + community should be respectful when dealing with other members as well as with + people outside the BIND 9 community. +* **Be careful in the words that you choose.** We are a community of + professionals, and we conduct ourselves professionally. Be kind to others. Do + not insult or put down other participants. Harassment and other exclusionary + behavior aren't acceptable. This includes, but is not limited to: + * Violent threats or language directed against another person. + * Discriminatory jokes and language. + * Posting sexually explicit or violent material. + * Posting (or threatening to post) other people's personally identifying + information ("doxing"). + * Personal insults, especially those using racist or sexist terms. + * Unwelcome sexual attention. + * Advocating for, or encouraging, any of the above behavior. + * Repeated harassment of others. In general, if someone asks you to stop, then + stop. +* **When we disagree, try to understand why.** Disagreements, both social and + technical, happen all the time and BIND 9 is no exception. It is important + that we resolve disagreements and differing views constructively. Remember + that we're different. The strength of BIND 9 comes from its varied community, + people from a wide range of backgrounds. Different people have different + perspectives on issues. Being unable to understand why someone holds a + viewpoint doesn't mean that they're wrong. Don't forget that it is human to + err and blaming each other doesn't get us anywhere. Instead, focus on helping + to resolve issues and learning from mistakes. + +Original text courtesy of the [Django Code of Conduct](https://www.djangoproject.com/conduct/) +project. diff --git a/CONTRIBUTING b/CONTRIBUTING index 288bcab915..225e753b57 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -34,6 +34,14 @@ access to the source repository was restricted just as commit access was. That's now changing, with the opening of a public git mirror to the BIND source tree (see below). +At Internet Systems Consortium, we're committed to building communities +that are welcoming and inclusive; environments where people are encouraged +to share ideas, treat each other with respect, and collaborate towards the +best solutions. To reinforce our commitment, the Internet Systems +Consortium has adopted the Contributor Covenant version 1.4 as our Code of +Conduct for BIND 9 project, as well as for the conduct of our developers +throughout the industry. + Access to source code Public BIND releases are always available from the ISC FTP site. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c00f4fcfc2..62989adf4c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,6 +41,14 @@ a release: read access to the source repository was restricted just as commit access was. That's now changing, with the opening of a public git mirror to the BIND source tree (see below). +At [Internet Systems Consortium](https://www.isc.org), we're committed to +building communities that are welcoming and inclusive; environments where people +are encouraged to share ideas, treat each other with respect, and collaborate +towards the best solutions. To reinforce our commitment, the [Internet Systems +Consortium](https://www.isc.org) has adopted the Contributor Covenant version +1.4 as our Code of Conduct for BIND 9 project, as well as for the conduct of our +developers throughout the industry. + ### Access to source code Public BIND releases are always available from the @@ -108,7 +116,7 @@ ISC's Security Vulnerability Disclosure Policy is documented at [https://kb.isc. If you have a crash, you may want to consult [‘What to do if your BIND or DHCP server has crashed.’](https://kb.isc.org/article/AA-00340/89/What-to-do-if-your-BIND-or-DHCP-server-has-crashed.html) -### Contributing code +### Contributing code BIND is licensed under the [Mozilla Public License 2.0](http://www.isc.org/downloads/software-support-policy/isc-license/). diff --git a/Makefile.in b/Makefile.in index 3b9a29e065..6d62d08a13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ SUBDIRS = make lib fuzz bin doc TARGETS = PREREQS = bind.keys.h -MANOBJS = README HISTORY OPTIONS CONTRIBUTING PLATFORMS \ +MANOBJS = README HISTORY OPTIONS CONTRIBUTING PLATFORMS CODE_OF_CONDUCT \ ${MANPAGES} ${HTMLPAGES} @BIND9_MAKE_RULES@ @@ -103,6 +103,11 @@ PLATFORMS: PLATFORMS.md ${W3M} -dump -cols 75 -O ascii -T text/html | \ sed -e '$${/^$$/d;}' > $@ +CODE_OF_CONDUCT: CODE_OF_CONDUCT.md + ${PANDOC} --email-obfuscation=none -s --metadata title="CODE OF CONDUCT" -f markdown-smart -t html $< | \ + ${W3M} -dump -cols 75 -O ascii -T text/html | \ + sed -e '$${/^$$/d;}' > $@ + unit:: sh ${top_builddir}/unit/unittest.sh diff --git a/README b/README index 15f3c62b8c..5c3e78f56b 100644 --- a/README +++ b/README @@ -87,8 +87,9 @@ ISC maintains a public git repository for BIND; details can be found at http://www.isc.org/git/. Information for BIND contributors can be found in the following files: - -General information: CONTRIBUTING.md - BIND 9 code style: doc/dev/style.md -- BIND architecture and developer guide: doc/dev/dev.md +General information: CONTRIBUTING.md - Code of Conduct: CODE_OF_CONDUCT.md +- BIND 9 code style: doc/dev/style.md - BIND architecture and developer +guide: doc/dev/dev.md Patches for BIND may be submitted as Merge Requests in the ISC GitLab server at at https://gitlab.isc.org/isc-projects/bind9/merge_requests. diff --git a/README.md b/README.md index e49fcd428f..d4452f688a 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,8 @@ ISC maintains a public git repository for BIND; details can be found at [http://www.isc.org/git/](http://www.isc.org/git/). Information for BIND contributors can be found in the following files: -- General information: [CONTRIBUTING.md](CONTRIBUTING) +- General information: [CONTRIBUTING.md](CONTRIBUTING.md) +- Code of Conduct: [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) - BIND 9 code style: [doc/dev/style.md](doc/dev/style.md) - BIND architecture and developer guide: [doc/dev/dev.md](doc/dev/dev.md) diff --git a/util/copyrights b/util/copyrights index d30ad468ae..fd2e88db74 100644 --- a/util/copyrights +++ b/util/copyrights @@ -2,6 +2,7 @@ ./.gitlab-ci.yml X 2018,2019 ./.uncrustify.cfg X 2018,2019 ./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 +./CODE_OF_CONDUCT X 2019 ./CONTRIBUTING X 2017,2018,2019 ./COPYRIGHT TXT.TOP 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 ./HISTORY X 2010,2013,2016,2017,2018,2019