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) | |
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 d220950499c..d2c1e7a73f5 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kamailio -pkgver=3.1.1 -pkgrel=3 +pkgver=3.1.2 +pkgrel=0 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -19,7 +19,6 @@ 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 @@ -153,9 +152,8 @@ unixodbc() { _mv_mod_k $_odbc } -md5sums="f0bf80cfae676c086f827b499eaf21cd kamailio-3.1.1_src.tar.gz +md5sums="9daf29a84f057cfcba3b31c61ad38de3 kamailio-3.1.2_src.tar.gz a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg c0dc4e13d9e57feb99f016d3ee443c0b kamailio.initd 3cb2eaeed81e4cdb1830f06a88de19e7 kamailio-3.1-backslash.patch -199df21eaa4856dcacdcc438f72765f1 sqlite.patch -ec66753ab24a9a14ff315ac4b3d352cc kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch" +199df21eaa4856dcacdcc438f72765f1 sqlite.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 b11a3204a6c..00000000000 --- a/main/kamailio/kamailio-3.1-invalid_type_3_or_nul_0_version_columns_for_trusted.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 */ - }; - - |