From 5c6d5ea38fd4c4966a91fa8fe4cff417407fff7c Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Wed, 3 May 2023 11:38:41 -0400 Subject: [PATCH] core: Cleanup gerrit and JIRA references. (#57) * Remove .gitreview and switch to pulling the main asterisk branch version from configure.ac instead. * Replace references to JIRA with GitHub. * Other minor cleanup found along the way. Resolves: #39 --- .gitreview | 10 ------ BUGS | 10 +++--- build_tools/make_version | 5 +-- configs/samples/extensions.conf.sample | 5 +-- configure | 36 ++++++++++---------- configure.ac | 2 +- contrib/scripts/ast_grab_core | 2 +- contrib/scripts/sip_to_pjsip/sip_to_pjsip.py | 2 +- contrib/scripts/sip_to_pjsip/sip_to_pjsql.py | 2 +- doc/asterisk.8 | 2 +- doc/asterisk.sgml | 2 +- include/asterisk/doxyref.h | 2 +- menuselect/README | 2 +- 13 files changed, 37 insertions(+), 45 deletions(-) delete mode 100644 .gitreview mode change 100644 => 100755 contrib/scripts/ast_grab_core diff --git a/.gitreview b/.gitreview deleted file mode 100644 index 1ff70d7608..0000000000 --- a/.gitreview +++ /dev/null @@ -1,10 +0,0 @@ -[gerrit] -defaultbranch=20 -# -# Intentional padding to ensure it is possible to point a commit -# to an alternative gerrit server/repository without breaking -# cherry-pick between branches. -# -host=gerrit.asterisk.org -port=29418 -project=asterisk.git diff --git a/BUGS b/BUGS index 624459ea52..efb9bbd796 100644 --- a/BUGS +++ b/BUGS @@ -1,22 +1,22 @@ Asterisk Bug Tracking Information ================================= -To learn about and report Asterisk bugs, please visit +To learn about and report Asterisk bugs, please visit the official Asterisk Bug Tracker at: - https://issues.asterisk.org/jira + https://github.com/asterisk/asterisk/issues/ -For more information on using the bug tracker, or to +For more information on using the bug tracker, or to learn how you can contribute by acting as a bug marshal please see: - http://www.asterisk.org/developers/bug-guidelines + https://wiki.asterisk.org/wiki/x/RgAtAQ If you would like to submit a feature request, please resist the temptation to post it to the bug tracker. Feature requests should be posted to the asterisk-dev mailing list, located at: - http://lists.digium.com + http://lists.digium.com Thank you! diff --git a/build_tools/make_version b/build_tools/make_version index c2422d8a52..e97897b701 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -2,6 +2,7 @@ GIT=${GIT:-git} SED=${SED:-sed} +AWK=${AWK:-awk} if [ -f ${1}/.version ]; then cat ${1}/.version @@ -48,9 +49,9 @@ if [ -z "${MAINLINE_BRANCH}" ] ; then MAINLINE_BRANCH=$(echo "${BRANCH}" | ${SED} -n -r -e "s@devel(opment)?/([0-9]+)/.+@\2@p") fi - # If we didn't find it, get it from .gitreview defaultbranch. + # If we didn't find it, get it from configure.ac. if [ "x${MAINLINE_BRANCH}" = "x" ] ; then - MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.defaultbranch) + MAINLINE_BRANCH=$(${AWK} '/AC_INIT/ { print substr($2, 2, length($2) - 3) }' configure.ac) fi fi diff --git a/configs/samples/extensions.conf.sample b/configs/samples/extensions.conf.sample index cd26dc368a..d1cc4bd2b6 100644 --- a/configs/samples/extensions.conf.sample +++ b/configs/samples/extensions.conf.sample @@ -61,8 +61,9 @@ writeprotect=no ; this value to "yes" !! ; Please, if you try this out, and are forced to return to the ; old pattern matcher, please report your reasons in a bug report -; on https://issues.asterisk.org. We have made good progress in providing -; something compatible with the old matcher; help us finish the job! +; on https://github.com/asterisk/asterisk/issues. We have made good +; progress in providing something compatible with the old matcher; help us +; finish the job! ; ; This value can be switched at runtime using the cli command "dialplan set extenpatternmatchnew true" ; or "dialplan set extenpatternmatchnew false", so you can experiment to your hearts content. diff --git a/configure b/configure index 5079b37bd6..4f763ae765 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for asterisk trunk. +# Generated by GNU Autoconf 2.69 for asterisk 20. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -269,8 +269,8 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://issues.asterisk.org about your system, -$0: including any error possibly output before this +$0: https://github.com/asterisk/asterisk/issues about your +$0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi @@ -582,9 +582,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='asterisk' PACKAGE_TARNAME='asterisk' -PACKAGE_VERSION='trunk' -PACKAGE_STRING='asterisk trunk' -PACKAGE_BUGREPORT='https://issues.asterisk.org' +PACKAGE_VERSION='20' +PACKAGE_STRING='asterisk 20' +PACKAGE_BUGREPORT='https://github.com/asterisk/asterisk/issues' PACKAGE_URL='' ac_unique_file="main/asterisk.c" @@ -2032,7 +2032,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures asterisk trunk to adapt to many kinds of systems. +\`configure' configures asterisk 20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2098,7 +2098,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of asterisk trunk:";; + short | recursive ) echo "Configuration of asterisk 20:";; esac cat <<\_ACEOF @@ -2277,7 +2277,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -2340,7 +2340,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -asterisk configure trunk +asterisk configure 20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2501,9 +2501,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 https://issues.asterisk.org ## -## ------------------------------------------ ##" +( $as_echo "## ---------------------------------------------------------- ## +## Report this to https://github.com/asterisk/asterisk/issues ## +## ---------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -3126,7 +3126,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by asterisk $as_me trunk, which was +It was created by asterisk $as_me 20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -35026,7 +35026,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by asterisk $as_me trunk, which was +This file was extended by asterisk $as_me 20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35082,13 +35082,13 @@ $config_files Configuration headers: $config_headers -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -asterisk config.status trunk +asterisk config.status 20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 2893248882..d3ded27998 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.60a) -AC_INIT([asterisk], [trunk], [https://issues.asterisk.org]) +AC_INIT([asterisk], [20], [https://github.com/asterisk/asterisk/issues]) # cross-compile macros AC_CANONICAL_BUILD diff --git a/contrib/scripts/ast_grab_core b/contrib/scripts/ast_grab_core old mode 100644 new mode 100755 index bc56b61878..6701a2d4e0 --- a/contrib/scripts/ast_grab_core +++ b/contrib/scripts/ast_grab_core @@ -67,4 +67,4 @@ echo Notifying admins of the core. echo Done. echo echo Reproducible deadlocks should be posted with a full backtrace and instructions -echo to reproduce the issue at https://issues.asterisk.org/ Thanks! +echo to reproduce the issue at https://github.com/asterisk/asterisk/issues/ Thanks! diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py index e7c3d8fa3f..10f6b33d1b 100755 --- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py +++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py @@ -1321,7 +1321,7 @@ if __name__ == "__main__": # configuration parser for sip.conf sip = astconfigparser.MultiOrderedConfigParser() info('Please, report any issue at:') - info(' https://issues.asterisk.org/') + info(' https://github.com/asterisk/asterisk/issues/') info('Reading ' + sip_filename) sip.read(sip_filename) info('Converting to PJSIP...') diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py index 71ddd45b64..2469ffc9fe 100755 --- a/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py +++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py @@ -70,7 +70,7 @@ if __name__ == "__main__": sip_to_pjsip.sip = sip sip.connect(user,password,host,port,database) print('Please, report any issue at:') - print(' https://issues.asterisk.org/') + print(' https://github.com/asterisk/asterisk/issues/') print('Reading ' + sip_filename) sip.read(sip_filename) print('Converting to PJSIP realtime sql...') diff --git a/doc/asterisk.8 b/doc/asterisk.8 index 50ad8f6c11..64ea625b47 100644 --- a/doc/asterisk.8 +++ b/doc/asterisk.8 @@ -243,7 +243,7 @@ Enables executing of includes via \fB#exec\fR directive inside .PP \fBasterisk \-rx "core show channels"\fR - Display channels on running server .SH BUGS -Bug reports and feature requests may be filed at https://issues.asterisk.org +Bug reports and feature requests may be filed at https://github.com/asterisk/asterisk/issues/ .SH "SEE ALSO" https://www.asterisk.org - The Asterisk Home Page .PP diff --git a/doc/asterisk.sgml b/doc/asterisk.sgml index 60450a014e..32a46e8258 100644 --- a/doc/asterisk.sgml +++ b/doc/asterisk.sgml @@ -415,7 +415,7 @@ BUGS - Bug reports and feature requests may be filed at https://issues.asterisk.org + Bug reports and feature requests may be filed at https://github.com/asterisk/asterisk/issues/ diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h index d6daa85c80..0f6e36126b 100644 --- a/include/asterisk/doxyref.h +++ b/include/asterisk/doxyref.h @@ -54,7 +54,7 @@ * * \section weblinks Web sites * \arg \b Main: Asterisk Developer's website https://www.asterisk.org/developers/ - * \arg \b Bugs: The Issue Tracker https://issues.asterisk.org + * \arg \b Bugs: The Issue Tracker https://github.com/asterisk/asterisk/issues/ * \arg \b Lists: List Server http://lists.digium.com * \arg \b Wiki: The Asterisk Wiki https://wiki.asterisk..org * \arg \b Docs: The Asterisk Documentation Project http://www.asteriskdocs.org diff --git a/menuselect/README b/menuselect/README index 3114e08340..d236168011 100644 --- a/menuselect/README +++ b/menuselect/README @@ -173,6 +173,6 @@ Conflicts: REPORTING BUGS Any bug reports or feature enhancement submissions to menuselect should be -submitted at https://issues.asterisk.org/ +submitted at https://github.com/asterisk/asterisk/issues/ Thank you!