sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

git:master:18b23187: pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 18b23187dd89e3b36c0dd95d4796484bef3d2e62 URL: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T13:48:42+02:00 pkg/kamailio/scripts: wrap param around quotes to avoid invalid syntax on empty --- Modified: pkg/kamailio/scripts/create-src-rpm.sh Modified: pkg/kamailio/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… Patch: https://github.com/kamailio/kamailio/commit/18b23187dd89e3b36c0dd95d4796484… --- diff --git a/pkg/kamailio/scripts/create-src-rpm.sh b/pkg/kamailio/scripts/create-src-rpm.sh index ebe792a22bb..febe3b118fb 100755 --- a/pkg/kamailio/scripts/create-src-rpm.sh +++ b/pkg/kamailio/scripts/create-src-rpm.sh @@ -8,8 +8,8 @@ usage() { # creates a src.rpm for mock VER=$1 REL=$2 -[[ -n $VER ]] || { echo "Version not specified"; usage; exit 1; } -[[ -n $REL ]] || { echo "Release not specified"; usage; exit 2; } +[[ -n "$VER" ]] || { echo "Version not specified"; usage; exit 1; } +[[ -n "$REL" ]] || { echo "Release not specified"; usage; exit 2; } git submodule update --init diff --git a/pkg/kamailio/scripts/git-archive-all.sh b/pkg/kamailio/scripts/git-archive-all.sh index 4c85ca83cc4..d0ca6338d71 100755 --- a/pkg/kamailio/scripts/git-archive-all.sh +++ b/pkg/kamailio/scripts/git-archive-all.sh @@ -6,13 +6,13 @@ usage() { echo Usage: pkg/kamailio/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src } -if [ -z $1 ]; then +if [ -z "$1" ]; then echo "You must specify a prefix name." usage exit 1 fi -if [ -z $2 ]; then +if [ -z "$2" ]; then echo "You must specify a super-archive name." usage exit 1

1 year, 1 month

git:master:f16ec35f: kamdbctl: check if kamctlrc is readable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f16ec35fa448d03613e6bbbff4c354012f56073e URL: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T12:33:08+02:00 kamdbctl: check if kamctlrc is readable --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… Patch: https://github.com/kamailio/kamailio/commit/f16ec35fa448d03613e6bbbff4c3540… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 4f3f407f040..5a89a9540cd 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -35,13 +35,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc ]; then +if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc fi -if [ -f /usr/local/etc/kamailio/kamctlrc ]; then +if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc fi -if [ -f ~/.kamctlrc ]; then +if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc fi

1 year, 1 month

git:master:0518410e: pkg/docker: submodule update [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 0518410eea14f8949260faec5fb70c97badaa74e URL: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-06T12:25:08+02:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… Patch: https://github.com/kamailio/kamailio/commit/0518410eea14f8949260faec5fb70c9… --- diff --git a/pkg/docker b/pkg/docker index 5c45c0f8871..524fa4769d3 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f +Subproject commit 524fa4769d3b48add204c2bbd8303f60dfde2d61

1 year, 1 month

[kamailio/kamailio] pkg: add example script to create tarball with submodules instantiated (PR #3590)

by space88man

In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. #### Pre-Submission Checklist - [X ] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X ] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description In preparation for packaging tls_wolfssl the distributed source tarballs need to have the submodule instantiated and tar'ed together with the primary source code. This is an example script to package submodule code with the main code. It can be used in CI/CD to prepare the tarball. Subsequently I will update the pkg/ scripts to enable packaging of tls_wolfssl. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3590 -- Commit Summary -- * pkg: add example script to create tarball with submodules instantiated -- File Changes -- A pkg/scripts/git-archive-all.sh (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3590.patch https://github.com/kamailio/kamailio/pull/3590.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3590 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3590(a)github.com>

1 year, 1 month

git:master:9de780b8: pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9de780b8a7a1ac4c3a936b86d324c9a5f1527e3d URL: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:31:35+02:00 pkg: RPM - add mock config for EL8/EL9 based on alma+epel-(8|9)-x86_64 This mock config can be used to build RPM packages from a kamailio src.rpm. - update pkg/kamailio/obs/README -> README.md to include mock instructions - add script create-src-rpm.sh to create src.rpm for package building --- Added: pkg/kamailio/obs/README.md Added: pkg/kamailio/obs/kamailio-8-x86_64.cfg Added: pkg/kamailio/obs/kamailio-9-x86_64.cfg Added: pkg/kamailio/scripts/create-src-rpm.sh Added: pkg/kamailio/scripts/git-archive-all.sh Removed: pkg/kamailio/obs/README Removed: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a… Patch: https://github.com/kamailio/kamailio/commit/9de780b8a7a1ac4c3a936b86d324c9a…

1 year, 1 month

git:master:aed35ddb: pkg: add example script to create tarball with submodules instantiated

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aed35ddb6aac8d12cdd60b07ce5bbc1e57a71b94 URL: https://github.com/kamailio/kamailio/commit/aed35ddb6aac8d12cdd60b07ce5bbc1… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:31:35+02:00 pkg: add example script to create tarball with submodules instantiated In preparation for packaging of tls_wolfssl, add an example script to create source tarball with submodule code. --- Added: pkg/scripts/git-archive-all.sh --- Diff: https://github.com/kamailio/kamailio/commit/aed35ddb6aac8d12cdd60b07ce5bbc1… Patch: https://github.com/kamailio/kamailio/commit/aed35ddb6aac8d12cdd60b07ce5bbc1… --- diff --git a/pkg/scripts/git-archive-all.sh b/pkg/scripts/git-archive-all.sh new file mode 100755 index 00000000000..71bacc7d896 --- /dev/null +++ b/pkg/scripts/git-archive-all.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# packaging script to include submodules +# modified from: https://gist.github.com/arteymix/03702e3eb05c2c161a86b49d4626d21f +# Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src + +usage() { + echo Usage: pkg/scripts/git-archive-all.sh kamailio-5.8.0 ../output/kamailio-5.8.0_src +} + +if [ -z $1 ]; then + echo "You must specify a prefix name." + usage + exit 1 +fi + +if [ -z $2 ]; then + echo "You must specify a super-archive name." + usage + exit 1 +fi + +git archive --prefix "$1/" -o "$2.tar" HEAD +git submodule foreach --recursive "git archive --prefix=$1/\$sm_path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/$2.tar \$sha1.tar && rm \$sha1.tar" + +gzip "$2.tar"

1 year, 1 month

git:master:a3fd3b12: kamctl: check if kamctlrc is readable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a3fd3b12ca9b1c3688255e9d645085947052bc6d URL: https://github.com/kamailio/kamailio/commit/a3fd3b12ca9b1c3688255e9d6450859… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-06T08:19:18+02:00 kamctl: check if kamctlrc is readable - related to GH #3594 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/a3fd3b12ca9b1c3688255e9d6450859… Patch: https://github.com/kamailio/kamailio/commit/a3fd3b12ca9b1c3688255e9d6450859… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index dd09ffb7daf..ad4262b7fc0 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -39,13 +39,13 @@ if [ -n "$KAMCTLFULLPATH" ] ; then fi # check for rc file at standard locations -if [ -f /etc/kamailio/kamctlrc ]; then +if [ -f /etc/kamailio/kamctlrc -a -r /etc/kamailio/kamctlrc ]; then . /etc/kamailio/kamctlrc fi -if [ -f /usr/local/etc/kamailio/kamctlrc ]; then +if [ -f /usr/local/etc/kamailio/kamctlrc -a -r /usr/local/etc/kamailio/kamctlrc ]; then . /usr/local/etc/kamailio/kamctlrc fi -if [ -f ~/.kamctlrc ]; then +if [ -f ~/.kamctlrc -a -r ~/.kamctlrc ]; then . ~/.kamctlrc fi

1 year, 1 month

[kamailio/kamailio] Fix wss forwarding (PR #3588)

by joelbax

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3588 -- Commit Summary -- * core: Fixing transport=wss parsin * ut: Adding PROTO_WSS protocol to get_proto -- File Changes -- M src/core/parser/parse_uri.c (39) M src/modules/tm/ut.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3588.patch https://github.com/kamailio/kamailio/pull/3588.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3588 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3588(a)github.com>

1 year, 1 month

git:5.7:c94a185e: Update wolfSSL to v5.6.3-stable

by S-P Chan

Module: kamailio Branch: 5.7 Commit: c94a185e36709241438cb07f38b7c26f72f40e05 URL: https://github.com/kamailio/kamailio/commit/c94a185e36709241438cb07f38b7c26… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-10-06T07:22:28+08:00 Update wolfSSL to v5.6.3-stable --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/c94a185e36709241438cb07f38b7c26… Patch: https://github.com/kamailio/kamailio/commit/c94a185e36709241438cb07f38b7c26… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index a7635da9e64..3b3c175af0e 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit a7635da9e64a43028d2f8f14bce75e4bed39f162 +Subproject commit 3b3c175af0e993ffaae251871421e206cc41963f

1 year, 1 month

git:master:e01d1cbf: github: define DOCKER_REPO at alpine workflow [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: e01d1cbfb61e0111a4f73e58e36a2bd689a2f91f URL: https://github.com/kamailio/kamailio/commit/e01d1cbfb61e0111a4f73e58e36a2bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-06T00:44:41+02:00 github: define DOCKER_REPO at alpine workflow [skip ci] > https://github.com/kamailio/kamailio-ci/commit/524fa4769d3b48add204c2bbd830… --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/e01d1cbfb61e0111a4f73e58e36a2bd… Patch: https://github.com/kamailio/kamailio/commit/e01d1cbfb61e0111a4f73e58e36a2bd… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 511fad53447..c11d7056086 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,6 +10,7 @@ on: env: IMAGE_NAME: kamailio-ci SOURCE_BRANCH: ${{ github.ref_name }} + DOCKER_REPO: ghcr.io/kamailio/kamailio-ci jobs: x86_64:

1 year, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023