diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-11 09:21:42 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-11 09:21:42 -0300 |
commit | 68bbd16e228ad453736f552dc2b15c3be76cd1db (patch) | |
tree | c7016052989d601ccbe8753d14b1380a44e480fd /community/ejabberd | |
parent | e99d7c51671fbbbc61348296a23ebc335c2693e9 (diff) | |
parent | b44e3e7f16abe5e4cb428571db65d300b7cc44be (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mingw32-pthreads/PKGBUILD
community/tesseract/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'community/ejabberd')
-rw-r--r-- | community/ejabberd/PKGBUILD | 13 | ||||
-rw-r--r-- | community/ejabberd/ejabberd | 2 | ||||
-rw-r--r-- | community/ejabberd/ejabberd.install | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 73968e57c..551c508e1 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73273 2012-07-05 09:07:14Z spupykin $ +# $Id: PKGBUILD 73545 2012-07-09 12:52:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -18,11 +18,10 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${ "$pkgname") md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' - '13c22f8f3b55e3933d531e652e4e7535') + '2338a6230ce5f9f60be6dddcfa39bc7e') build() { cd "$srcdir/$pkgname-$pkgver/src" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-pam --enable-odbc make @@ -30,14 +29,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver/src" - make DESTDIR="$pkgdir" install install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -d "$pkgdir/var/spool/$pkgname" install -d "$pkgdir/var/lib/$pkgname" - install -D -m0644 "$srcdir/$pkgname.logrotate" \ - "$pkgdir/etc/logrotate.d/$pkgname" - sed -i 's|SPOOLDIR=/var/lib/ejabberd|SPOOLDIR=/var/spool/ejabberd|' $pkgdir/usr/sbin/ejabberdctl + install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* rm -rf "$pkgdir/var/lock" } diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd index 259d4db66..c73be811c 100644 --- a/community/ejabberd/ejabberd +++ b/community/ejabberd/ejabberd @@ -23,7 +23,7 @@ case "$1" in [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid PID=`get_pid` if [ -z "$PID" ]; then - su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/spool/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"' + su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"' if [ $? -gt 0 ]; then stat_fail exit 1 diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install index 9d17a911e..6e586229d 100644 --- a/community/ejabberd/ejabberd.install +++ b/community/ejabberd/ejabberd.install @@ -2,7 +2,6 @@ post_install() { groupadd -r jabber useradd -r -G jabber -d /var/lib/ejabberd ejabberd chown -R ejabberd.jabber /var/log/ejabberd - chown -R ejabberd.jabber /var/spool/ejabberd chown -R ejabberd.jabber /var/lib/ejabberd chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd @@ -11,11 +10,11 @@ post_install() { post_upgrade() { chown -R ejabberd.jabber /var/log/ejabberd - chown -R ejabberd.jabber /var/spool/ejabberd chown -R ejabberd.jabber /var/lib/ejabberd chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam chmod 4750 /usr/lib/ejabberd/priv/bin/epam + echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now" } post_remove() { |