diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-01 07:24:27 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-07 13:56:27 +0000 |
commit | 38c109cba797f56826983f93abd1b33d70a6f92d (patch) | |
tree | 99d7b5623666b9bcaf3f3402b3b63d0e1964477d | |
parent | aca1615b00d1994b1f2c7a9b0966bcde67c78a39 (diff) | |
download | alpine_aports-38c109cba797f56826983f93abd1b33d70a6f92d.tar.bz2 alpine_aports-38c109cba797f56826983f93abd1b33d70a6f92d.tar.xz alpine_aports-38c109cba797f56826983f93abd1b33d70a6f92d.zip |
main/kamailio: upgrade to 3.1.2
(cherry picked from commit d16ea861681cb96b2b5938cecceaea53681b2996)
-rw-r--r-- | main/kamailio/APKBUILD | 10 | ||||
-rw-r--r-- | main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch | 36 |
2 files changed, 4 insertions, 42 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index d220950499..d2c1e7a73f 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Michael Mason <ms13sp@gmail.com> | 1 | # Contributor: Michael Mason <ms13sp@gmail.com> |
2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=kamailio | 3 | pkgname=kamailio |
4 | pkgver=3.1.1 | 4 | pkgver=3.1.2 |
5 | pkgrel=3 | 5 | pkgrel=0 |
6 | pkgdesc="Open Source SIP Server" | 6 | pkgdesc="Open Source SIP Server" |
7 | url="http://www.kamailio.org/" | 7 | url="http://www.kamailio.org/" |
8 | pkgusers="kamailio" | 8 | pkgusers="kamailio" |
@@ -19,7 +19,6 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src. | |||
19 | kamailio.initd | 19 | kamailio.initd |
20 | kamailio-3.1-backslash.patch | 20 | kamailio-3.1-backslash.patch |
21 | sqlite.patch | 21 | sqlite.patch |
22 | kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch | ||
23 | " | 22 | " |
24 | 23 | ||
25 | _builddir="$srcdir"/$pkgname-$pkgver | 24 | _builddir="$srcdir"/$pkgname-$pkgver |
@@ -153,9 +152,8 @@ unixodbc() { | |||
153 | _mv_mod_k $_odbc | 152 | _mv_mod_k $_odbc |
154 | } | 153 | } |
155 | 154 | ||
156 | md5sums="f0bf80cfae676c086f827b499eaf21cd kamailio-3.1.1_src.tar.gz | 155 | md5sums="9daf29a84f057cfcba3b31c61ad38de3 kamailio-3.1.2_src.tar.gz |
157 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg | 156 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg |
158 | c0dc4e13d9e57feb99f016d3ee443c0b kamailio.initd | 157 | c0dc4e13d9e57feb99f016d3ee443c0b kamailio.initd |
159 | 3cb2eaeed81e4cdb1830f06a88de19e7 kamailio-3.1-backslash.patch | 158 | 3cb2eaeed81e4cdb1830f06a88de19e7 kamailio-3.1-backslash.patch |
160 | 199df21eaa4856dcacdcc438f72765f1 sqlite.patch | 159 | 199df21eaa4856dcacdcc438f72765f1 sqlite.patch" |
161 | 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 deleted file mode 100644 index b11a3204a6..0000000000 --- a/main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | --- a/lib/srdb1/db_id.c | ||
2 | +++ b/lib/srdb1/db_id.c | ||
3 | @@ -241,6 +241,7 @@ | ||
4 | LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s); | ||
5 | goto err; | ||
6 | } | ||
7 | + ptr->pid=getpid(); | ||
8 | |||
9 | return ptr; | ||
10 | |||
11 | @@ -260,6 +261,7 @@ | ||
12 | { | ||
13 | if (!id1 || !id2) return 0; | ||
14 | if (id1->port != id2->port) return 0; | ||
15 | + if (((int)id1->pid) != ((int)id2->pid)) return 0; | ||
16 | |||
17 | if (strcmp(id1->scheme, id2->scheme)) return 0; | ||
18 | if (id1->username!=0 && id2->username!=0) { | ||
19 | --- a/lib/srdb1/db_id.h | ||
20 | +++ b/lib/srdb1/db_id.h | ||
21 | @@ -31,6 +31,7 @@ | ||
22 | #define _DB1_ID_H | ||
23 | |||
24 | #include "../../str.h" | ||
25 | +#include <sys/types.h> | ||
26 | |||
27 | /** Structure representing a database ID */ | ||
28 | struct db_id { | ||
29 | @@ -40,6 +41,7 @@ | ||
30 | char* host; /**< Host or IP, case insensitive */ | ||
31 | unsigned short port; /**< Port number */ | ||
32 | char* database; /**< Database, case sensitive */ | ||
33 | + pid_t pid; /**< Process ID (only allow one database connection per thread */ | ||
34 | }; | ||
35 | |||
36 | |||