summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorMichael Mason <ms13sp@gmail.com>2009-09-14 11:56:57 +0000
committerMichael Mason <ms13sp@gmail.com>2009-09-14 11:56:57 +0000
commita4d305e77964f01cefda6bcdc56beea9e7fd722a (patch)
treede640504a1b742821cc3fc7cd7e6f72ec9bc647b /testing
parent5b62c636cb3462c617f0719c1e6f50cd53135962 (diff)
parent3c471f85eacd8b9d76c98cff4345f3bc84934001 (diff)
downloadaports-a4d305e77964f01cefda6bcdc56beea9e7fd722a.tar.bz2
aports-a4d305e77964f01cefda6bcdc56beea9e7fd722a.tar.xz
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'testing')
-rw-r--r--testing/kamailio/APKBUILD13
-rw-r--r--testing/kamailio/kamailio.initd4
-rw-r--r--testing/linux-vserver/APKBUILD10
-rw-r--r--testing/mpd/APKBUILD6
-rw-r--r--testing/mpd/mpd.initd4
-rw-r--r--testing/pjproject/APKBUILD30
6 files changed, 43 insertions, 24 deletions
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD
index f40d89fa..a5d6bfe4 100644
--- a/testing/kamailio/APKBUILD
+++ b/testing/kamailio/APKBUILD
@@ -1,9 +1,12 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kamailio
pkgver=1.5.2
-pkgrel=2
+pkgrel=3
pkgdesc="Open Source SIP Server"
url="http://www.kamailio.org/"
+pkgusers="kamailio"
+pkggroups="kamailio"
license="GPL"
depends=
makedepends="bison flex expat-dev postgresql-dev mysql-dev pcre-dev
@@ -25,9 +28,13 @@ build() {
cd scripts
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 '1s:/bin/bash:/bin/sh:' kamctl kamdbctl \
+ || return 1
cd ..
make prefix=/usr \
+ cfg-dir=/etc/kamailio \
MODS_MYSQL=yes \
MODS_PCRE=yes \
MODS_PRESENCE=yes \
@@ -36,6 +43,7 @@ build() {
include_modules=db_postgres \
all || return 1
make prefix=/usr \
+ cfg-dir=/etc/kamailio \
MODS_MYSQL=yes \
MODS_PCRE=yes \
MODS_PRESENCE=yes \
@@ -45,6 +53,7 @@ build() {
basedir="$pkgdir" install || return 1
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+ install -d -o kamailio "$pkgdir"/var/run/kamailio
}
_mv_mod() {
@@ -87,6 +96,6 @@ presence() {
}
md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99 kamailio-1.5.2-notls_src.tar.gz
-e6b93397ec2a1ec094d23d93d87771bd kamailio.initd
+84f3c403b65a8fca9df4b71f51224e21 kamailio.initd
c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install
3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install"
diff --git a/testing/kamailio/kamailio.initd b/testing/kamailio/kamailio.initd
index aaea95b3..afe9cb08 100644
--- a/testing/kamailio/kamailio.initd
+++ b/testing/kamailio/kamailio.initd
@@ -11,8 +11,8 @@ start() {
ebegin "Starting Kamailio"
start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-- \
- -u ${KAMAILIO_USER:-opensips} \
- -g ${KAMAILIO_GROUP:-opensips} \
+ -u ${KAMAILIO_USER:-kamailio} \
+ -g ${KAMAILIO_GROUP:-kamailio} \
-P $pidfile
eend $?
}
diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index b934ac5d..4901257f 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -2,9 +2,9 @@
_flavor=vserver
pkgname=linux-${_flavor}
-pkgver=2.6.30.5
+pkgver=2.6.30.6
_kernver=2.6.30
-pkgrel=2
+pkgrel=0
pkgdesc="Linux kernel with vserver"
url="http://linux-vserver.org/"
depends="mkinitfs"
@@ -13,7 +13,7 @@ _config=${config:-kernelconfig}
install="$pkgname.post-install $pkgname.post-upgrade"
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- http://vserver.13thfloor.at/Experimental/patch-2.6.30.5-vs2.3.0.36.14-pre7.diff
+ http://vserver.13thfloor.at/Experimental/patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
$_config
"
@@ -113,7 +113,7 @@ dev() {
}
md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
-47841c7ff5c81a7b349a79f2fa8e9138 patch-2.6.30.5.bz2
-19c807c338e25abf2850eb4b04f0b4f1 patch-2.6.30.5-vs2.3.0.36.14-pre7.diff
+f89295707f68c2b349534b490c9d5f2d patch-2.6.30.6.bz2
+37e45dcf0eb69e8cc8665522dde28f1a patch-2.6.30.6-vs2.3.0.36.14-pre8.diff
ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
d6c121ed9e568fe4179afc428ff824b6 kernelconfig"
diff --git a/testing/mpd/APKBUILD b/testing/mpd/APKBUILD
index 92e8c6db..c52e1c2d 100644
--- a/testing/mpd/APKBUILD
+++ b/testing/mpd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <natanael.copa@gmail.com>
pkgname=mpd
pkgver=0.15.2
-pkgrel=0
+pkgrel=1
pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
url="http://musicpd.org"
pkgusers="mpd"
@@ -32,7 +32,7 @@ build() {
install -d "$pkgdir"/etc
sed -e 's:\#pid_file.*:pid_file\t\t/var/run/mpd/mpd.pid:' \
-e 's:\#user.*:user\t\tmpd:' \
- -e 's:\#log_file.*:log_file\t\t/var/log/mpd:' \
+ -e 's:\#log_file.*:log_file\t\t/var/log/mpd/mpd.log:' \
doc/mpdconf.example > "$pkgdir"/etc/mpd.conf
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -44,5 +44,5 @@ build() {
"$pkgdir"/var/lib/mpd/music
}
md5sums="869779fdf592ac45d067c7dec228cb51 mpd-0.15.2.tar.bz2
-942017fbdc8bbaf5109e972a0a51b2c1 mpd.initd
+338857abd41efd08b2d2b5399a07a87f mpd.initd
dbd301041953a5cf9c2b9de8f23eb6bb mpd.confd"
diff --git a/testing/mpd/mpd.initd b/testing/mpd/mpd.initd
index 7601ed4f..e8403576 100644
--- a/testing/mpd/mpd.initd
+++ b/testing/mpd/mpd.initd
@@ -3,7 +3,7 @@
# init.d file for music player daemon
NAME=mpd
-DAEMON=/usr/sbin/$NAME
+DAEMON=/usr/bin/$NAME
CONF=/etc/mpd.conf
depend() {
@@ -23,7 +23,7 @@ get_pidfile() {
}
start() {
- checkconf || return 1
+ checkconfig || return 1
get_pidfile
ebegin "Starting ${NAME}"
start-stop-daemon --start --quiet \
diff --git a/testing/pjproject/APKBUILD b/testing/pjproject/APKBUILD
index 949693f4..363d7616 100644
--- a/testing/pjproject/APKBUILD
+++ b/testing/pjproject/APKBUILD
@@ -1,28 +1,38 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pjproject
-pkgver=1.0.1
+pkgver=1.4
pkgrel=0
pkgdesc="CLI Softphone"
url="http://www.pjsip.org/pjsua.htm"
license="GPL"
-depends="uclibc uclibc++ openssl pth"
-makedepends="uclibc++-dev openssl-dev autoconf binutils pth-dev"
+depends=
+makedepends="uclibc++-dev openssl-dev pth-dev"
install=
-subpackages="$pkgname-dev"
-source="http://www.pjsip.org/release/1.0.1/$pkgname-$pkgver.tar.bz2"
+subpackages="$pkgname-dev pjsua"
+source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
cd "$srcdir/$pkgname-$pkgver"
- export CXX=g++-uc
+ export CXX=${CXX_UC:-g++-uc}
- ./configure --prefix=/usr \
+ ./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+ --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info
make -j1 dep || return 1
make -j1 all || return 1
- make -j1 DESTDIR="$pkgdir" install
+ make -j1 DESTDIR="$pkgdir" prefix=/usr install
}
-md5sums="6462f2a636e5b14f50e92efc000924f0 pjproject-1.0.1.tar.bz2"
+pjsua() {
+ pkgdesc="pjsua is an open source command line SIP user agent (softphone)"
+ cd "$srcdir/$pkgname-$pkgver"/pjsip-apps/bin/
+ install -D -m755 pjsua-${CHOST:-i486-alpine-linux-uclibc} \
+ "$subpkgdir"/usr/bin/pjsua
+}
+
+
+md5sums="c5abd0d764d89788d817d449141e45a6 pjproject-1.4.tar.bz2"