aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@gmail.com>2011-01-24 07:03:53 +0000
committerLeonardo Arena <rnalrd@gmail.com>2011-01-24 07:04:16 +0000
commitf7f5b3cce7936c3aec52d50676a2521244380e70 (patch)
treef9021e1c482ea128c67c1d6b21d671281494aced /main
parentb501371f5219d92af1194f29fd1cc2a85896bfab (diff)
downloadaports-f7f5b3cce7936c3aec52d50676a2521244380e70.tar.bz2
aports-f7f5b3cce7936c3aec52d50676a2521244380e70.tar.xz
main/kamailio: fix #521
Diffstat (limited to 'main')
-rw-r--r--main/kamailio/APKBUILD6
-rw-r--r--main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch36
2 files changed, 40 insertions, 2 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 5781116a2d..68071b7f35 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kamailio
pkgver=3.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Open Source SIP Server"
url="http://www.kamailio.org/"
pkgusers="kamailio"
@@ -20,6 +20,7 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.
kamailio.initd
kamailio-3.1-backslash.patch
sqlite.patch
+ kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -157,4 +158,5 @@ md5sums="f0bf80cfae676c086f827b499eaf21cd kamailio-3.1.1_src.tar.gz
a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg
81100c479890a2a8c2628db22fdd1a0c kamailio.initd
3cb2eaeed81e4cdb1830f06a88de19e7 kamailio-3.1-backslash.patch
-199df21eaa4856dcacdcc438f72765f1 sqlite.patch"
+199df21eaa4856dcacdcc438f72765f1 sqlite.patch
+ec66753ab24a9a14ff315ac4b3d352cc kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch"
diff --git a/main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch b/main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch
new file mode 100644
index 0000000000..b11a3204a6
--- /dev/null
+++ b/main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch
@@ -0,0 +1,36 @@
+--- a/lib/srdb1/db_id.c
++++ b/lib/srdb1/db_id.c
+@@ -241,6 +241,7 @@
+ LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s);
+ goto err;
+ }
++ ptr->pid=getpid();
+
+ return ptr;
+
+@@ -260,6 +261,7 @@
+ {
+ if (!id1 || !id2) return 0;
+ if (id1->port != id2->port) return 0;
++ if (((int)id1->pid) != ((int)id2->pid)) return 0;
+
+ if (strcmp(id1->scheme, id2->scheme)) return 0;
+ if (id1->username!=0 && id2->username!=0) {
+--- a/lib/srdb1/db_id.h
++++ b/lib/srdb1/db_id.h
+@@ -31,6 +31,7 @@
+ #define _DB1_ID_H
+
+ #include "../../str.h"
++#include <sys/types.h>
+
+ /** Structure representing a database ID */
+ struct db_id {
+@@ -40,6 +41,7 @@
+ char* host; /**< Host or IP, case insensitive */
+ unsigned short port; /**< Port number */
+ char* database; /**< Database, case sensitive */
++ pid_t pid; /**< Process ID (only allow one database connection per thread */
+ };
+
+