sip-lab 1.12.36 → 1.12.38

package/DEV.md

@@ -29,7 +29,7 @@ Then perform code changes and tests. When you are satisfied with them, update in
 
 #### prebuild binaries
 ```
-nvm use v16.13.1 # if we try with v17 it will fail to build for -t 1.5.0.0
+nvm use v16.13.1 # if we try with v17 it will fail to build for -t 15.0.0
 npx prebuildify --strip -t 15.0.0 -t 16.0.0 -t 17.0.0 -t 18.0.0
 ```
 

package/README.md

@@ -18,15 +18,15 @@ TODO:
 
 ### Installation
 
-This is an node.js addon and it is known to work on Ubuntu 18.04, Ubuntu 20.04, Ubuntu 22.04, Debian 10 and Debian 11 (it is known to not work on Debian 8 unless the app is built locally).
-It is distributed with prebuild binaries for node.js 15.0.0 and above (but built for Debian 11).
+This is an node.js addon and it is known to work on Debian 11, Debian 10, Ubuntu 22.04 and Ubuntu 20.04.
+It is distributed with prebuild binaries for node.js 15.0.0 and above (but built for Debian 11. For other Debian versions or for Ubuntu a local built of the addon will be executed. Being the case, be patient as the build process will take several minutes to complete).
 
 To install it, first install some dependencies:
 ```
 apt install build-essential automake autoconf libtool libspeex-dev libopus-dev libsdl2-dev libavdevice-dev libswscale-dev libv4l-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libvo-amrwbenc-dev libboost-dev libtiff-dev libpcap-dev libssl-dev uuid-dev cmake
 ```
 
-Then install sip-lab:
+Then install sip-lab (local build of the addon might be triggered here if this is not Debian 11):
 ```
 npm install sip-lab
 ```

package/binding.gyp

@@ -8,7 +8,7 @@
           'message': 'executing build_deps.sh',
           'inputs': [],
           'outputs': ['./3rdParty'],
-          'action': ['./build_deps.sh'],
+          'action': ['bash', './build_deps.sh'],
         },
       ],
       'sources': [
@@ -39,9 +39,6 @@
         "3rdParty/spandsp/src",
         "<!@(node -p \"require('node-addon-api').include\")",
       ],
-      "dependencies": [
-        "<!@(node -p \"require('node-addon-api').gyp\")"
-      ],
       'conditions': [
         [ 'OS!="win"', {
           'cflags_cc': [

package/build_deps.sh

@@ -14,12 +14,12 @@ mkdir -p $START_DIR/3rdParty
 cd $START_DIR/3rdParty
 if [[ ! -d spandsp ]]
 then
-	commit=e59ca8fb8b1591e626e6a12fdc60a2ebe83435ed
-	git clone https://github.com/freeswitch/spandsp
-	cd spandsp
-	git checkout $commit
-	./bootstrap.sh
-	CFLAGS='-O -fPIC' ./configure --enable-shared
+    commit=e59ca8fb8b1591e626e6a12fdc60a2ebe83435ed
+    git clone https://github.com/freeswitch/spandsp
+    cd spandsp
+    git checkout $commit
+    ./bootstrap.sh
+    CFLAGS='-O -fPIC' ./configure --enable-shared
     make
 fi
 
@@ -27,9 +27,9 @@ fi
 cd $START_DIR/3rdParty
 if [[ ! -d rapidjson ]]
 then
-	git clone https://github.com/Tencent/rapidjson
-	cd rapidjson
-	git checkout 27c3a8dc0e2c9218fe94986d249a12b5ed838f1d
+    git clone https://github.com/Tencent/rapidjson
+    cd rapidjson
+    git checkout 27c3a8dc0e2c9218fe94986d249a12b5ed838f1d
 fi
 
 
@@ -49,36 +49,36 @@ fi
 cd $START_DIR/3rdParty
 if [[ ! -d pjproject ]]
 then
-	git clone https://github.com/pjsip/pjproject
-	cd pjproject
-	#git checkout de3d744c2e1188b59bb907b6ee32ef83740ebc64
+    git clone https://github.com/pjsip/pjproject
+    cd pjproject
+    #git checkout de3d744c2e1188b59bb907b6ee32ef83740ebc64
     #git checkout 33a3c9e0a5eb84426edef05a9aa98af17d8011c3 # required for bcg729
     git checkout 797088ed133c98492519b7d042b75735f6f9388c # updated as part of #21
 
-	cat > user.mak <<EOF
-	export CFLAGS += -fPIC -g
-	export LDFLAGS +=
+    cat > user.mak <<EOF
+    export CFLAGS += -fPIC -g
+    export LDFLAGS +=
 EOF
 
     sed -i -r 's/BCG729_LIBS="-lbcg729"/BCG729_LIBS=''/' aconfigure
     LIBS=`pwd`/../bcg729/src/libbcg729.a ./configure --with-bcg729=`pwd`/../bcg729
-	cat > pjlib/include/pj/config_site.h <<EOF
+    cat > pjlib/include/pj/config_site.h <<EOF
 #define PJMEDIA_HAS_SRTP  0
 EOF
-	make dep && make clean && make
+    make dep && make clean && make
 fi
 
 
 #cd $START_DIR/3rdParty
 #if [[ ! -d openssl ]]
 #then
-#    wget https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.5.tar.gz
-#    tar xf openssl-3.0.5.tar.gz
-#    mv openssl-openssl-3.0.5 openssl
+#    git clone https://github.com/openssl/openssl
 #    cd openssl
-#    ./Configure
+#    git checkout openssl-3.0.7
+#    ./config -d # configure with debug symbols enabled
 #    make
 #fi
+# statically linking to openssl will not solve anything (see #37).
 
 
 echo "Build of dependencies successful"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.12.36",
+  "version": "1.12.38",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -23,10 +23,11 @@
     "node-addon-api": "^5.0.0",
     "node-gyp": "^9.3.0",
     "node-gyp-build": "^4.5.0",
-    "sip-matching": "^1.3.32"
+    "sip-matching": "^1.3.34"
   },
   "devDependencies": {
-    "prebuildify": "^5.0.1"
+    "prebuildify": "^5.0.1",
+    "prebuildify-cross": "github:MayamaTakeshi/prebuildify-cross#use_existing_images"
   },
   "files": [
     "index.js",