Date: Wednesday, January 20, 2016 @ 17:38:56 Author: spupykin Revision: 158324
archrelease: copy trunk to community-i686, community-x86_64 Added: opensips/repos/community-i686/PKGBUILD (from rev 158323, opensips/trunk/PKGBUILD) opensips/repos/community-i686/opensips.install (from rev 158323, opensips/trunk/opensips.install) opensips/repos/community-i686/opensips.service (from rev 158323, opensips/trunk/opensips.service) opensips/repos/community-x86_64/PKGBUILD (from rev 158323, opensips/trunk/PKGBUILD) opensips/repos/community-x86_64/opensips.install (from rev 158323, opensips/trunk/opensips.install) opensips/repos/community-x86_64/opensips.service (from rev 158323, opensips/trunk/opensips.service) Deleted: opensips/repos/community-i686/PKGBUILD opensips/repos/community-i686/opensips.install opensips/repos/community-i686/opensips.service opensips/repos/community-i686/remove-inline.patch opensips/repos/community-x86_64/PKGBUILD opensips/repos/community-x86_64/opensips.install opensips/repos/community-x86_64/opensips.service opensips/repos/community-x86_64/remove-inline.patch --------------------------------------+ /PKGBUILD | 160 +++++++++++++++++++++++++++++++++ /opensips.install | 6 + /opensips.service | 22 ++++ community-i686/PKGBUILD | 84 ----------------- community-i686/opensips.install | 3 community-i686/opensips.service | 11 -- community-i686/remove-inline.patch | 157 -------------------------------- community-x86_64/PKGBUILD | 84 ----------------- community-x86_64/opensips.install | 3 community-x86_64/opensips.service | 11 -- community-x86_64/remove-inline.patch | 157 -------------------------------- 11 files changed, 188 insertions(+), 510 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-01-20 16:38:38 UTC (rev 158323) +++ community-i686/PKGBUILD 2016-01-20 16:38:56 UTC (rev 158324) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=opensips -pkgver=2.1.1 -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" -depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') -makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' - 'lynx' 'libxslt' 'libmicrohttpd') -optdepends=('postgresql-libs' - 'unixodbc' - 'libldap' - 'libmariadbclient' - 'libsasl' - 'python2' - 'pcre') -backup=("etc/opensips/opensips.cfg" - "etc/opensips/dictionary.radius" - "etc/opensips/opensipsctlrc") -arch=('i686' 'x86_64') -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 - opensips.service) -md5sums=('ea7b3d394eb7461e172af4b900f19b70' - '3771f5720c54c7fe3326611f9b57013d' - '35cdcb3692f6925236fd5fe7e9484c58') - -prepare() { - cd $srcdir/$pkgname-$pkgver/ - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - 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" - -build() { - cd $srcdir/$pkgname-$pkgver/ - - make \ - include_modules="${_modules}" \ - LIBDIR=lib PREFIX=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver/ - - make \ - include_modules="${_modules}" \ - BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install - - # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) - mkdir -p $pkgdir/etc/ - mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ - sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg - - # fix bad paths - cd $pkgdir/usr/share - find -type f -exec sed -i "s#$pkgdir##" {} \; - - cd $pkgdir/usr/lib/opensips/opensipsctl - find -type f -exec sed -i "s#$pkgdir##" {} \; - - cd $pkgdir/usr/bin - sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole - - cd $pkgdir/etc - find -type f -exec sed -i "s#$pkgdir##" {} \; - - install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service -} Copied: opensips/repos/community-i686/PKGBUILD (from rev 158323, opensips/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-01-20 16:38:56 UTC (rev 158324) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=opensips +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" +depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') +makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' + 'lynx' 'libxslt' 'libmicrohttpd') +optdepends=('postgresql-libs' + 'unixodbc' + 'libldap' + 'libmariadbclient' + 'libsasl' + 'python2' + 'pcre') +backup=("etc/opensips/opensips.cfg" + "etc/opensips/dictionary.radius" + "etc/opensips/opensipsctlrc") +arch=('i686' 'x86_64') +license=('GPL') +install=opensips.install +options=('!emptydirs' 'zipman' '!makeflags' 'docs') +source=(http://opensips.org/pub/opensips/${pkgver}/opensips-${pkgver}.tar.gz + opensips.service) +md5sums=('f7590fde5d99fffe05659442073d750c' + '35cdcb3692f6925236fd5fe7e9484c58') + +prepare() { + cd $srcdir/$pkgname-$pkgver/ + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + sed -i 's|sbin|bin|g' Makefile + sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs +} + +_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350 proto_tls tlsops db_http httpd tm rr" + +build() { + cd $srcdir/$pkgname-$pkgver/ + + make \ + include_modules="${_modules}" \ + LIBDIR=lib PREFIX=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver/ + + make \ + include_modules="${_modules}" \ + BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install + + # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) + mkdir -p $pkgdir/etc/ + mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ + sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg + + # fix bad paths + cd $pkgdir/usr/share + find -type f -exec sed -i "s#$pkgdir##" {} \; + + cd $pkgdir/usr/lib/opensips/opensipsctl + find -type f -exec sed -i "s#$pkgdir##" {} \; + + cd $pkgdir/usr/bin + sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole + + cd $pkgdir/etc + find -type f -exec sed -i "s#$pkgdir##" {} \; + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service +} Deleted: community-i686/opensips.install =================================================================== --- community-i686/opensips.install 2016-01-20 16:38:38 UTC (rev 158323) +++ community-i686/opensips.install 2016-01-20 16:38:56 UTC (rev 158324) @@ -1,3 +0,0 @@ -post_install() { - echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'" -} Copied: opensips/repos/community-i686/opensips.install (from rev 158323, opensips/trunk/opensips.install) =================================================================== --- community-i686/opensips.install (rev 0) +++ community-i686/opensips.install 2016-01-20 16:38:56 UTC (rev 158324) @@ -0,0 +1,3 @@ +post_install() { + echo "To use MySQL, you should install mysql package and run 'opensipsdbctl create'" +} Deleted: community-i686/opensips.service =================================================================== --- community-i686/opensips.service 2016-01-20 16:38:38 UTC (rev 158323) +++ community-i686/opensips.service 2016-01-20 16:38:56 UTC (rev 158324) @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSIPS daemon -After=network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/run/opensips.pid -ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid - -[Install] -WantedBy=multi-user.target Copied: opensips/repos/community-i686/opensips.service (from rev 158323, opensips/trunk/opensips.service) =================================================================== --- community-i686/opensips.service (rev 0) +++ community-i686/opensips.service 2016-01-20 16:38:56 UTC (rev 158324) @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSIPS daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/run/opensips.pid +ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid + +[Install] +WantedBy=multi-user.target Deleted: community-i686/remove-inline.patch =================================================================== --- community-i686/remove-inline.patch 2016-01-20 16:38:38 UTC (rev 158323) +++ community-i686/remove-inline.patch 2016-01-20 16:38:56 UTC (rev 158324) @@ -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.000000000 +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.000000000 +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.c 2015-04-22 11:20:03.000000000 +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.h 2015-04-22 11:20:03.000000000 +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.000000000 +0300 -+++ opensips-2.1.0.my/mem/mem.c 2015-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.000000000 +0300 -+++ opensips-2.1.0.my/mem/meminfo.h 2015-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 ---- opensips-2.1.0/resolve.c 2015-04-22 11:20:03.000000000 +0300 -+++ opensips-2.1.0.my/resolve.c 2015-05-25 16:54:37.070393698 +0300 -@@ -445,7 +445,7 @@ - return &global_he; - } - --inline struct hostent* resolvehost(char* name, int no_ip_test) -+struct hostent* resolvehost(char* name, int no_ip_test) - { - static struct hostent* he=0; - #ifdef HAVE_GETIPNODEBYNAME -@@ -591,7 +591,7 @@ - } - - --inline struct hostent* rev_resolvehost(struct ip_addr *ip) -+struct hostent* rev_resolvehost(struct ip_addr *ip) - { - if (dnscache_fetch_func != NULL) { - return own_gethostbyaddr((char*)(ip)->u.addr, (ip)->len, (ip)->af); -diff -wbBur opensips-2.1.0/socket_info.c opensips-2.1.0.my/socket_info.c ---- opensips-2.1.0/socket_info.c 2015-04-22 11:20:03.000000000 +0300 -+++ opensips-2.1.0.my/socket_info.c 2015-05-25 16:57:57.863513899 +0300 -@@ -101,7 +101,7 @@ - - - /* another helper function, it just creates a socket_info struct */ --inline struct socket_info* new_sock_info( char* name, -+struct socket_info* new_sock_info( char* name, - unsigned short port, unsigned short proto, - char *adv_name, unsigned short adv_port, - unsigned short children,enum si_flags flags) -diff -wbBur opensips-2.1.0/socket_info.h opensips-2.1.0.my/socket_info.h ---- opensips-2.1.0/socket_info.h 2015-05-07 17:13:54.000000000 +0300 -+++ opensips-2.1.0.my/socket_info.h 2015-05-25 16:57:54.256910931 +0300 -@@ -43,7 +43,7 @@ - int add_listen_iface(char* name, unsigned short port, unsigned short proto, - char *adv_name, unsigned short adv_port, - unsigned short children, enum si_flags flags); --inline struct socket_info * -+struct socket_info * - new_sock_info(char* name, unsigned short port, unsigned short proto, - char *adv_name, unsigned short adv_port, - unsigned short children, enum si_flags flags); Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-01-20 16:38:38 UTC (rev 158323) +++ community-x86_64/PKGBUILD 2016-01-20 16:38:56 UTC (rev 158324) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=opensips -pkgver=2.1.1 -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" -depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') -makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' - 'lynx' 'libxslt' 'libmicrohttpd') -optdepends=('postgresql-libs' - 'unixodbc' - 'libldap' - 'libmariadbclient' - 'libsasl' - 'python2' - 'pcre') -backup=("etc/opensips/opensips.cfg" - "etc/opensips/dictionary.radius" - "etc/opensips/opensipsctlrc") -arch=('i686' 'x86_64') -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 - opensips.service) -md5sums=('ea7b3d394eb7461e172af4b900f19b70' - '3771f5720c54c7fe3326611f9b57013d' - '35cdcb3692f6925236fd5fe7e9484c58') - -prepare() { - cd $srcdir/$pkgname-$pkgver/ - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - 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" - -build() { - cd $srcdir/$pkgname-$pkgver/ - - make \ - include_modules="${_modules}" \ - LIBDIR=lib PREFIX=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver/ - - make \ - include_modules="${_modules}" \ - BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install - - # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) - mkdir -p $pkgdir/etc/ - mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ - sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg - - # fix bad paths - cd $pkgdir/usr/share - find -type f -exec sed -i "s#$pkgdir##" {} \; - - cd $pkgdir/usr/lib/opensips/opensipsctl - find -type f -exec sed -i "s#$pkgdir##" {} \; - - cd $pkgdir/usr/bin - sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole - - cd $pkgdir/etc - find -type f -exec sed -i "s#$pkgdir##" {} \; - - install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service -} Copied: opensips/repos/community-x86_64/PKGBUILD (from rev 158323, opensips/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-01-20 16:38:56 UTC (rev 158324) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=opensips +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" +depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') +makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmariadbclient' + 'lynx' 'libxslt' 'libmicrohttpd') +optdepends=('postgresql-libs' + 'unixodbc' + 'libldap' + 'libmariadbclient' + 'libsasl' + 'python2' + 'pcre') +backup=("etc/opensips/opensips.cfg" + "etc/opensips/dictionary.radius" + "etc/opensips/opensipsctlrc") +arch=('i686' 'x86_64') +license=('GPL') +install=opensips.install +options=('!emptydirs' 'zipman' '!makeflags' 'docs') +source=(http://opensips.org/pub/opensips/${pkgver}/opensips-${pkgver}.tar.gz + opensips.service) +md5sums=('f7590fde5d99fffe05659442073d750c' + '35cdcb3692f6925236fd5fe7e9484c58') + +prepare() { + cd $srcdir/$pkgname-$pkgver/ + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + sed -i 's|sbin|bin|g' Makefile + sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs +} + +_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350 proto_tls tlsops db_http httpd tm rr" + +build() { + cd $srcdir/$pkgname-$pkgver/ + + make \ + include_modules="${_modules}" \ + LIBDIR=lib PREFIX=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver/ + + make \ + include_modules="${_modules}" \ + BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install + + # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) + mkdir -p $pkgdir/etc/ + mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ + sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg + + # fix bad paths + cd $pkgdir/usr/share + find -type f -exec sed -i "s#$pkgdir##" {} \; + + cd $pkgdir/usr/lib/opensips/opensipsctl + find -type f -exec sed -i "s#$pkgdir##" {} \; + + cd $pkgdir/usr/bin + sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole + + cd $pkgdir/etc + find -type f -exec sed -i "s#$pkgdir##" {} \; + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service +} Deleted: community-x86_64/opensips.install =================================================================== --- community-x86_64/opensips.install 2016-01-20 16:38:38 UTC (rev 158323) +++ community-x86_64/opensips.install 2016-01-20 16:38:56 UTC (rev 158324) @@ -1,3 +0,0 @@ -post_install() { - echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'" -} Copied: opensips/repos/community-x86_64/opensips.install (from rev 158323, opensips/trunk/opensips.install) =================================================================== --- community-x86_64/opensips.install (rev 0) +++ community-x86_64/opensips.install 2016-01-20 16:38:56 UTC (rev 158324) @@ -0,0 +1,3 @@ +post_install() { + echo "To use MySQL, you should install mysql package and run 'opensipsdbctl create'" +} Deleted: community-x86_64/opensips.service =================================================================== --- community-x86_64/opensips.service 2016-01-20 16:38:38 UTC (rev 158323) +++ community-x86_64/opensips.service 2016-01-20 16:38:56 UTC (rev 158324) @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSIPS daemon -After=network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/run/opensips.pid -ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid - -[Install] -WantedBy=multi-user.target Copied: opensips/repos/community-x86_64/opensips.service (from rev 158323, opensips/trunk/opensips.service) =================================================================== --- community-x86_64/opensips.service (rev 0) +++ community-x86_64/opensips.service 2016-01-20 16:38:56 UTC (rev 158324) @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSIPS daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/run/opensips.pid +ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/remove-inline.patch =================================================================== --- community-x86_64/remove-inline.patch 2016-01-20 16:38:38 UTC (rev 158323) +++ community-x86_64/remove-inline.patch 2016-01-20 16:38:56 UTC (rev 158324) @@ -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.000000000 +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.000000000 +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.c 2015-04-22 11:20:03.000000000 +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.h 2015-04-22 11:20:03.000000000 +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.000000000 +0300 -+++ opensips-2.1.0.my/mem/mem.c 2015-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.000000000 +0300 -+++ opensips-2.1.0.my/mem/meminfo.h 2015-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 ---- opensips-2.1.0/resolve.c 2015-04-22 11:20:03.000000000 +0300 -+++ opensips-2.1.0.my/resolve.c 2015-05-25 16:54:37.070393698 +0300 -@@ -445,7 +445,7 @@ - return &global_he; - } - --inline struct hostent* resolvehost(char* name, int no_ip_test) -+struct hostent* resolvehost(char* name, int no_ip_test) - { - static struct hostent* he=0; - #ifdef HAVE_GETIPNODEBYNAME -@@ -591,7 +591,7 @@ - } - - --inline struct hostent* rev_resolvehost(struct ip_addr *ip) -+struct hostent* rev_resolvehost(struct ip_addr *ip) - { - if (dnscache_fetch_func != NULL) { - return own_gethostbyaddr((char*)(ip)->u.addr, (ip)->len, (ip)->af); -diff -wbBur opensips-2.1.0/socket_info.c opensips-2.1.0.my/socket_info.c ---- opensips-2.1.0/socket_info.c 2015-04-22 11:20:03.000000000 +0300 -+++ opensips-2.1.0.my/socket_info.c 2015-05-25 16:57:57.863513899 +0300 -@@ -101,7 +101,7 @@ - - - /* another helper function, it just creates a socket_info struct */ --inline struct socket_info* new_sock_info( char* name, -+struct socket_info* new_sock_info( char* name, - unsigned short port, unsigned short proto, - char *adv_name, unsigned short adv_port, - unsigned short children,enum si_flags flags) -diff -wbBur opensips-2.1.0/socket_info.h opensips-2.1.0.my/socket_info.h ---- opensips-2.1.0/socket_info.h 2015-05-07 17:13:54.000000000 +0300 -+++ opensips-2.1.0.my/socket_info.h 2015-05-25 16:57:54.256910931 +0300 -@@ -43,7 +43,7 @@ - int add_listen_iface(char* name, unsigned short port, unsigned short proto, - char *adv_name, unsigned short adv_port, - unsigned short children, enum si_flags flags); --inline struct socket_info * -+struct socket_info * - new_sock_info(char* name, unsigned short port, unsigned short proto, - char *adv_name, unsigned short adv_port, - unsigned short children, enum si_flags flags);