[arch-commits] Commit in ejabberd/trunk (PKGBUILD ejabberd.install)

[Sergej Pupykin]

    Date: Friday, May 16, 2014 @ 18:35:05
  Author: spupykin
Revision: 111329

upgpkg: ejabberd 14.05-1

upd

Modified:
  ejabberd/trunk/PKGBUILD
  ejabberd/trunk/ejabberd.install

------------------+
 PKGBUILD         |   28 ++++++++++------------------
 ejabberd.install |   20 ++++++++++++++------
 2 files changed, 24 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-16 16:27:04 UTC (rev 111328)
+++ PKGBUILD	2014-05-16 16:35:05 UTC (rev 111329)
@@ -4,8 +4,8 @@
 # Contributor: Alexander Rødseth <rodseth at gmail.com>
 
 pkgname=ejabberd
-pkgver=13.12
-pkgrel=2
+pkgver=14.05
+pkgrel=1
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686')
 url="http://www.ejabberd.im/"
@@ -37,11 +37,8 @@
 	"git://github.com/cmullaparthi/ibrowse"
 	"git://github.com/esl/lhttpc"
 	"$pkgname.logrotate"
-	"ejabberd.service"
-	"crash-fix.patch"
-	"https://github.com/processone/ejabberd/commit/7af7b7d3f0c4bf399fb7db54c38090c8d1a25873.patch"
-	"https://github.com/processone/ejabberd/commit/d97b4fd9ca36858a12bc5e6841334cde4c8f0431.patch")
-md5sums=('6eadb6f190d55c8a679de5496ca0c4a9'
+	"ejabberd.service")
+md5sums=('16bffbf9b9e18b69133e983fd82364b6'
          'SKIP'
          'SKIP'
          'SKIP'
@@ -60,20 +57,11 @@
          'SKIP'
          'SKIP'
          'f97c8a96160f30e0aecc9526c12e6606'
-         'a437aff9d7d477fb036d527205617e18'
-         'ef3dd667dec1627c1597c7f6f3cfcd4a'
-         'aa8cf60e39b0deee112e20f305022ade'
-         '5f2cada6c6504f1e3874ef33606751c8')
+         'a437aff9d7d477fb036d527205617e18')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 <$srcdir/crash-fix.patch
-
-  # erlang 17 fix
-  patch -p1 <$srcdir/d97b4fd9ca36858a12bc5e6841334cde4c8f0431.patch
-  patch -p1 <$srcdir/7af7b7d3f0c4bf399fb7db54c38090c8d1a25873.patch
-
   mkdir -p "$srcdir/$pkgname-$pkgver/deps"
   for i in goldrush lager p1_cache_tab p1_iconv p1_pam \
            p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \
@@ -82,7 +70,10 @@
     mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
   done
 
-  sed -i 's|%%% @author.*|%%% @author Oscar Hellstrom <oscar at hellstrom.st>|g' deps/lhttpc/src/lhttpc.app.src
+  pushd deps/lhttpc/src/
+  mv lhttpc.app.src lhttpc.app.src.bak
+  cat lhttpc.app.src.bak | iconv -f utf8 -c >lhttpc.app.src
+  popd
 }
 
 build() {
@@ -95,6 +86,7 @@
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+  install -Dm04750 deps/p1_pam/priv/bin/epam $pkgdir/usr/lib/ejabberd/priv/bin/epam
   install -d "$pkgdir/var/lib/$pkgname"
   install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
   chmod ug+r "$pkgdir/etc/$pkgname/"*

Modified: ejabberd.install
===================================================================
--- ejabberd.install	2014-05-16 16:27:04 UTC (rev 111328)
+++ ejabberd.install	2014-05-16 16:35:05 UTC (rev 111329)
@@ -1,15 +1,23 @@
 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/lib/ejabberd
-  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  chown -R ejabberd.jabber var/log/ejabberd
+  chown -R ejabberd.jabber var/lib/ejabberd
+  chown root:ejabberd \
+    etc/ejabberd/ejabberd.yml \
+    etc/ejabberd/ejabberdctl.cfg \
+    etc/ejabberd \
+    usr/lib/ejabberd/priv/bin/epam
 }
 
 post_upgrade() {
-  chown -R ejabberd.jabber /var/log/ejabberd
-  chown -R ejabberd.jabber /var/lib/ejabberd
-  chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+  chown -R ejabberd.jabber var/log/ejabberd
+  chown -R ejabberd.jabber var/lib/ejabberd
+  chown root:ejabberd \
+    etc/ejabberd/ejabberd.yml \
+    etc/ejabberd/ejabberdctl.cfg \
+    etc/ejabberd \
+    usr/lib/ejabberd/priv/bin/epam
   echo "!!! it is major update. Config must be converted to yaml format."
 }