diff options
author | DX37 | 2018-09-10 11:57:12 +0700 |
---|---|---|
committer | DX37 | 2018-09-10 11:57:12 +0700 |
commit | 613713787250c48cd4ffd6a13f72ccf0503380d9 (patch) | |
tree | 62fe66ee5652232c86d83139af57b0612604c9ae | |
parent | ffc7dd155de3d767d5bcc3b336710013983fe347 (diff) | |
download | aur-613713787250c48cd4ffd6a13f72ccf0503380d9.tar.gz |
changes
- using sysusers for creating asterisk user/group
- using https instead of http for src download
- using bundled and patched pjproject
- using bundled systemd service and socket units
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 26 | ||||
-rw-r--r-- | asterisk.install | 13 | ||||
-rw-r--r-- | asterisk.service | 21 | ||||
-rw-r--r-- | asterisk.sysusers | 2 |
5 files changed, 25 insertions, 49 deletions
@@ -1,7 +1,7 @@ pkgbase = asterisk pkgdesc = A complete PBX solution pkgver = 15.6.0 - pkgrel = 1 + pkgrel = 2 url = http://www.asterisk.org install = asterisk.install arch = i686 @@ -20,8 +20,6 @@ pkgbase = asterisk depends = jansson depends = libxslt depends = opus - depends = termcap - depends = pjproject optdepends = lua51 optdepends = libsrtp optdepends = postgresql @@ -141,12 +139,12 @@ pkgbase = asterisk backup = etc/asterisk/voicemail.conf backup = etc/asterisk/vpb.conf backup = etc/asterisk/xmpp.conf - source = http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-15.6.0.tar.gz - source = asterisk.service + source = https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-15.6.0.tar.gz + source = asterisk.sysusers source = asterisk.logrotated source = asterisk.tmpfile - sha256sums = 885c587292a3424fbdb454869d66e648edfd4bea06e36c106bc3bdc4a8d27086 - sha256sums = 94acb6e68424195a12fd9d406b3fb586f264a550e75801f6e020a86e800dd42c + sha256sums = 6620af9749524152a793ecc4ade4604064254cb46e642d50d280d56f6b7eed3e + sha256sums = fc2e42f79e1672cc25b9b8ad2ba99616fbba0047641c986d30718655d0e7d4d8 sha256sums = caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e sha256sums = 673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a @@ -6,7 +6,7 @@ pkgname=asterisk pkgver=15.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A complete PBX solution" arch=('i686' 'x86_64' 'aarch64' 'armv7h') backup=('etc/asterisk/acl.conf' @@ -120,24 +120,22 @@ backup=('etc/asterisk/acl.conf' 'etc/asterisk/xmpp.conf') url='http://www.asterisk.org' license=('GPL') -depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl' 'libxml2' 'jansson' 'libxslt' 'opus' 'termcap' 'pjproject') +depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl' 'libxml2' 'jansson' 'libxslt' 'opus') makedepends=('sqlite3' 'gsm') optdepends=('lua51' 'libsrtp' 'postgresql' 'unixodbc' 'libpri' 'libss7' 'openr2' 'iksemel' 'radiusclient-ng' 'dahdi') -source=("http://downloads.asterisk.org/pub/telephony/asterisk/releases/${pkgname}-${pkgver}.tar.gz" - "${pkgname}.service" +install=${pkgname}.install +source=("https://downloads.asterisk.org/pub/telephony/asterisk/releases/${pkgname}-${pkgver}.tar.gz" + "${pkgname}.sysusers" "${pkgname}.logrotated" "${pkgname}.tmpfile") -install=${pkgname}.install sha256sums=('6620af9749524152a793ecc4ade4604064254cb46e642d50d280d56f6b7eed3e' - '94acb6e68424195a12fd9d406b3fb586f264a550e75801f6e020a86e800dd42c' + 'fc2e42f79e1672cc25b9b8ad2ba99616fbba0047641c986d30718655d0e7d4d8' 'caa24cfec5c6b4f8cea385269e39557362acad7e2a552994c3bc24080e3bdd4e' '673c0c55bce8068c297f9cdd389402c2d5d5a25e2cf84732cb071198bd6fa78a') build() { cd ${pkgname}-${pkgver} - #./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-libedit=internal - # ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --without-pjproject-bundled + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin make } @@ -153,7 +151,15 @@ package(){ mv ${pkgdir}/var/run ${pkgdir} + install -D -m 644 ${srcdir}/${pkgname}.sysusers ${pkgdir}/usr/lib/sysusers.d/asterisk.conf install -D -m 644 ${srcdir}/${pkgname}.logrotated ${pkgdir}/etc/logrotate.d/asterisk - install -D -m 644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/asterisk.service install -D -m 644 ${srcdir}/${pkgname}.tmpfile ${pkgdir}/usr/lib/tmpfiles.d/asterisk.conf + + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk.service ${pkgdir}/usr/lib/systemd/system/asterisk.service + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk.socket ${pkgdir}/usr/lib/systemd/system/asterisk.socket + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk-ami.socket ${pkgdir}/usr/lib/systemd/system/asterisk-ami.socket + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk-amis.socket ${pkgdir}/usr/lib/systemd/system/asterisk-amis.socket + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk-cli.socket ${pkgdir}/usr/lib/systemd/system/asterisk-cli.socket + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk-http.socket ${pkgdir}/usr/lib/systemd/system/asterisk-http.socket + install -D -m 644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/asterisk-https.socket ${pkgdir}/usr/lib/systemd/system/asterisk-https.socket } diff --git a/asterisk.install b/asterisk.install index 84cc01d87344..8812f7278542 100644 --- a/asterisk.install +++ b/asterisk.install @@ -1,19 +1,10 @@ post_install() { - groupadd -r asterisk - useradd -MNr -s /bin/false -d /run/asterisk -g asterisk asterisk && passwd -l asterisk &>/dev/null - post_upgrade } -post_remove() { - killall -q asterisk - userdel asterisk &>/dev/null - groupdel asterisk &>/dev/null -} - post_upgrade() { - chown -R asterisk:asterisk /etc/asterisk - chown -R asterisk:asterisk /var/lib/asterisk + chown -R asterisk:asterisk /etc/asterisk + chown -R asterisk:asterisk /var/lib/asterisk chown -R asterisk:asterisk /var/log/asterisk chown -R asterisk:asterisk /run/asterisk chown -R asterisk:asterisk /var/spool/asterisk diff --git a/asterisk.service b/asterisk.service deleted file mode 100644 index 284477f2bcae..000000000000 --- a/asterisk.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Asterisk PBX and telephony daemon -Documentation=man:asterisk(8) -Wants=network.target -After=network.target - -[Service] -Type=simple -User=asterisk -Group=asterisk -ExecStart=/usr/bin/asterisk -f -C /etc/asterisk/asterisk.conf -ExecStop=/usr/bin/asterisk -rx 'core stop now' -ExecReload=/usr/bin/asterisk -rx 'core reload' - -# safe_asterisk emulation -Restart=on-failure -RestartSec=10 -RestartPreventExitStatus=0 - -[Install] -WantedBy=multi-user.target diff --git a/asterisk.sysusers b/asterisk.sysusers new file mode 100644 index 000000000000..a41884d97cfb --- /dev/null +++ b/asterisk.sysusers @@ -0,0 +1,2 @@ +g asterisk /usr/bin/asterisk +u asterisk /usr/bin/asterisk "Asterisk PBX and telephony" /run/asterisk |