diff --git a/Makefile.in b/Makefile.in index 877bdfa780..cdfd5b7aff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,19 +96,23 @@ test-force: README: README.md ${PANDOC} --email-obfuscation=none -s -t html README.md | \ - ${W3M} -dump -cols 75 -O ascii -T text/html > $@ + ${W3M} -dump -cols 75 -O ascii -T text/html | \ + sed -e '$${/^$$/d;}' > $@ HISTORY: HISTORY.md ${PANDOC} --email-obfuscation=none -s -t html HISTORY.md | \ - ${W3M} -dump -cols 75 -O ascii -T text/html > $@ + ${W3M} -dump -cols 75 -O ascii -T text/html | \ + sed -e '$${/^$$/d;}' > $@ OPTIONS: OPTIONS.md ${PANDOC} --email-obfuscation=none -s -t html OPTIONS.md | \ - ${W3M} -dump -cols 75 -O ascii -T text/html > $@ + ${W3M} -dump -cols 75 -O ascii -T text/html | \ + sed -e '$${/^$$/d;}' > $@ CONTRIBUTING: CONTRIBUTING.md ${PANDOC} --email-obfuscation=none -s -t html CONTRIBUTING.md | \ - ${W3M} -dump -cols 75 -O ascii -T text/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 a98adaeb5e..a1fd6b2763 100644 --- a/README +++ b/README @@ -50,19 +50,21 @@ bind9/releasenotes Reporting bugs and getting help -Please report assertion failure errors and suspected security issues to -security-officer@isc.org. +To report non-security-sensitive bugs or request new features, you may +open an Issue in the BIND 9 project on the ISC GitLab server at https:// +gitlab.isc.org/isc-projects/bind9. -General bug reports can be sent to bind9-bugs@isc.org. +Please note that, unless you explicitly mark the newly created Issue as +"confidential", it will be publicly readable. Please do not include any +information in bug reports that you consider to be confidential unless the +issue has been marked as such. In particular, if submitting the contents +of your configuration file in a non-confidential Issue, it is advisable to +obscure key secrets: this can be done automatically by using +named-checkconf -px. -Feature requests can be sent to bind-suggest@isc.org. - -Please note that, while tickets submitted to ISC's ticketing system are -not initially publicly readable by default, they can be made publicly -acessible afterward. Please do not include information in bug reports that -you consider to be confidential. In particular, when sending the contents -of your configuration file, it is advisable to obscure key secrets: this -can be done automatically by using named-checkconf -px. +If the bug you are reporting is a potential security issue, such as an +assertion failure or other crash in named, please do NOT use GitLab to +report it. Instead, please send mail to security-officer@isc.org. Professional support and training for BIND are available from ISC at https://www.isc.org/support. @@ -83,11 +85,17 @@ 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 -Patches for BIND may be submitted either as Github pull requests or via -email. When submitting a patch via email, please prepend the subject -header with "[PATCH]" so it will be easier for us to find. If your patch -introduces a new feature in BIND, please submit it to bind-suggest@isc.org -; if it fixes a bug, please submit it to bind9-bugs@isc.org. +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. + +By default, external contributors don't have ability to fork BIND in the +GitLab server, but if you wish to contribute code to BIND, you may request +permission to do so. Thereafter, you can create git branches and directly +submit requests that they be reviewed and merged. + +If you prefer, you may also submit code by opening a GitLab Issue and +including your patch as an attachment, preferably generated by git +format-patch. BIND 9.13 features @@ -324,4 +332,3 @@ Acknowledgments (eay@cryptsoft.com) * This product includes software written by Tim Hudson (tjh@cryptsoft.com) - diff --git a/README.md b/README.md index 2fccbb5e75..8b91dd9310 100644 --- a/README.md +++ b/README.md @@ -61,22 +61,24 @@ For up-to-date release notes and errata, see ### Reporting bugs and getting help -Please report assertion failure errors and suspected security issues to +To report non-security-sensitive bugs or request new features, you may +open an Issue in the BIND 9 project on the +[ISC GitLab server](https://gitlab.isc.org) at +[https://gitlab.isc.org/isc-projects/bind9](https://gitlab.isc.org/isc-projects/bind9). + +Please note that, unless you explicitly mark the newly created Issue as +"confidential", it will be publicly readable. Please do not include any +information in bug reports that you consider to be confidential unless +the issue has been marked as such. In particular, if submitting the +contents of your configuration file in a non-confidential Issue, it is +advisable to obscure key secrets: this can be done automatically by +using `named-checkconf -px`. + +If the bug you are reporting is a potential security issue, such as an +assertion failure or other crash in `named`, please do *NOT* use GitLab to +report it. Instead, please send mail to [security-officer@isc.org](mailto:security-officer@isc.org). -General bug reports can be sent to -[bind9-bugs@isc.org](mailto:bind9-bugs@isc.org). - -Feature requests can be sent to -[bind-suggest@isc.org](mailto:bind-suggest@isc.org). - -Please note that, while tickets submitted to ISC's ticketing system -are not initially publicly readable by default, they can be made publicly -acessible afterward. Please do not include information in bug reports that -you consider to be confidential. In particular, when sending the contents of -your configuration file, it is advisable to obscure key secrets: this can -be done automatically by using `named-checkconf -px`. - Professional support and training for BIND are available from ISC at [https://www.isc.org/support](https://www.isc.org/support). @@ -97,12 +99,20 @@ Information for BIND contributors can be found in the following files: - 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) -Patches for BIND may be submitted either as Github pull requests -or via email. When submitting a patch via email, please prepend the -subject header with "`[PATCH]`" so it will be easier for us to find. -If your patch introduces a new feature in BIND, please submit it to -[bind-suggest@isc.org](mailto:bind-suggest@isc.org); if it fixes a bug, -please submit it to [bind9-bugs@isc.org](mailto:bind9-bugs@isc.org). +Patches for BIND may be submitted as +[Merge Requests](https://gitlab.isc.org/isc-projects/bind9/merge_requests) +in the [ISC GitLab server](https://gitlab.isc.org) at +at [https://gitlab.isc.org/isc-projects/bind9/merge_requests](https://gitlab.isc.org/isc-projects/bind9/merge_requests). + +By default, external contributors don't have ability to fork BIND in the +GitLab server, but if you wish to contribute code to BIND, you may request +permission to do so. Thereafter, you can create git branches and directly +submit requests that they be reviewed and merged. + +If you prefer, you may also submit code by opening a +[GitLab Issue](https://gitlab.isc.org/isc-projects/bind9/issues) and +including your patch as an attachment, preferably generated by +`git format-patch`. ### BIND 9.13 features diff --git a/acconfig.h b/acconfig.h index 266939e636..2513aabf45 100644 --- a/acconfig.h +++ b/acconfig.h @@ -9,8 +9,6 @@ * information regarding copyright ownership. */ -/* $Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp $ */ - /*! \file */ /*** diff --git a/bin/python/setup.py b/bin/python/setup.py index d7bdfb08fe..c50f6d1aa3 100644 --- a/bin/python/setup.py +++ b/bin/python/setup.py @@ -15,7 +15,7 @@ setup(name='isc', description='Python functions to support BIND utilities', url='https://www.isc.org/bind', author='Internet Systems Consortium, Inc', - author_email='bind9-bugs@isc.org', + author_email='info@isc.org', license='MPL', requires=['ply'], packages=['isc']) diff --git a/config.h.in b/config.h.in index 08f61463d2..79eba6384e 100644 --- a/config.h.in +++ b/config.h.in @@ -1,10 +1,13 @@ /* config.h.in. Generated from configure.in by autoheader. */ /* - * Copyright (C) 1999-2005, 2007, 2008, 2012, 2014, 2016 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. */ /*! \file */ diff --git a/configure b/configure index 00b766c45e..06ef2c2ff8 100755 --- a/configure +++ b/configure @@ -10,7 +10,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for BIND 9.13. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -282,11 +282,10 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and bind9-bugs@isc.org -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and info@isc.org about +$0: your system, including any error possibly output before +$0: this message. Then install a modern shell, or manually +$0: run the script under such a shell if you do have one." fi exit 1 fi @@ -600,7 +599,7 @@ PACKAGE_NAME='BIND' PACKAGE_TARNAME='bind' PACKAGE_VERSION='9.13' PACKAGE_STRING='BIND 9.13' -PACKAGE_BUGREPORT='bind9-bugs@isc.org' +PACKAGE_BUGREPORT='info@isc.org' PACKAGE_URL='https://www.isc.org/downloads/BIND/' # Factoring default headers for most tests. @@ -943,7 +942,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -1108,7 +1106,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1361,15 +1358,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1507,7 +1495,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1660,7 +1648,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1835,7 +1822,7 @@ Help can also often be found on the BIND Users mailing list (https://lists.isc.org/mailman/listinfo/bind-users) or in the #bind channel of the Freenode IRC service. -Report bugs to . +Report bugs to . BIND home page: . _ACEOF ac_status=$? @@ -2298,9 +2285,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------------------- ## -## Report this to bind9-bugs@isc.org ## -## --------------------------------- ##" +( $as_echo "## --------------------------- ## +## Report this to info@isc.org ## +## --------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -24732,7 +24719,7 @@ $config_headers Configuration commands: $config_commands -Report bugs to . +Report bugs to . BIND home page: ." _ACEOF diff --git a/configure.in b/configure.in index db8bbe9976..b94b1d593f 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ AC_DIVERT_PUSH(1)dnl esyscmd([sed -e 's/^/# /' -e '/Portions of this code/,$d' COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_INIT(BIND, [9.13], [bind9-bugs@isc.org], [], [https://www.isc.org/downloads/BIND/]) +AC_INIT(BIND, [9.13], [info@isc.org], [], [https://www.isc.org/downloads/BIND/]) AC_PREREQ(2.59) AC_CONFIG_HEADER(config.h) diff --git a/win32utils/build.txt b/win32utils/build.txt index 864b02ada4..086a5d9105 100644 --- a/win32utils/build.txt +++ b/win32utils/build.txt @@ -270,4 +270,4 @@ Step 11: Python package install BIND python tools should work with version 2 or 3, 32 or 64 bits. Please report bugs, whether in the process of building the application -or in BIND 9 itself, to bind9-bugs@isc.org. +or in BIND 9 itself, at https://gitlab.isc.org/isc-projects/bind9. diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt index 7bf55ee7da..84e2d1ac63 100644 --- a/win32utils/readme1st.txt +++ b/win32utils/readme1st.txt @@ -166,5 +166,5 @@ server on the localhost. PROBLEMS: -Please report bugs to bind9-bugs@isc.org. Other questions can go -to the bind-users@isc.org mailing list. +Please report bugs at https://gitlab.isc.org/isc-projects/bind9. +Other questions can go to the bind-users@isc.org mailing list.