diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-21 15:50:54 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-21 15:50:54 +0000 |
| commit | a4b6f9e2dfb4858433efd3621f5fb61cb15ab0a5 (patch) | |
| tree | 24498e733eca07efa8bddceb7ac451af74b618de | |
| parent | a86e43f4f1d8c578a303cd33bd03eaac11199088 (diff) | |
| download | aports-a4b6f9e2dfb4858433efd3621f5fb61cb15ab0a5.tar.bz2 aports-a4b6f9e2dfb4858433efd3621f5fb61cb15ab0a5.tar.xz | |
testing/kamailio: backport old fixes and respect CFLAGS
| -rw-r--r-- | testing/kamailio/APKBUILD | 31 | ||||
| -rw-r--r-- | testing/kamailio/kamailio-backslash.patch | 4 |
2 files changed, 22 insertions, 13 deletions
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index ea28b0cafe..5e3a0c6393 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kamailio pkgver=3.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -19,23 +19,31 @@ source="http://sip-router.org/tarballs/sr/kamailio_3.0/kamailio-${pkgver}_src_20 kamailio.initd kamailio.pre-install kamailio.post-install + kamailio-backslash.patch " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" -# patch -p1 -i "$srcdir"/kamailio-backslash.patch || return 1 + patch -p1 -i "$srcdir"/kamailio-backslash.patch || return 1 sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ - -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' Makefile.defs \ + -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ + -e "s:-O9 -funroll-loops:$CFLAGS:g" \ + Makefile.defs \ || return 1 -# cd scripts -# sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ -# kamctl.base kamctlrc || return 1 -# # Set email_address field as not required field (could be null) -# cd dbtext/kamailio -# sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ -# || return 1 + + cd utils/kamctl/ + sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ + kamctl.base kamctlrc || return 1 + # we actually dont need bash + sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl \ + || return 1 + # Set email_address field as not required field (could be null) + cd dbtext/kamailio + sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ + || return 1 + } build() { @@ -137,4 +145,5 @@ md5sums="a043944e195338d56bdfdcd6c86a468b kamailio-3.0.0_src_2010-01-12_6d1e9f. eb665248ee39cf755a247286affc5cbb kamailio.cfg 81100c479890a2a8c2628db22fdd1a0c kamailio.initd c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install -3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install" +3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install +10f8be110985a841dd5b892f86eb6722 kamailio-backslash.patch" diff --git a/testing/kamailio/kamailio-backslash.patch b/testing/kamailio/kamailio-backslash.patch index cefebcd2c7..c474db38de 100644 --- a/testing/kamailio/kamailio-backslash.patch +++ b/testing/kamailio/kamailio-backslash.patch @@ -1,5 +1,5 @@ ---- a/scripts/kamdbctl.base Tue Dec 22 07:01:57 2009 -+++ b/scripts/kamdbctl.base Tue Dec 22 07:02:26 2009 +--- a/utils/kamctl/kamdbctl.base Tue Dec 22 07:01:57 2009 ++++ b/utils/kamctl/kamdbctl.base Tue Dec 22 07:02:26 2009 @@ -32,9 +32,9 @@ # Used by dbtext and db_berkeley to define tables to be created, used by |