Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

core: Cleanup gerrit and JIRA references. () ()

Browse Source 
* 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:
releases/certified-18.9
Sean Bright 2 years ago committed by George Joseph
parent 31eeb9d068
commit a554cfe062
13 changed files with 88 additions and 218 deletions

10
.gitreview
Unescape View File

@ -1,10 +0,0 @@
[gerrit]
defaultbranch=certified/18.9
#
# 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

4
BUGS
Unescape View File

@ -4,13 +4,13 @@ Asterisk Bug Tracking Information
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
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.

185
build_tools/make_version
Unescape View File

@ -1,106 +1,60 @@
#!/bin/sh
AWK=${AWK:-awk}
GIT=${GIT:-git}
GREP=${GREP:-grep}
SED=${SED:-sed}
AWK=${AWK:-awk}
if [ -f ${1}/.version ]; then
cat ${1}/.version
elif [ -d ${1}/.svn ]; then
PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0
TEAM=0
TAG=0
FEATURE=0
REV=`svnversion -c ${1} | cut -d: -f2`
INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
if [ -z "${INTEGRATED}" ] ; then
INTEGRATED=svnmerge-integrated
exit 0
fi
BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
if [ "${PARTS}" = "trunk" ] ; then
echo SVN-trunk-r${REV}
if [ ! -d ${1}/.git ]; then
echo "UNKNOWN__and_probably_unsupported"
exit 0
fi
for PART in $PARTS ; do
if [ ${TAG} != 0 ] ; then
if [ "${PART}" = "autotag_for_be" ] ; then
continue
fi
if [ "${PART}" = "autotag_for_sx00i" ] ; then
continue
fi
RESULT="${PART}"
break
if [ -z ${GIT} ]; then
GIT="git"
fi
if [ ${BRANCH} != 0 ] ; then
RESULT="${RESULT}-${PART}"
if [ ${FEATURE} != 0 ] ; then
RESULT="${RESULT}-${FEATURE_NAME}"
fi
break
if ! command -v ${GIT} >/dev/null 2>&1; then
echo "UNKNOWN__and_probably_unsupported"
exit 1
fi
if [ ${TEAM} != 0 ] ; then
if [ -z "${RESULT}" ] ; then
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"
fi
continue
GITCHECK=$(${GIT} describe --always 2>/dev/null || echo gitfail 2>/dev/null)
if [ "x${GITCHECK}" = "xgitfail" ]; then
echo "UNKNOWN__git_check_fail"
exit 1
fi
if [ "${PART}" = "certified" ] ; then
FEATURE=1
FEATURE_NAME="cert"
continue
fi
cd ${1} || exit 1
if [ "${PART}" = "branches" ] ; then
BRANCH=1
RESULT="branch"
continue
fi
MODIFIED=""
if [ "${PART}" = "tags" ] ; then
TAG=1
continue
# If MAINLINE_BRANCH is already set in the environment, use it.
if [ -z "${MAINLINE_BRANCH}" ] ; then
# Try to retrieve MAINLINE_BRANCH from a local .develvars file first.
# .develvars is keyed by the branch name so we need to get that first.
BRANCH=$(${GIT} symbolic-ref --short HEAD 2>/dev/null)
if [ -f .develvars ] ; then
MAINLINE_BRANCH=$(${GIT} config -f .develvars --get branch.${BRANCH}.mainline-branch)
fi
if [ "${PART}" = "team" ] ; then
TEAM=1
continue
# If we didn't find it, see if this is a well-known development branch.
# development/<mainline_branch>/<branchname> or
# devel/<mainline_branch>/<branchname>
if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
MAINLINE_BRANCH=$(echo "${BRANCH}" | ${SED} -n -r -e "s@devel(opment)?/([0-9]+)/.+@\2@p")
fi
done
if [ ${TAG} != 0 ] ; then
echo ${RESULT}
else
echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
fi
elif [ -d ${1}/.git ]; then
if [ -z ${GIT} ]; then
GIT="git"
# If we didn't find it, get it from configure.ac.
if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
MAINLINE_BRANCH=$(${AWK} '/AC_INIT/ { print substr($2, 2, length($2) - 3) }' configure.ac)
fi
if ! command -v ${GIT} >/dev/null 2>&1; then
echo "UNKNOWN__and_probably_unsupported"
exit 1
fi
cd ${1}
# If the first log commit messages indicates that this is checked into
# subversion, we'll just use the SVN- form of the revision.
MODIFIED=""
SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
if [ -z "$SVN_REV" ]; then
MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch)
VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
if [ $? -ne 0 ]; then
if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
@ -111,80 +65,3 @@ elif [ -d ${1}/.git ]; then
VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
fi
echo GIT-${MAINLINE_BRANCH}-${VERSION}
else
PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
BRANCH=0
TEAM=0
TAG=0
FEATURE=0
if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
MODIFIED="M"
fi
for PART in $PARTS ; do
if [ ${TAG} != 0 ] ; then
if [ "${PART}" = "autotag_for_be" ] ; then
continue
fi
if [ "${PART}" = "autotag_for_sx00i" ] ; then
continue
fi
RESULT="${PART}"
break
fi
if [ ${BRANCH} != 0 ] ; then
RESULT="${RESULT}-${PART}"
if [ ${FEATURE} != 0 ] ; then
RESULT="${RESULT}-${FEATURE_NAME}"
fi
break
fi
if [ ${TEAM} != 0 ] ; then
if [ -z "${RESULT}" ] ; then
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"
fi
continue
fi
if [ "${PART}" = "certified" ] ; then
FEATURE=1
FEATURE_NAME="cert"
continue
fi
if [ "${PART}" = "branches" ] ; then
BRANCH=1
RESULT="branch"
continue
fi
if [ "${PART}" = "tags" ] ; then
TAG=1
continue
fi
if [ "${PART}" = "team" ] ; then
TEAM=1
continue
fi
if [ "${PART}" = "trunk" ]; then
echo SVN-trunk-r${SVN_REV}${MODIFIED}
exit 0
fi
done
if [ ${TAG} != 0 ] ; then
echo ${RESULT}
else
echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
fi
fi
else
echo "UNKNOWN__and_probably_unsupported"
fi

5
configs/samples/extensions.conf.sample
Unescape View File

@ -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.

48
configure vendored
Unescape View File

@ -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 certified/18.9.
#
# Report bugs to <https://issues.asterisk.org>.
# Report bugs to <https://github.com/asterisk/asterisk/issues>.
#
#
# 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='certified/18.9'
PACKAGE_STRING='asterisk certified/18.9'
PACKAGE_BUGREPORT='https://github.com/asterisk/asterisk/issues'
PACKAGE_URL=''
ac_unique_file="main/asterisk.c"
@ -2055,7 +2055,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 certified/18.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -2121,7 +2121,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 certified/18.9:";;
esac
cat <<\_ACEOF
@ -2303,7 +2303,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 <https://issues.asterisk.org>.
Report bugs to <https://github.com/asterisk/asterisk/issues>.
_ACEOF
ac_status=$?
fi
@ -2366,7 +2366,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
asterisk configure trunk
asterisk configure certified/18.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2527,9 +2527,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
@ -3152,7 +3152,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 certified/18.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -15300,7 +15300,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -15346,7 +15346,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -15370,7 +15370,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -15415,7 +15415,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -15439,7 +15439,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@ -16739,6 +16739,8 @@ main ()
if (*(data + i) != *(data3 + i))
return 14;
close (fd);
free (data);
free (data3);
return 0;
}
_ACEOF
@ -35834,7 +35836,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 certified/18.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -35890,13 +35892,13 @@ $config_files
Configuration headers:
$config_headers
Report bugs to <https://issues.asterisk.org>."
Report bugs to <https://github.com/asterisk/asterisk/issues>."
_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 certified/18.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac
Unescape View File

@ -1,6 +1,6 @@
AC_PREREQ(2.60a)
AC_INIT([asterisk], [trunk], [https://issues.asterisk.org])
AC_INIT([asterisk], [certified/18.9], [https://github.com/asterisk/asterisk/issues])
# cross-compile macros
AC_CANONICAL_BUILD

2
contrib/scripts/ast_grab_core
Unescape View File

@ -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!

2
contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
Unescape View File

@ -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...')

2
contrib/scripts/sip_to_pjsip/sip_to_pjsql.py
Unescape View File

@ -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...')

2
doc/asterisk.8
Unescape View File

@ -241,7 +241,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

2
doc/asterisk.sgml
Unescape View File

@ -415,7 +415,7 @@
<refsect1>
<title>BUGS</title>
<para>
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/
</para>
</refsect1>
<refsect1>

2
include/asterisk/doxyref.h
Unescape View File

@ -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

2
menuselect/README
Unescape View File

@ -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!

Write Preview
Loading…
Cancel
Save