[arch-commits] Commit in opensips/trunk (PKGBUILD remove-inline.patch)
Date: Wednesday, January 20, 2016 @ 17:38:38 Author: spupykin Revision: 158323 upgpkg: opensips 2.1.2-1 upd Modified: opensips/trunk/PKGBUILD Deleted: opensips/trunk/remove-inline.patch -+ PKGBUILD| 10 --- remove-inline.patch | 157 -- 2 files changed, 3 insertions(+), 164 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-01-20 16:38:35 UTC (rev 158322) +++ PKGBUILD2016-01-20 16:38:38 UTC (rev 158323) @@ -2,7 +2,7 @@ # Maintainer: Sergej Pupykin pkgname=opensips -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org"; @@ -23,11 +23,9 @@ license=('GPL') install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') -source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}.tar.gz - remove-inline.patch +source=(http://opensips.org/pub/opensips/${pkgver}/opensips-${pkgver}.tar.gz opensips.service) -md5sums=('ea7b3d394eb7461e172af4b900f19b70' - '3771f5720c54c7fe3326611f9b57013d' +md5sums=('f7590fde5d99fffe05659442073d750c' '35cdcb3692f6925236fd5fe7e9484c58') prepare() { @@ -41,8 +39,6 @@ sed -i 's|sbin|bin|g' Makefile sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs - -# patch -p1 <$srcdir/remove-inline.patch } _modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350 proto_tls tlsops db_http httpd tm rr" Deleted: remove-inline.patch === --- remove-inline.patch 2016-01-20 16:38:35 UTC (rev 158322) +++ remove-inline.patch 2016-01-20 16:38:38 UTC (rev 158323) @@ -1,157 +0,0 @@ -diff -wbBur opensips-2.1.0/db/db_insertq.c opensips-2.1.0.my/db/db_insertq.c opensips-2.1.0/db/db_insertq.c 2015-04-22 11:20:03.0 +0300 -+++ opensips-2.1.0.my/db/db_insertq.c 2015-05-25 16:57:42.010460560 +0300 -@@ -534,7 +534,7 @@ - } - - /* clean shm memory used by the rows */ --inline void cleanup_rows(db_val_t **rows) -+void cleanup_rows(db_val_t **rows) - { - int i; - -diff -wbBur opensips-2.1.0/db/db_insertq.h opensips-2.1.0.my/db/db_insertq.h opensips-2.1.0/db/db_insertq.h 2015-04-22 11:20:03.0 +0300 -+++ opensips-2.1.0.my/db/db_insertq.h 2015-05-25 16:57:34.480593553 +0300 -@@ -92,7 +92,7 @@ - lock_release((entry)->lock); \ - } while (0) - --inline void cleanup_rows(db_val_t **rows); -+void cleanup_rows(db_val_t **rows); - void handle_ql_shutdown(void); - - #endif -diff -wbBur opensips-2.1.0/dprint.c opensips-2.1.0.my/dprint.c opensips-2.1.0/dprint.c2015-04-22 11:20:03.0 +0300 -+++ opensips-2.1.0.my/dprint.c 2015-05-25 16:57:11.490999596 +0300 -@@ -119,18 +119,18 @@ - } - - /* change the actual log level of the current process */ --inline void set_proc_debug_level(int level) -+void set_proc_debug_level(int level) - { - __set_proc_debug_level(process_no, level); - } - - /* change the actual log level of a given process */ --inline void __set_proc_debug_level(int proc_idx, int level) -+void __set_proc_debug_level(int proc_idx, int level) - { - pt[proc_idx].debug = level; - } - --inline void set_global_debug_level(int level) -+void set_global_debug_level(int level) - { - int i; - -@@ -140,7 +140,7 @@ - } - } - --inline void reset_proc_debug_level(void) -+void reset_proc_debug_level(void) - { - *debug = *default_debug; - } -diff -wbBur opensips-2.1.0/dprint.h opensips-2.1.0.my/dprint.h opensips-2.1.0/dprint.h2015-04-22 11:20:03.0 +0300 -+++ opensips-2.1.0.my/dprint.h 2015-05-25 16:57:21.624153957 +0300 -@@ -117,21 +117,21 @@ - int str2facility(char *s); - - /* set the current and default log levels for all OpenSIPS processes */ --inline void set_global_debug_level(int level); -+void set_global_debug_level(int level); - - /* set the log level of the current process */ --inline void set_proc_debug_level(int level); -+void set_proc_debug_level(int level); - - /* - * set the (default) log level of a given process - * - * Note: the index param is not validated! - */ --inline void __set_proc_debug_level(int proc_idx, int level); --inline void __set_proc_default_debug(int proc_idx, int level); -+void __set_proc_debug_level(int proc_idx, int level); -+void __set_proc_default_debug(int proc_idx, int level); - - /* changes the logging level to the default value for the current process */ --inline void reset_proc_debug_level(void); -+void reset_proc_debug_level(void); - - inline static char* dp_time(void) - { -diff -wbBur opensips-2.1.0/mem/mem.c opensips-2.1.0.my/mem/mem.c opensips-2.1.0/mem/mem.c 2015-04-22 11:20:03.0 +0300 -+++ opensips-2.1.0.my/mem/mem.c2015-05-25 16:55:03.996584777 +0300 -@@ -166,7 +166,7 @@
[arch-commits] Commit in opensips/trunk (PKGBUILD remove-inline.patch)
Date: Monday, May 25, 2015 @ 17:26:21 Author: spupykin Revision: 134063 upgpkg: opensips 2.1.0-2 upd Added: opensips/trunk/remove-inline.patch Modified: opensips/trunk/PKGBUILD -+ PKGBUILD|2 remove-inline.patch | 157 ++ 2 files changed, 158 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-05-25 15:04:34 UTC (rev 134062) +++ PKGBUILD2015-05-25 15:26:21 UTC (rev 134063) @@ -8,7 +8,7 @@ url="http://www.opensips.org"; depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' -'lynx' 'libxslt') +'lynx' 'libxslt' 'libmicrohttpd') optdepends=('postgresql-libs' 'unixodbc' 'libldap' Added: remove-inline.patch === --- remove-inline.patch (rev 0) +++ remove-inline.patch 2015-05-25 15:26:21 UTC (rev 134063) @@ -0,0 +1,157 @@ +diff -wbBur opensips-2.1.0/db/db_insertq.c opensips-2.1.0.my/db/db_insertq.c +--- opensips-2.1.0/db/db_insertq.c 2015-04-22 11:20:03.0 +0300 opensips-2.1.0.my/db/db_insertq.c 2015-05-25 16:57:42.010460560 +0300 +@@ -534,7 +534,7 @@ + } + + /* clean shm memory used by the rows */ +-inline void cleanup_rows(db_val_t **rows) ++void cleanup_rows(db_val_t **rows) + { + int i; + +diff -wbBur opensips-2.1.0/db/db_insertq.h opensips-2.1.0.my/db/db_insertq.h +--- opensips-2.1.0/db/db_insertq.h 2015-04-22 11:20:03.0 +0300 opensips-2.1.0.my/db/db_insertq.h 2015-05-25 16:57:34.480593553 +0300 +@@ -92,7 +92,7 @@ + lock_release((entry)->lock); \ + } while (0) + +-inline void cleanup_rows(db_val_t **rows); ++void cleanup_rows(db_val_t **rows); + void handle_ql_shutdown(void); + + #endif +diff -wbBur opensips-2.1.0/dprint.c opensips-2.1.0.my/dprint.c +--- opensips-2.1.0/dprint.c2015-04-22 11:20:03.0 +0300 opensips-2.1.0.my/dprint.c 2015-05-25 16:57:11.490999596 +0300 +@@ -119,18 +119,18 @@ + } + + /* change the actual log level of the current process */ +-inline void set_proc_debug_level(int level) ++void set_proc_debug_level(int level) + { + __set_proc_debug_level(process_no, level); + } + + /* change the actual log level of a given process */ +-inline void __set_proc_debug_level(int proc_idx, int level) ++void __set_proc_debug_level(int proc_idx, int level) + { + pt[proc_idx].debug = level; + } + +-inline void set_global_debug_level(int level) ++void set_global_debug_level(int level) + { + int i; + +@@ -140,7 +140,7 @@ + } + } + +-inline void reset_proc_debug_level(void) ++void reset_proc_debug_level(void) + { + *debug = *default_debug; + } +diff -wbBur opensips-2.1.0/dprint.h opensips-2.1.0.my/dprint.h +--- opensips-2.1.0/dprint.h2015-04-22 11:20:03.0 +0300 opensips-2.1.0.my/dprint.h 2015-05-25 16:57:21.624153957 +0300 +@@ -117,21 +117,21 @@ + int str2facility(char *s); + + /* set the current and default log levels for all OpenSIPS processes */ +-inline void set_global_debug_level(int level); ++void set_global_debug_level(int level); + + /* set the log level of the current process */ +-inline void set_proc_debug_level(int level); ++void set_proc_debug_level(int level); + + /* + * set the (default) log level of a given process + * + * Note: the index param is not validated! + */ +-inline void __set_proc_debug_level(int proc_idx, int level); +-inline void __set_proc_default_debug(int proc_idx, int level); ++void __set_proc_debug_level(int proc_idx, int level); ++void __set_proc_default_debug(int proc_idx, int level); + + /* changes the logging level to the default value for the current process */ +-inline void reset_proc_debug_level(void); ++void reset_proc_debug_level(void); + + inline static char* dp_time(void) + { +diff -wbBur opensips-2.1.0/mem/mem.c opensips-2.1.0.my/mem/mem.c +--- opensips-2.1.0/mem/mem.c 2015-04-22 11:20:03.0 +0300 opensips-2.1.0.my/mem/mem.c2015-05-25 16:55:03.996584777 +0300 +@@ -166,7 +166,7 @@ + event_pkg_pending = 0; + } + +-inline void pkg_threshold_check(void) ++void pkg_threshold_check(void) + { + long pkg_perc, used, size; + +diff -wbBur opensips-2.1.0/mem/meminfo.h opensips-2.1.0.my/mem/meminfo.h +--- opensips-2.1.0/mem/meminfo.h 2015-04-22 11:20:03.0 +0300 opensips-2.1.0.my/mem/meminfo.h2015-05-25 16:54:49.196846178 +0300 +@@ -44,7 +44,7 @@ + // threshold percentage checked + extern long event_pkg_threshold; + // events are used only if STATISTICS are used +-inline void pkg_threshold_check(void); ++void pkg_threshold_check(void); + #else + #define pkg_threshold_check() + #endif /* STATISTICS */ +diff -wbBur opensips-2.1.0/resolve.c opensips-2.1.0.my/resolve.c +---