[arch-commits] Commit in opensips/trunk (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Thu May 23 11:20:53 UTC 2013
Date: Thursday, May 23, 2013 @ 13:20:53
Author: spupykin
Revision: 91535
upgpkg: opensips 1.9.1-2
upd
Modified:
opensips/trunk/PKGBUILD
opensips/trunk/opensips.install
opensips/trunk/opensips.service
Deleted:
opensips/trunk/opensips.init
------------------+
PKGBUILD | 16 +++++++++++-----
opensips.init | 50 --------------------------------------------------
opensips.install | 6 ++----
opensips.service | 4 ++--
4 files changed, 15 insertions(+), 61 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-23 11:17:51 UTC (rev 91534)
+++ PKGBUILD 2013-05-23 11:20:53 UTC (rev 91535)
@@ -3,7 +3,7 @@
pkgname=opensips
pkgver=1.9.1
-pkgrel=1
+pkgrel=2
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')
@@ -26,10 +26,9 @@
source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz
opensips.service)
md5sums=('0b7b93f4df29a96daedf12e490e7ec86'
- '7b786d758fe3174af34e2ced44b549e7')
+ '35cdcb3692f6925236fd5fe7e9484c58')
-build()
-{
+prepare() {
cd $srcdir/$pkgname-$pkgver-tls/
# python2 fix
@@ -38,6 +37,13 @@
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
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver-tls/
+
make \
include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
TLS=1 LIBDIR=lib
@@ -62,7 +68,7 @@
cd $pkgdir/usr/lib/opensips/opensipsctl
find -type f -exec sed -i "s#$pkgdir##" {} \;
- cd $pkgdir/usr/sbin
+ cd $pkgdir/usr/bin
sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole
cd $pkgdir/etc
Deleted: opensips.init
===================================================================
--- opensips.init 2013-05-23 11:17:51 UTC (rev 91534)
+++ opensips.init 2013-05-23 11:20:53 UTC (rev 91535)
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BINNAME=opensips
-OSRDIR=/usr/sbin
-OPENSIPS=$OSRDIR/$BINNAME
-
-TMPDIR=/var/tmp
-CORE=$TMPDIR/core
-
-ETC=/etc/opensips/opensips.cfg
-PIDFILE=/var/run/opensips.pid
-
-case "$1" in
- start)
- stat_busy "Starting OpenSIPS server"
- cd $TMPDIR
- $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon opensips
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping OpenSIPS server"
- if [ -r $PIDFILE ]
- then
- cat $PIDFILE | xargs kill
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon opensips
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
Modified: opensips.install
===================================================================
--- opensips.install 2013-05-23 11:17:51 UTC (rev 91534)
+++ opensips.install 2013-05-23 11:20:53 UTC (rev 91535)
@@ -1,5 +1,3 @@
-post_install()
-{
- echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'"
- /bin/true
+post_install() {
+ echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'"
}
Modified: opensips.service
===================================================================
--- opensips.service 2013-05-23 11:17:51 UTC (rev 91534)
+++ opensips.service 2013-05-23 11:20:53 UTC (rev 91535)
@@ -4,8 +4,8 @@
[Service]
Type=forking
-PIDFile=/var/run/opensips.pid
-ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid
+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
More information about the arch-commits
mailing list