diff options
author | Timo Teräs <timo.teras@iki.fi> | 2011-01-05 14:54:04 +0200 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2011-01-31 13:56:26 +0000 |
commit | 0d8b847a53fc631696566cd17399fe94c4f2178c (patch) | |
tree | e637dfb25f16e53e7dabae04bf8b66474f6d3f5f | |
parent | d71431ef436412b5c2a76c8e3853a6d7a45102a9 (diff) | |
download | alpine_aports-0d8b847a53fc631696566cd17399fe94c4f2178c.tar.bz2 alpine_aports-0d8b847a53fc631696566cd17399fe94c4f2178c.tar.xz alpine_aports-0d8b847a53fc631696566cd17399fe94c4f2178c.zip |
main/kamailio: update sqlite patch
also fix some apkbuild typoes and the build target.
(cherry picked from commit 8615a6455531b417da74e5977547c12902b62ba5)
-rw-r--r-- | main/kamailio/APKBUILD | 8 | ||||
-rw-r--r-- | main/kamailio/sqlite.patch | 73 |
2 files changed, 41 insertions, 40 deletions
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index 99de0b17ca..46a1ac5930 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
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.1 |
5 | pkgrel=0 | 5 | pkgrel=1 |
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" |
@@ -40,7 +40,7 @@ prepare() { | |||
40 | for i in $source; do | 40 | for i in $source; do |
41 | case $i in | 41 | case $i in |
42 | *.patch) | 42 | *.patch) |
43 | msg "Apllying $i" | 43 | msg "Applying $i" |
44 | patch -p1 -i "$srcdir"/$i || return 1 | 44 | patch -p1 -i "$srcdir"/$i || return 1 |
45 | ;; | 45 | ;; |
46 | esac | 46 | esac |
@@ -76,7 +76,7 @@ build() { | |||
76 | DESTDIR="$pkgdir" \ | 76 | DESTDIR="$pkgdir" \ |
77 | cfg_prefix="$pkgdir" \ | 77 | cfg_prefix="$pkgdir" \ |
78 | cfg | 78 | cfg |
79 | make || return 1 | 79 | make kamailio modules modules_k modules_s || return 1 |
80 | } | 80 | } |
81 | 81 | ||
82 | package() { | 82 | package() { |
@@ -156,4 +156,4 @@ md5sums="f0bf80cfae676c086f827b499eaf21cd kamailio-3.1.1_src.tar.gz | |||
156 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg | 156 | a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg |
157 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd | 157 | 81100c479890a2a8c2628db22fdd1a0c kamailio.initd |
158 | 3cb2eaeed81e4cdb1830f06a88de19e7 kamailio-3.1-backslash.patch | 158 | 3cb2eaeed81e4cdb1830f06a88de19e7 kamailio-3.1-backslash.patch |
159 | ed43b0d8d60b1e87199ce18ba326ccee sqlite.patch" | 159 | 199df21eaa4856dcacdcc438f72765f1 sqlite.patch" |
diff --git a/main/kamailio/sqlite.patch b/main/kamailio/sqlite.patch index 68338ea96f..38cae2ec90 100644 --- a/main/kamailio/sqlite.patch +++ b/main/kamailio/sqlite.patch | |||
@@ -1,14 +1,7 @@ | |||
1 | commit 09d0be81bbc95caf323b2ce3da8bf4f1ee8aa9d4 | 1 | Index: kamailio-3.1.1/modules_k/db_sqlite/Makefile |
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | 2 | =================================================================== |
3 | Date: Tue Aug 24 13:13:34 2010 +0000 | 3 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4 | 4 | +++ kamailio-3.1.1/modules_k/db_sqlite/Makefile 2011-01-05 14:19:03.000000000 +0200 | |
5 | add support for sqlite | ||
6 | |||
7 | diff --git a/modules_k/db_sqlite/Makefile b/modules_k/db_sqlite/Makefile | ||
8 | new file mode 100644 | ||
9 | index 0000000..9a75593 | ||
10 | --- /dev/null | ||
11 | +++ b/modules_k/db_sqlite/Makefile | ||
12 | @@ -0,0 +1,15 @@ | 5 | @@ -0,0 +1,15 @@ |
13 | +# $Id$ | 6 | +# $Id$ |
14 | +# | 7 | +# |
@@ -25,12 +18,11 @@ index 0000000..9a75593 | |||
25 | +SERLIBPATH=../../lib | 18 | +SERLIBPATH=../../lib |
26 | +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 | 19 | +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 |
27 | +include ../../Makefile.modules | 20 | +include ../../Makefile.modules |
28 | diff --git a/modules_k/db_sqlite/db_sqlite.c b/modules_k/db_sqlite/db_sqlite.c | 21 | Index: kamailio-3.1.1/modules_k/db_sqlite/db_sqlite.c |
29 | new file mode 100644 | 22 | =================================================================== |
30 | index 0000000..1ec1267 | 23 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
31 | --- /dev/null | 24 | +++ kamailio-3.1.1/modules_k/db_sqlite/db_sqlite.c 2011-01-05 14:21:13.000000000 +0200 |
32 | +++ b/modules_k/db_sqlite/db_sqlite.c | 25 | @@ -0,0 +1,90 @@ |
33 | @@ -0,0 +1,92 @@ | ||
34 | +/* | 26 | +/* |
35 | + * $Id$ | 27 | + * $Id$ |
36 | + * | 28 | + * |
@@ -77,11 +69,9 @@ index 0000000..1ec1267 | |||
77 | + dbb->free_result = db_sqlite_free_result; | 69 | + dbb->free_result = db_sqlite_free_result; |
78 | + dbb->query = db_sqlite_query; | 70 | + dbb->query = db_sqlite_query; |
79 | + dbb->insert = db_sqlite_insert; | 71 | + dbb->insert = db_sqlite_insert; |
80 | + dbb->delete = db_sqlite_delete; | 72 | + dbb->delete = db_sqlite_delete; |
81 | + dbb->update = db_sqlite_update; | 73 | + dbb->update = db_sqlite_update; |
82 | +#if 0 | 74 | + dbb->raw_query = db_sqlite_raw_query; |
83 | + dbb->raw_query = db_oracle_raw_query; | ||
84 | +#endif | ||
85 | + | 75 | + |
86 | + return 0; | 76 | + return 0; |
87 | +} | 77 | +} |
@@ -123,12 +113,11 @@ index 0000000..1ec1267 | |||
123 | + sqlite_mod_destroy, /* destroy function */ | 113 | + sqlite_mod_destroy, /* destroy function */ |
124 | + 0 /* per-child init function */ | 114 | + 0 /* per-child init function */ |
125 | +}; | 115 | +}; |
126 | diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c | 116 | Index: kamailio-3.1.1/modules_k/db_sqlite/dbase.c |
127 | new file mode 100644 | 117 | =================================================================== |
128 | index 0000000..9ae1bdb | 118 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
129 | --- /dev/null | 119 | +++ kamailio-3.1.1/modules_k/db_sqlite/dbase.c 2011-01-05 14:20:47.000000000 +0200 |
130 | +++ b/modules_k/db_sqlite/dbase.c | 120 | @@ -0,0 +1,515 @@ |
131 | @@ -0,0 +1,504 @@ | ||
132 | +/* | 121 | +/* |
133 | + * $Id$ | 122 | + * $Id$ |
134 | + * | 123 | + * |
@@ -377,8 +366,9 @@ index 0000000..9ae1bdb | |||
377 | + if (strstr(decltype, "INT") != NULL || | 366 | + if (strstr(decltype, "INT") != NULL || |
378 | + strncasecmp(decltype, "SERIAL", 6) == 0) | 367 | + strncasecmp(decltype, "SERIAL", 6) == 0) |
379 | + return DB1_INT; | 368 | + return DB1_INT; |
380 | + if (strstr(decltype, "CHAR") != NULL || | 369 | + if (strstr(decltype, "CHAR") != NULL) |
381 | + strstr(decltype, "TEXT") != NULL) | 370 | + return DB1_STRING; |
371 | + if (strstr(decltype, "TEXT") != NULL) | ||
382 | + return DB1_STR; | 372 | + return DB1_STR; |
383 | + if (strstr(decltype, "REAL") != NULL || | 373 | + if (strstr(decltype, "REAL") != NULL || |
384 | + strstr(decltype, "FLOA") != NULL || | 374 | + strstr(decltype, "FLOA") != NULL || |
@@ -411,9 +401,10 @@ index 0000000..9ae1bdb | |||
411 | + | 401 | + |
412 | +static void str_assign(str* s, const char *_s, int len) | 402 | +static void str_assign(str* s, const char *_s, int len) |
413 | +{ | 403 | +{ |
414 | + s->s = (char *) pkg_malloc(len); | 404 | + s->s = (char *) pkg_malloc(len + 1); |
415 | + s->len = len; | 405 | + s->len = len; |
416 | + memcpy(s->s, _s, len); | 406 | + memcpy(s->s, _s, len); |
407 | + s->s[len] = 0; | ||
417 | +} | 408 | +} |
418 | + | 409 | + |
419 | +/* | 410 | +/* |
@@ -485,6 +476,9 @@ index 0000000..9ae1bdb | |||
485 | + case DB1_BIGINT: | 476 | + case DB1_BIGINT: |
486 | + VAL_BIGINT(val) = sqlite3_column_int64(conn->stmt, i); | 477 | + VAL_BIGINT(val) = sqlite3_column_int64(conn->stmt, i); |
487 | + break; | 478 | + break; |
479 | + case DB1_STRING: | ||
480 | + /* first field of struct str* is the char* so we can just | ||
481 | + * do whatever DB1_STR case does */ | ||
488 | + case DB1_STR: | 482 | + case DB1_STR: |
489 | + str_assign(&VAL_STR(val), | 483 | + str_assign(&VAL_STR(val), |
490 | + (const char*) sqlite3_column_text(conn->stmt, i), | 484 | + (const char*) sqlite3_column_text(conn->stmt, i), |
@@ -633,12 +627,17 @@ index 0000000..9ae1bdb | |||
633 | + return rc; | 627 | + return rc; |
634 | +} | 628 | +} |
635 | + | 629 | + |
636 | diff --git a/modules_k/db_sqlite/dbase.h b/modules_k/db_sqlite/dbase.h | 630 | +int db_sqlite_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) |
637 | new file mode 100644 | 631 | +{ |
638 | index 0000000..d1e57f4 | 632 | + return db_do_raw_query(_h, _s, _r, |
639 | --- /dev/null | 633 | + db_sqlite_submit_query, |
640 | +++ b/modules_k/db_sqlite/dbase.h | 634 | + db_sqlite_store_result); |
641 | @@ -0,0 +1,70 @@ | 635 | +} |
636 | Index: kamailio-3.1.1/modules_k/db_sqlite/dbase.h | ||
637 | =================================================================== | ||
638 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
639 | +++ kamailio-3.1.1/modules_k/db_sqlite/dbase.h 2011-01-05 14:20:47.000000000 +0200 | ||
640 | @@ -0,0 +1,72 @@ | ||
642 | +/* | 641 | +/* |
643 | + * $Id$ | 642 | + * $Id$ |
644 | + * | 643 | + * |
@@ -705,6 +704,8 @@ index 0000000..d1e57f4 | |||
705 | +int db_sqlite_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, | 704 | +int db_sqlite_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, |
706 | + const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv, | 705 | + const db_val_t* _v, const db_key_t* _uk, const db_val_t* _uv, |
707 | + int _n, int _un); | 706 | + int _n, int _un); |
707 | +int db_sqlite_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r); | ||
708 | + | ||
708 | +int db_sqlite_use_table(db1_con_t* _h, const str* _t); | 709 | +int db_sqlite_use_table(db1_con_t* _h, const str* _t); |
709 | + | 710 | + |
710 | + | 711 | + |