[Pkg-voip-commits] r3526 - in openser/trunk/debian: . patches
Julien Blache
jblache at alioth.debian.org
Sat May 12 09:23:00 UTC 2007
Author: jblache
Date: 2007-05-12 09:23:00 +0000 (Sat, 12 May 2007)
New Revision: 3526
Removed:
openser/trunk/debian/patches/20_usrloc_lockset_fixes.dpatch
openser/trunk/debian/patches/21_pua_lock_fix.dpatch
openser/trunk/debian/patches/22_perl_sysv_sem.dpatch
Modified:
openser/trunk/debian/changelog
openser/trunk/debian/patches/00list
Log:
Prepare for OpenSER 1.2.1.
Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog 2007-05-12 07:36:32 UTC (rev 3525)
+++ openser/trunk/debian/changelog 2007-05-12 09:23:00 UTC (rev 3526)
@@ -1,9 +1,16 @@
-openser (1.2.0-5) UNRELEASED; urgency=low
+openser (1.2.1-1) UNRELEASED; urgency=low
* NOT RELEASED YET
- -- Julien BLACHE <jblache at debian.org> Wed, 25 Apr 2007 18:07:26 +0200
+ * debian/patches/20_usrloc_lockset_fixes.dpatch:
+ + Removed; from upstream SVN.
+ * debian/patches/21_pua_lock_fix.dpatch:
+ + Removed; from upstream SVN.
+ * debian/patches/22_perl_sysv_sem.dpatch:
+ + Removed; merged upstream.
+ -- Julien BLACHE <jblache at debian.org> Sat, 12 May 2007 11:21:45 +0200
+
openser (1.2.0-4) unstable; urgency=low
* debian/patches/21_pua_lock_fix.dpatch:
Modified: openser/trunk/debian/patches/00list
===================================================================
--- openser/trunk/debian/patches/00list 2007-05-12 07:36:32 UTC (rev 3525)
+++ openser/trunk/debian/patches/00list 2007-05-12 09:23:00 UTC (rev 3526)
@@ -1,6 +1,3 @@
10_no_lib64_on_64_bits
11_always_smp
-20_usrloc_lockset_fixes
-21_pua_lock_fix
-22_perl_sysv_sem
Deleted: openser/trunk/debian/patches/20_usrloc_lockset_fixes.dpatch
===================================================================
--- openser/trunk/debian/patches/20_usrloc_lockset_fixes.dpatch 2007-05-12 07:36:32 UTC (rev 3525)
+++ openser/trunk/debian/patches/20_usrloc_lockset_fixes.dpatch 2007-05-12 09:23:00 UTC (rev 3526)
@@ -1,133 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_usrloc_lockset_fixes.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the usrloc module when not using fast locks.
-
- at DPATCH@
-diff -urNad openser-1.2.0~/modules/usrloc/hslot.c openser-1.2.0/modules/usrloc/hslot.c
---- openser-1.2.0~/modules/usrloc/hslot.c 2007-04-22 15:11:25.000000000 +0200
-+++ openser-1.2.0/modules/usrloc/hslot.c 2007-04-22 15:16:57.340479180 +0200
-@@ -40,7 +40,8 @@
- (lock_set_init(ul_locks)!=0))
- {
- ul_locks_no = i;
-- LOG(L_INFO, "INFO:ul_init_locks: locks array size %d\n", ul_locks_no);
-+ LOG(L_INFO, "INFO:ul_init_locks: locks array size %d\n",
-+ ul_locks_no);
- return 0;
-
- }
-@@ -65,6 +66,18 @@
- };
- }
-
-+#ifndef GEN_LOCK_T_PREFERED
-+void ul_lock_idx(int idx)
-+{
-+ lock_set_get(ul_locks, idx);
-+}
-+
-+void ul_release_idx(int idx)
-+{
-+ lock_set_release(ul_locks, idx);
-+}
-+#endif
-+
- /*
- * Initialize cache slot structure
- */
-@@ -74,7 +87,12 @@
- _s->first = 0;
- _s->last = 0;
- _s->d = _d;
-+
-+#ifdef GEN_LOCK_T_PREFERED
- _s->lock = &ul_locks->locks[n%ul_locks_no];
-+#else
-+ _s->lockidx = n%ul_locks_no;
-+#endif
- return 0;
- }
-
-diff -urNad openser-1.2.0~/modules/usrloc/hslot.h openser-1.2.0/modules/usrloc/hslot.h
---- openser-1.2.0~/modules/usrloc/hslot.h 2007-03-12 16:22:54.000000000 +0100
-+++ openser-1.2.0/modules/usrloc/hslot.h 2007-04-22 15:16:57.339479086 +0200
-@@ -41,10 +41,13 @@
- struct urecord* first; /* First element in the list */
- struct urecord* last; /* Last element in the list */
- struct udomain* d; /* Domain we belong to */
-- gen_lock_t *lock; /* Lock for hash entry */
-+#ifdef GEN_LOCK_T_PREFERED
-+ gen_lock_t *lock; /* Lock for hash entry - fastlock */
-+#else
-+ int lockidx; /* Lock index for hash entry - the rest*/
-+#endif
- } hslot_t;
-
--
- /*
- * Initialize slot structure
- */
-@@ -71,4 +74,9 @@
- int ul_init_locks();
- void ul_destroy_locks();
-
-+#ifndef GEN_LOCK_T_PREFERED
-+void ul_lock_idx(int idx);
-+void ul_release_idx(int idx);
-+#endif
-+
- #endif /* HSLOT_H */
-diff -urNad openser-1.2.0~/modules/usrloc/udomain.c openser-1.2.0/modules/usrloc/udomain.c
---- openser-1.2.0~/modules/usrloc/udomain.c 2007-04-22 15:11:28.000000000 +0200
-+++ openser-1.2.0/modules/usrloc/udomain.c 2007-04-22 15:16:57.341479273 +0200
-@@ -729,7 +729,12 @@
- if (db_mode!=DB_ONLY)
- {
- sl = core_hash(_aor, 0, _d->size);
-+
-+#ifdef GEN_LOCK_T_PREFERED
- lock_get(_d->table[sl].lock);
-+#else
-+ ul_lock_idx(_d->table[sl].lockidx);
-+#endif
- }
- }
-
-@@ -743,7 +748,11 @@
- if (db_mode!=DB_ONLY)
- {
- sl = core_hash(_aor, 0, _d->size);
-+#ifdef GEN_LOCK_T_PREFERED
- lock_release(_d->table[sl].lock);
-+#else
-+ ul_release_idx(_d->table[sl].lockidx);
-+#endif
- }
- }
-
-@@ -753,7 +762,11 @@
- void lock_ulslot(udomain_t* _d, int i)
- {
- if (db_mode!=DB_ONLY)
-+#ifdef GEN_LOCK_T_PREFERED
- lock_get(_d->table[i].lock);
-+#else
-+ ul_lock_idx(_d->table[i].lockidx);
-+#endif
- }
-
-
-@@ -763,7 +776,11 @@
- void unlock_ulslot(udomain_t* _d, int i)
- {
- if (db_mode!=DB_ONLY)
-+#ifdef GEN_LOCK_T_PREFERED
- lock_release(_d->table[i].lock);
-+#else
-+ ul_release_idx(_d->table[i].lockidx);
-+#endif
- }
-
-
Deleted: openser/trunk/debian/patches/21_pua_lock_fix.dpatch
===================================================================
--- openser/trunk/debian/patches/21_pua_lock_fix.dpatch 2007-05-12 07:36:32 UTC (rev 3525)
+++ openser/trunk/debian/patches/21_pua_lock_fix.dpatch 2007-05-12 09:23:00 UTC (rev 3526)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_pua_lock_fix.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix typo in modules/pua/hash.c
-
- at DPATCH@
-diff -urNad openser-1.2.0~/modules/pua/hash.c openser-1.2.0/modules/pua/hash.c
---- openser-1.2.0~/modules/pua/hash.c 2007-03-12 16:22:54.000000000 +0100
-+++ openser-1.2.0/modules/pua/hash.c 2007-04-22 17:31:48.174123883 +0200
-@@ -82,7 +82,7 @@
- {
- if(H->p_records[i].entity)
- shm_free(H->p_records[i].entity);
-- lock_destroy(&_imc_htable[i].lock);
-+ lock_destroy(&H->p_records[i].lock);
-
- }
- shm_free(H->p_records);
Deleted: openser/trunk/debian/patches/22_perl_sysv_sem.dpatch
===================================================================
--- openser/trunk/debian/patches/22_perl_sysv_sem.dpatch 2007-05-12 07:36:32 UTC (rev 3525)
+++ openser/trunk/debian/patches/22_perl_sysv_sem.dpatch 2007-05-12 09:23:00 UTC (rev 3526)
@@ -1,382 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_perl_sysv_sem.dpatch by <jblache at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix perl module build with USE_SYSV_SEM.
-## DP: - enum member conflict with global variables in globals.h
-## DP: - perl and lock_ops.h both defining union semun
-
- at DPATCH@
-diff -urNad openser-1.2.0~/modules/perl/openserxs.xs openser-1.2.0/modules/perl/openserxs.xs
---- openser-1.2.0~/modules/perl/openserxs.xs 2007-03-12 16:22:54.000000000 +0100
-+++ openser-1.2.0/modules/perl/openserxs.xs 2007-04-22 21:32:06.122254476 +0200
-@@ -29,6 +29,12 @@
- #include <XSUB.h>
- #include <unistd.h>
- #undef load_module
-+
-+/* perl.h defines union semun */
-+#ifdef USE_SYSV_SEM
-+# undef _SEM_SEMUN_UNDEFINED
-+#endif
-+
- #include "../../sr_module.h"
- #include "../../parser/msg_parser.h"
- #include "../../parser/parse_uri.h"
-@@ -43,27 +49,27 @@
-
- extern int unsafemodfnc;
-
--enum uri_members {
-- user = 0,
-- passwd,
-- host,
-- port,
-- params,
-- headers,
-- transport,
-- ttl,
-- user_param,
-- maddr,
-- method,
-- lr,
-- r2,
-- transport_val,
-- ttl_val,
-- user_param_val,
-- maddr_val,
-- method_val,
-- lr_val,
-- r2_val
-+enum xs_uri_members {
-+ XS_URI_USER = 0,
-+ XS_URI_PASSWD,
-+ XS_URI_HOST,
-+ XS_URI_PORT,
-+ XS_URI_PARAMS,
-+ XS_URI_HEADERS,
-+ XS_URI_TRANSPORT,
-+ XS_URI_TTL,
-+ XS_URI_USER_PARAM,
-+ XS_URI_MADDR,
-+ XS_URI_METHOD,
-+ XS_URI_LR,
-+ XS_URI_R2,
-+ XS_URI_TRANSPORT_VAL,
-+ XS_URI_TTL_VAL,
-+ XS_URI_USER_PARAM_VAL,
-+ XS_URI_MADDR_VAL,
-+ XS_URI_METHOD_VAL,
-+ XS_URI_LR_VAL,
-+ XS_URI_R2_VAL
-
- /* These members are no strings:
- unsigned short port_no;
-@@ -129,7 +135,7 @@
- }
-
-
--SV *getStringFromURI(SV *self, enum uri_members what) {
-+SV *getStringFromURI(SV *self, enum xs_uri_members what) {
- struct sip_uri *myuri = sv2uri(self);
- str *ret = NULL;
-
-@@ -139,45 +145,45 @@
- } else {
-
- switch (what) {
-- case user: ret = &(myuri->user);
-+ case XS_URI_USER: ret = &(myuri->user);
- break;
-- case host: ret = &(myuri->host);
-+ case XS_URI_HOST: ret = &(myuri->host);
- break;
-- case passwd: ret = &(myuri->passwd);
-+ case XS_URI_PASSWD: ret = &(myuri->passwd);
- break;
-- case port: ret = &(myuri->port);
-+ case XS_URI_PORT: ret = &(myuri->port);
- break;
-- case params: ret = &(myuri->params);
-+ case XS_URI_PARAMS: ret = &(myuri->params);
- break;
-- case headers: ret = &(myuri->headers);
-+ case XS_URI_HEADERS: ret = &(myuri->headers);
- break;
-- case transport: ret = &(myuri->transport);
-+ case XS_URI_TRANSPORT: ret = &(myuri->transport);
- break;
-- case ttl: ret = &(myuri->ttl);
-+ case XS_URI_TTL: ret = &(myuri->ttl);
- break;
-- case user_param: ret = &(myuri->user_param);
-+ case XS_URI_USER_PARAM: ret = &(myuri->user_param);
- break;
-- case maddr: ret = &(myuri->maddr);
-+ case XS_URI_MADDR: ret = &(myuri->maddr);
- break;
-- case method: ret = &(myuri->method);
-+ case XS_URI_METHOD: ret = &(myuri->method);
- break;
-- case lr: ret = &(myuri->lr);
-+ case XS_URI_LR: ret = &(myuri->lr);
- break;
-- case r2: ret = &(myuri->r2);
-+ case XS_URI_R2: ret = &(myuri->r2);
- break;
-- case transport_val: ret = &(myuri->transport_val);
-+ case XS_URI_TRANSPORT_VAL: ret = &(myuri->transport_val);
- break;
-- case ttl_val: ret = &(myuri->ttl_val);
-+ case XS_URI_TTL_VAL: ret = &(myuri->ttl_val);
- break;
-- case user_param_val: ret = &(myuri->user_param_val);
-+ case XS_URI_USER_PARAM_VAL: ret = &(myuri->user_param_val);
- break;
-- case maddr_val: ret = &(myuri->maddr_val);
-+ case XS_URI_MADDR_VAL: ret = &(myuri->maddr_val);
- break;
-- case method_val: ret = &(myuri->method_val);
-+ case XS_URI_METHOD_VAL: ret = &(myuri->method_val);
- break;
-- case lr_val: ret = &(myuri->lr_val);
-+ case XS_URI_LR_VAL: ret = &(myuri->lr_val);
- break;
-- case r2_val: ret = &(myuri->r2_val);
-+ case XS_URI_R2_VAL: ret = &(myuri->r2_val);
- break;
-
- default: LOG(L_INFO, "Unknown URI element"
-@@ -715,7 +721,6 @@
- getBody(self)
- SV *self
- PREINIT:
-- PREINIT:
- struct sip_msg *msg = sv2msg(self);
- INIT:
- CODE:
-@@ -738,7 +743,6 @@
- getMessage(self)
- SV *self
- PREINIT:
-- PREINIT:
- struct sip_msg *msg = sv2msg(self);
- INIT:
- CODE:
-@@ -1317,7 +1321,7 @@
- user(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, user);
-+ ST(0) = getStringFromURI(self, XS_URI_USER);
-
-
- =head2 host()
-@@ -1330,7 +1334,7 @@
- host(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, host);
-+ ST(0) = getStringFromURI(self, XS_URI_HOST);
-
-
- =head2 passwd()
-@@ -1343,7 +1347,7 @@
- passwd(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, passwd);
-+ ST(0) = getStringFromURI(self, XS_URI_PASSWD);
-
-
- =head2 port()
-@@ -1356,7 +1360,7 @@
- port(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, port);
-+ ST(0) = getStringFromURI(self, XS_URI_PORT);
-
-
- =head2 params()
-@@ -1369,7 +1373,7 @@
- params(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, params);
-+ ST(0) = getStringFromURI(self, XS_URI_PARAMS);
-
-
- =head2 headers()
-@@ -1382,7 +1386,7 @@
- headers(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, headers);
-+ ST(0) = getStringFromURI(self, XS_URI_HEADERS);
-
-
- =head2 transport()
-@@ -1395,7 +1399,7 @@
- transport(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, transport);
-+ ST(0) = getStringFromURI(self, XS_URI_TRANSPORT);
-
-
- =head2 ttl()
-@@ -1408,7 +1412,7 @@
- ttl(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, ttl);
-+ ST(0) = getStringFromURI(self, XS_URI_TTL);
-
-
- =head2 user_param()
-@@ -1421,7 +1425,7 @@
- user_param(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, user_param);
-+ ST(0) = getStringFromURI(self, XS_URI_USER_PARAM);
-
-
-
-@@ -1435,7 +1439,7 @@
- maddr(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, maddr);
-+ ST(0) = getStringFromURI(self, XS_URI_MADDR);
-
- =head2 method()
-
-@@ -1447,7 +1451,7 @@
- method(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, method);
-+ ST(0) = getStringFromURI(self, XS_URI_METHOD);
-
-
- =head2 lr()
-@@ -1460,7 +1464,7 @@
- lr(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, lr);
-+ ST(0) = getStringFromURI(self, XS_URI_LR);
-
-
- =head2 r2()
-@@ -1473,7 +1477,7 @@
- r2(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, r2);
-+ ST(0) = getStringFromURI(self, XS_URI_R2);
-
-
- =head2 transport_val()
-@@ -1486,7 +1490,7 @@
- transport_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, transport_val);
-+ ST(0) = getStringFromURI(self, XS_URI_TRANSPORT_VAL);
-
-
- =head2 ttl_val()
-@@ -1499,7 +1503,7 @@
- ttl_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, ttl_val);
-+ ST(0) = getStringFromURI(self, XS_URI_TTL_VAL);
-
-
- =head2 user_param_val()
-@@ -1512,7 +1516,7 @@
- user_param_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, user_param_val);
-+ ST(0) = getStringFromURI(self, XS_URI_USER_PARAM_VAL);
-
-
- =head2 maddr_val()
-@@ -1525,7 +1529,7 @@
- maddr_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, maddr_val);
-+ ST(0) = getStringFromURI(self, XS_URI_MADDR_VAL);
-
-
- =head2 method_val()
-@@ -1538,7 +1542,7 @@
- method_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, method_val);
-+ ST(0) = getStringFromURI(self, XS_URI_METHOD_VAL);
-
-
- =head2 lr_val()
-@@ -1551,7 +1555,7 @@
- lr_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, lr_val);
-+ ST(0) = getStringFromURI(self, XS_URI_LR_VAL);
-
-
- =head2 r2_val()
-@@ -1564,7 +1568,7 @@
- r2_val(self)
- SV *self;
- CODE:
-- ST(0) = getStringFromURI(self, r2_val);
-+ ST(0) = getStringFromURI(self, XS_URI_R2_VAL);
-
-
-
-diff -urNad openser-1.2.0~/modules/perl/perl.c openser-1.2.0/modules/perl/perl.c
---- openser-1.2.0~/modules/perl/perl.c 2007-03-12 16:22:54.000000000 +0100
-+++ openser-1.2.0/modules/perl/perl.c 2007-04-22 21:32:06.123254569 +0200
-@@ -37,6 +37,11 @@
- #include "../rr/api.h"
- #include "../sl/sl_api.h"
-
-+/* lock_ops.h defines union semun, perl does not need to redefine it */
-+#ifdef USE_SYSV_SEM
-+# define HAS_UNION_SEMUN
-+#endif
-+
- #include "perlfunc.h"
- #include "perl.h"
-
-diff -urNad openser-1.2.0~/modules/perl/perl.h openser-1.2.0/modules/perl/perl.h
---- openser-1.2.0~/modules/perl/perl.h 2007-03-12 16:22:54.000000000 +0100
-+++ openser-1.2.0/modules/perl/perl.h 2007-04-22 21:32:06.123254569 +0200
-@@ -27,11 +27,16 @@
- #ifndef PERL_MOD_H
- #define PERL_MOD_H
-
-+#include "../sl/sl_api.h"
-+
-+/* lock_ops.h defines union semun, perl does not need to redefine it */
-+#ifdef USE_SYSV_SEM
-+# define HAS_UNION_SEMUN
-+#endif
-+
- #include <EXTERN.h>
- #include <perl.h>
-
--#include "../sl/sl_api.h"
--
- extern char *filename;
- extern char *modpath;
-
More information about the Pkg-voip-commits
mailing list