diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2014-04-24 06:48:23 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2014-04-24 06:48:39 +0000 |
| commit | d709a7ab82cf411de9aadb4d1dab18a7c85c9903 (patch) | |
| tree | 7859c08a89dc6e489e7d1bc3d1569dbed5911b1f /testing/prosody | |
| parent | 67e922f01a0a41f4211d5f07d186d4cd27e09b5a (diff) | |
| download | aports-d709a7ab82cf411de9aadb4d1dab18a7c85c9903.tar.bz2 aports-d709a7ab82cf411de9aadb4d1dab18a7c85c9903.tar.xz | |
testing/prosody: security upgrade to 0.9.4 (CVE-2014-2744, CVE-2014-2745)
Diffstat (limited to 'testing/prosody')
| -rw-r--r-- | testing/prosody/APKBUILD | 26 | ||||
| -rw-r--r-- | testing/prosody/prosody.post-install | 6 | ||||
| -rw-r--r-- | testing/prosody/prosody.pre-install | 9 |
3 files changed, 19 insertions, 22 deletions
diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD index 10915084f0..39ed4794d5 100644 --- a/testing/prosody/APKBUILD +++ b/testing/prosody/APKBUILD @@ -1,28 +1,35 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=prosody -pkgver=0.9.1 -pkgrel=1 +pkgver=0.9.4 +pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" arch="all" license="MIT" depends="lua-socket lua-expat lua-filesystem lua-sec" makedepends="lua-dev libidn-dev openssl-dev" -install="prosody.pre-install prosody.post-install" +install="prosody.pre-install" subpackages="" +pkgusers="prosody" +pkggroups="prosody" source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz $pkgname.cfg.lua.patch $pkgname.initd " +_builddir="$srcdir/$pkgname-$pkgver" + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc/prosody \ --with-lua=/usr/bin \ --with-lua-lib=/usr/lib \ --with-lua-include=/usr/include + + #Don't generate cert + rm "$_builddir"/certs/Makefile make || return 1 } @@ -31,20 +38,21 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -d "$pkgdir/var/log/prosody" || return 1 - install -d "$pkgdir/var/run/prosody" || return 1 + install -d -o prosody -g prosody "$pkgdir/var/log/prosody" || return 1 + install -d -o prosody -g prosody "$pkgdir/var/run/prosody" || return 1 + install -d -o prosody -g prosody "$pkgdir/var/lib/prosody" || return 1 patch "$pkgdir/etc/prosody/prosody.cfg.lua" "$srcdir/prosody.cfg.lua.patch" || return 1 install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="e6e25eec2208409214c3a45366adc1a5 prosody-0.9.1.tar.gz +md5sums="94f9a613c834c276352ac5b142fb72e0 prosody-0.9.4.tar.gz a21d6a6efef8a08ae21109c2aa9c2fc7 prosody.cfg.lua.patch 9b68b81deb2148a3a6c3b5d2eb9c96b9 prosody.initd" -sha256sums="6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5 prosody-0.9.1.tar.gz +sha256sums="be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6 prosody-0.9.4.tar.gz db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da prosody.cfg.lua.patch 0db9babd65354fe8693d1233945da61ebbea525915f881cf601211110ea50b08 prosody.initd" -sha512sums="dbd0d8476f0abb4030f8c1ac68786cde2dd68bc2e6602ba8ea27b7d23f2010f963dd3ff50e0a6e7780bddfba014c7bbd1fa0c607d070d979131c15431e04c3fa prosody-0.9.1.tar.gz +sha512sums="9bba454caf50ed590dc18febd1a739f35e850805ac19e9a2e822ce3b39306a4f6d67162a49b11baa7e4f575b19e954dfd91f984780a724f6e0c69202947ca94c prosody-0.9.4.tar.gz 6de138346c10388e986e26b6caae75291c6c19bf168ccb9daef2ac08a9d4cd1d5cfa74438e89316303ba2956a25eec8b3db23ced9fa2763cf9d8387116677001 prosody.cfg.lua.patch 95f46dde7e066a93429c46a8ac42698af3754ebe0ed89c7dc86fad042d68264695f4270ecc5a9dabec2b5c2f989928e50b0556ccbcc513ff73ddbb5e01b47dfe prosody.initd" diff --git a/testing/prosody/prosody.post-install b/testing/prosody/prosody.post-install deleted file mode 100644 index 2f8f69cdd8..0000000000 --- a/testing/prosody/prosody.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -chown prosody:prosody var/lib/prosody -chown prosody:prosody var/log/prosody -chown prosody:prosody var/run/prosody - diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install index db63efa179..066b2c3c28 100644 --- a/testing/prosody/prosody.pre-install +++ b/testing/prosody/prosody.pre-install @@ -1,9 +1,4 @@ #!/bin/sh - -user=prosody -home=/var/lib/prosody -adduser -h $home -s /bin/false -D $user 2>/dev/null -mkdir -p $home -chown $user:$user $home +addgroup prosody +adduser -h /var/lib/prosody -s /bin/false -D prosody 2>/dev/null exit 0 - |