[arch-commits] Commit in ejabberd/repos (22 files)
Sergej Pupykin
spupykin at archlinux.org
Tue Nov 3 17:20:10 UTC 2015
Date: Tuesday, November 3, 2015 @ 18:20:09
Author: spupykin
Revision: 145853
archrelease: copy trunk to community-x86_64, community-i686
Added:
ejabberd/repos/community-i686/PKGBUILD
(from rev 145852, ejabberd/trunk/PKGBUILD)
ejabberd/repos/community-i686/deps-build-fix.patch
(from rev 145852, ejabberd/trunk/deps-build-fix.patch)
ejabberd/repos/community-i686/ejabberd.install
(from rev 145852, ejabberd/trunk/ejabberd.install)
ejabberd/repos/community-i686/ejabberd.logrotate
(from rev 145852, ejabberd/trunk/ejabberd.logrotate)
ejabberd/repos/community-i686/ejabberd.service
(from rev 145852, ejabberd/trunk/ejabberd.service)
ejabberd/repos/community-i686/sysuser.conf
(from rev 145852, ejabberd/trunk/sysuser.conf)
ejabberd/repos/community-x86_64/PKGBUILD
(from rev 145852, ejabberd/trunk/PKGBUILD)
ejabberd/repos/community-x86_64/deps-build-fix.patch
(from rev 145852, ejabberd/trunk/deps-build-fix.patch)
ejabberd/repos/community-x86_64/ejabberd.install
(from rev 145852, ejabberd/trunk/ejabberd.install)
ejabberd/repos/community-x86_64/ejabberd.logrotate
(from rev 145852, ejabberd/trunk/ejabberd.logrotate)
ejabberd/repos/community-x86_64/ejabberd.service
(from rev 145852, ejabberd/trunk/ejabberd.service)
ejabberd/repos/community-x86_64/sysuser.conf
(from rev 145852, ejabberd/trunk/sysuser.conf)
Deleted:
ejabberd/repos/community-i686/PKGBUILD
ejabberd/repos/community-i686/ejabberd.install
ejabberd/repos/community-i686/ejabberd.logrotate
ejabberd/repos/community-i686/ejabberd.service
ejabberd/repos/community-i686/sysuser.conf
ejabberd/repos/community-x86_64/PKGBUILD
ejabberd/repos/community-x86_64/ejabberd.install
ejabberd/repos/community-x86_64/ejabberd.logrotate
ejabberd/repos/community-x86_64/ejabberd.service
ejabberd/repos/community-x86_64/sysuser.conf
---------------------------------------+
/PKGBUILD | 282 ++++++++++++++++++++++++++++++++
/ejabberd.install | 42 ++++
/ejabberd.logrotate | 24 ++
/ejabberd.service | 28 +++
/sysuser.conf | 6
community-i686/PKGBUILD | 139 ---------------
community-i686/deps-build-fix.patch | 57 ++++++
community-i686/ejabberd.install | 21 --
community-i686/ejabberd.logrotate | 12 -
community-i686/ejabberd.service | 14 -
community-i686/sysuser.conf | 3
community-x86_64/PKGBUILD | 139 ---------------
community-x86_64/deps-build-fix.patch | 57 ++++++
community-x86_64/ejabberd.install | 21 --
community-x86_64/ejabberd.logrotate | 12 -
community-x86_64/ejabberd.service | 14 -
community-x86_64/sysuser.conf | 3
17 files changed, 496 insertions(+), 378 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-i686/PKGBUILD 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,139 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ejabberd
-pkgver=15.04
-pkgrel=2
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc'
- 'libyaml' 'sqlite')
-makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
-backup=('etc/ejabberd/ejabberd.yml'
- 'etc/ejabberd/ejabberdctl.cfg'
- 'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
- 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
- "p1_cache_tab::git://github.com/processone/cache_tab#commit=cca096330ce39e8b56fe0e0c478df1ff452e7751"
- "p1_tls::git://github.com/processone/tls#commit=e231cbde546c2e2200f6dae01d13cf743d253c6d"
- "p1_stringprep::git://github.com/processone/stringprep#commit=3c640237a3a7831dc39de6a6d329d3a9af25c579"
- "p1_xml::git://github.com/processone/xml#commit=3db0b2f2b96c9fa2f601f96794cc6e8a480615b4"
- "p1_yaml::git://github.com/processone/p1_yaml#commit=e1f081e1bbf34c35fc60c1b988d62a07fbead3e8"
- "git://github.com/rds13/xmlrpc"
- "p1_pam::git://github.com/processone/epam"
- "p1_zlib::git://github.com/processone/zlib"
- "git://github.com/basho/lager"
- "p1_iconv::git://github.com/processone/eiconv"
- "git://github.com/DeadZen/goldrush.git#tag=0.1.6"
- "p1_mysql::git://github.com/processone/mysql.git"
- "p1_pgsql::git://github.com/processone/pgsql.git"
- "p1_stun::git://github.com/processone/stun#commit=d98c71e22492bd5cf95f6a3227de302ace0f70b3"
- "git://github.com/davisp/jiffy"
- "git://github.com/cmullaparthi/ibrowse"
- "git://github.com/esl/lhttpc"
- "git://github.com/eproxus/meck#tag=0.8.2"
- "esip::git://github.com/processone/p1_sip#commit=a9b725df78ee44c0f118908eef07395654767d62"
- "git://github.com/basho/riak_pb#tag=1.4.4.0"
- "riakc::git://github.com/basho/riak-erlang-client#tag=1.4.2"
- "protobuffs::git://github.com/basho/erlang_protobuffs.git"
- "git://github.com/processone/p1_utils#commit=1bf99f9c8daed3b03f76e2714ca102c520c88b26"
- "ehyperloglog::git://github.com/vaxelfel/eHyperLogLog.git#commit=efd14f262c663cde76d8ed48007826dabe9aca41"
- "rebar_elixir_plugin::git://github.com/yrashk/rebar_elixir_plugin"
- "elixir::git://github.com/elixir-lang/elixir#branch=v1.0"
- "git://github.com/wooga/eredis"
- "sqlite3::git://github.com/alexeyr/erlang-sqlite3"
- "$pkgname.logrotate"
- "ejabberd.service"
- "sysuser.conf")
-md5sums=('f9d047866033ee6af04de7dcd25a33ab'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'f97c8a96160f30e0aecc9526c12e6606'
- 'a437aff9d7d477fb036d527205617e18'
- '458fc41be4adb9554a53b8f9ae05fbee')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- 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 \
- p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc \
- meck esip riak_pb riakc p1_utils protobuffs \
- ehyperloglog rebar_elixir_plugin elixir eredis \
- sqlite3; do
- rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
- mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
- done
-
- 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() {
- cd "$srcdir/$pkgname-$pkgver"
- [ -x configure ] || ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-all
- make debug=true
- make -C doc
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # make install workaround
- rm -f deps/sqlite3/include/sqlite3.hrl
-
- 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/"*
- mkdir -p $pkgdir/usr/bin
- mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
- chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
- rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
- install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
- install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
- # workaround
- ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
- rm -f $pkgdir/usr/bin/{elixir,iex,mix}
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-i686/PKGBUILD (from rev 145852, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,141 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+#
+# cd deps ; ls -1 | while read g; do (test -d $g && cd $g && sh ../t.sh); done >qwe
+#
+# U=`grep 'url =' .git/config | cut -f2 -d= | tr -d ' '`
+# C=`git rev-parse HEAD`
+# N=`basename $(pwd)`
+# echo -e "\t\"$N::$U#commit=$C\""
+#
+
+pkgname=ejabberd
+pkgver=15.10
+pkgrel=1
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc'
+ 'libyaml' 'sqlite')
+makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
+backup=('etc/ejabberd/ejabberd.yml'
+ 'etc/ejabberd/ejabberdctl.cfg'
+ 'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
+ 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+ "elixir::git://github.com/elixir-lang/elixir#commit=1d9548fd285d243721b7eba71912bde2ffd1f6c3"
+ "eredis::git://github.com/wooga/eredis#commit=bf12ecb30253c84a2331f4f0d93fd68856fcb9f4"
+ "esip::git://github.com/processone/p1_sip#commit=d662d3fe7f6288b444ea321d854de0bd6d40e022"
+ "goldrush::git://github.com/DeadZen/goldrush.git#commit=64864ba7fcf40988361340e48680b49a2c2938cf"
+ "jiffy::git://github.com/davisp/jiffy#commit=cfc61a2e952dc3182e0f9b1473467563699992e2"
+ "lager::git://github.com/basho/lager#commit=4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3"
+ "meck::git://github.com/eproxus/meck#commit=0845277398b8326f9dddddd9fc3cf73467ba6877"
+ "oauth2::git://github.com/prefiks/oauth2.git#commit=e6da9912e5d8f658e7e868f41a102d085bdbef59"
+ "p1_cache_tab::git://github.com/processone/cache_tab#commit=f7ea12b0ba962a3d2f9a406d2954cf7de4e27230"
+ "p1_iconv::git://github.com/processone/eiconv#commit=8b7542b1aaf0a851f335e464956956985af6d9a2"
+ "p1_mysql::git://github.com/processone/mysql#commit=dfa87da95f8fdb92e270741c2a53f796b682f918"
+ "p1_pam::git://github.com/processone/epam#commit=d3ce290b7da75d780a03e86e7a8198a80e9826a6"
+ "p1_pgsql::git://github.com/processone/pgsql#commit=e72c03c60bfcb56bbb5d259342021d9cb3581dac"
+ "p1_stringprep::git://github.com/processone/stringprep#commit=3c640237a3a7831dc39de6a6d329d3a9af25c579"
+ "p1_stun::git://github.com/processone/stun#commit=061bdae484268cbf0457ad4797e74b8516df3ad1"
+ "p1_tls::git://github.com/processone/tls#commit=e56321afd974e9da33da913cd31beebc8e73e75f"
+ "p1_utils::git://github.com/processone/p1_utils#commit=d7800881e6702723ce58b7646b60c9e4cd25d563"
+ "p1_xml::git://github.com/processone/xml#commit=1c8b016b0ac7986efb823baf1682a43565449e65"
+ "p1_yaml::git://github.com/processone/p1_yaml#commit=79f756ba73a235c4d3836ec07b5f7f2b55f49638"
+ "p1_zlib::git://github.com/processone/zlib#commit=e3d4222b7aae616d7ef2e7e2fa0bbf451516c602"
+ "protobuffs::git://github.com/basho/erlang_protobuffs.git#commit=ec7e99f57f5bbcd91c56242091485d41bc78c3d4"
+ "rebar_elixir_plugin::git://github.com/yrashk/rebar_elixir_plugin#commit=7058379b7c7e017555647f6b9cecfd87cd50f884"
+ "riakc::git://github.com/basho/riak-erlang-client#commit=8d33c020f4ca392200b2d0d973c77dd48164b263"
+ "riak_pb::git://github.com/basho/riak_pb#commit=0353be3e04b971ac802acbd6b78d74589db2f6df"
+ "sqlite3::git://github.com/alexeyr/erlang-sqlite3#commit=8350dc603804c503f99c92bfd2eab1dd6885758e"
+ "xmlrpc::git://github.com/rds13/xmlrpc.git#commit=42e6e96a0fe7106830274feed915125feb1056f3"
+ "$pkgname.logrotate"
+ "ejabberd.service"
+ "sysuser.conf"
+ "deps-build-fix.patch")
+md5sums=('0033e3b8fa8ab5d341893cecb6818cd5'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ 'a437aff9d7d477fb036d527205617e18'
+ '458fc41be4adb9554a53b8f9ae05fbee'
+ '9ac450a7b81bbef95990aaa2365587fb')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+ for i in elixir eredis esip goldrush jiffy lager meck oauth2 p1_cache_tab \
+ p1_iconv p1_mysql p1_pam p1_pgsql p1_stringprep p1_stun p1_tls p1_utils \
+ p1_xml p1_yaml p1_zlib protobuffs rebar_elixir_plugin riakc riak_pb \
+ sqlite3 xmlrpc; do
+ rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+ mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+ done
+
+ (cd deps && patch -p1 <$srcdir/deps-build-fix.patch)
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ [ -x configure ] || ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --enable-all
+ make
+# make -C doc
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # make install workaround
+ rm -f deps/sqlite3/include/sqlite3.hrl
+
+ 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/"*
+ mkdir -p $pkgdir/usr/bin
+ mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+ chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+ rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
+ install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+ install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
+ # workaround
+ ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
+ rm -f $pkgdir/usr/bin/{elixir,iex,mix}
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-i686/deps-build-fix.patch (from rev 145852, ejabberd/trunk/deps-build-fix.patch)
===================================================================
--- community-i686/deps-build-fix.patch (rev 0)
+++ community-i686/deps-build-fix.patch 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,57 @@
+diff --git a/riakc/src/riakc_obj.erl b/riakc/src/riakc_obj.erl
+index 8086533..c95fdcf 100644
+--- a/riakc/src/riakc_obj.erl
++++ b/riakc/src/riakc_obj.erl
+@@ -79,7 +79,7 @@
+ -type key() :: binary() | 'undefined'. %% A key name
+ -type id() :: {bucket(), key()}.
+ -type vclock() :: binary(). %% An opaque vector clock
+--type metadata() :: dict(). %% Value metadata
++-type metadata() :: dict:dict(). %% Value metadata
+ -type content_type() :: string(). %% The media type of a value
+ -type value() :: binary(). %% An opaque value
+ -type contents() :: [{metadata(), value()}]. %% All metadata/value pairs in a `riakc_obj'.
+@@ -103,7 +103,7 @@
+ key :: key(),
+ vclock :: vclock(),
+ contents :: contents(),
+- updatemetadata :: dict(),
++ updatemetadata :: dict:dict(),
+ updatevalue :: value()
+ }).
+
+@@ -284,7 +284,7 @@ get_update_value(#riakc_obj{updatevalue=UV}=Object) ->
+ end.
+
+ %% @doc Return the content type from metadata
+--spec md_ctype(dict()) -> undefined | content_type().
++-spec md_ctype(dict:dict()) -> undefined | content_type().
+ md_ctype(MetaData) ->
+ case dict:find(?MD_CTYPE, MetaData) of
+ error ->
+diff --git a/riakc/src/riakc_pb_socket.erl b/riakc/src/riakc_pb_socket.erl
+index 77d27eb..4eb043f 100644
+--- a/riakc/src/riakc_pb_socket.erl
++++ b/riakc/src/riakc_pb_socket.erl
+@@ -117,7 +117,7 @@
+ queue_if_disconnected = false :: boolean(), % if true, add requests to queue if disconnected
+ sock :: port(), % gen_tcp socket
+ active :: #request{} | undefined, % active request
+- queue :: queue() | undefined, % queue of pending requests
++ queue :: queue:queue() | undefined, % queue of pending requests
+ connects=0 :: non_neg_integer(), % number of successful connects
+ failed=[] :: [connection_failure()], % breakdown of failed connects
+ connect_timeout=infinity :: timeout(), % timeout of TCP connection
+diff --git a/riak_pb/src/riak_pb_kv_codec.erl b/riak_pb/src/riak_pb_kv_codec.erl
+index c95fde6..0bcab88 100644
+--- a/riak_pb/src/riak_pb_kv_codec.erl
++++ b/riak_pb/src/riak_pb_kv_codec.erl
+@@ -49,7 +49,7 @@
+
+ -type symbolic_quorum() :: one | quorum | all | default.
+ -type value() :: binary().
+--type metadata() :: dict().
++-type metadata() :: dict:dict().
+ -type contents() :: [{metadata(), value()}].
+
+ %% @doc Convert a list of object {MetaData,Value} pairs to protocol
Deleted: community-i686/ejabberd.install
===================================================================
--- community-i686/ejabberd.install 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-i686/ejabberd.install 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,21 +0,0 @@
-post_install() {
- systemd-sysusers ejabberd.conf
- 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 \
- usr/lib/ejabberd/priv/bin/epam
- echo "!!! it is major update. Config must be converted to yaml format."
-}
Copied: ejabberd/repos/community-i686/ejabberd.install (from rev 145852, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-i686/ejabberd.install (rev 0)
+++ community-i686/ejabberd.install 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,21 @@
+post_install() {
+ systemd-sysusers ejabberd.conf
+ 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 \
+ usr/lib/ejabberd/priv/bin/epam
+ echo "!!! it is major update. Config must be converted to yaml format."
+}
Deleted: community-i686/ejabberd.logrotate
===================================================================
--- community-i686/ejabberd.logrotate 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-i686/ejabberd.logrotate 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
- weekly
- missingok
- rotate 10
- compress
- delaycompress
- ifempty
- nomail
- sharedscripts
- postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
- endscript
-}
Copied: ejabberd/repos/community-i686/ejabberd.logrotate (from rev 145852, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-i686/ejabberd.logrotate (rev 0)
+++ community-i686/ejabberd.logrotate 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ sharedscripts
+ postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+ endscript
+}
Deleted: community-i686/ejabberd.service
===================================================================
--- community-i686/ejabberd.service 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-i686/ejabberd.service 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,14 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/ejabberdctl start
-ExecStop=/usr/bin/ejabberdctl stop
-
-[Install]
-WantedBy=multi-user.target
Copied: ejabberd/repos/community-i686/ejabberd.service (from rev 145852, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-i686/ejabberd.service (rev 0)
+++ community-i686/ejabberd.service 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/sysuser.conf
===================================================================
--- community-i686/sysuser.conf 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-i686/sysuser.conf 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,3 +0,0 @@
-g jabber 17 - -
-u ejabberd - - /var/lib/ejabberd
-m ejabberd jabber
Copied: ejabberd/repos/community-i686/sysuser.conf (from rev 145852, ejabberd/trunk/sysuser.conf)
===================================================================
--- community-i686/sysuser.conf (rev 0)
+++ community-i686/sysuser.conf 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,3 @@
+g jabber 17 - -
+u ejabberd - - /var/lib/ejabberd
+m ejabberd jabber
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-x86_64/PKGBUILD 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,139 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-
-pkgname=ejabberd
-pkgver=15.04
-pkgrel=2
-pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
-url="http://www.ejabberd.im/"
-license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc'
- 'libyaml' 'sqlite')
-makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
-backup=('etc/ejabberd/ejabberd.yml'
- 'etc/ejabberd/ejabberdctl.cfg'
- 'etc/logrotate.d/ejabberd')
-install=$pkgname.install
-replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
- 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
- "p1_cache_tab::git://github.com/processone/cache_tab#commit=cca096330ce39e8b56fe0e0c478df1ff452e7751"
- "p1_tls::git://github.com/processone/tls#commit=e231cbde546c2e2200f6dae01d13cf743d253c6d"
- "p1_stringprep::git://github.com/processone/stringprep#commit=3c640237a3a7831dc39de6a6d329d3a9af25c579"
- "p1_xml::git://github.com/processone/xml#commit=3db0b2f2b96c9fa2f601f96794cc6e8a480615b4"
- "p1_yaml::git://github.com/processone/p1_yaml#commit=e1f081e1bbf34c35fc60c1b988d62a07fbead3e8"
- "git://github.com/rds13/xmlrpc"
- "p1_pam::git://github.com/processone/epam"
- "p1_zlib::git://github.com/processone/zlib"
- "git://github.com/basho/lager"
- "p1_iconv::git://github.com/processone/eiconv"
- "git://github.com/DeadZen/goldrush.git#tag=0.1.6"
- "p1_mysql::git://github.com/processone/mysql.git"
- "p1_pgsql::git://github.com/processone/pgsql.git"
- "p1_stun::git://github.com/processone/stun#commit=d98c71e22492bd5cf95f6a3227de302ace0f70b3"
- "git://github.com/davisp/jiffy"
- "git://github.com/cmullaparthi/ibrowse"
- "git://github.com/esl/lhttpc"
- "git://github.com/eproxus/meck#tag=0.8.2"
- "esip::git://github.com/processone/p1_sip#commit=a9b725df78ee44c0f118908eef07395654767d62"
- "git://github.com/basho/riak_pb#tag=1.4.4.0"
- "riakc::git://github.com/basho/riak-erlang-client#tag=1.4.2"
- "protobuffs::git://github.com/basho/erlang_protobuffs.git"
- "git://github.com/processone/p1_utils#commit=1bf99f9c8daed3b03f76e2714ca102c520c88b26"
- "ehyperloglog::git://github.com/vaxelfel/eHyperLogLog.git#commit=efd14f262c663cde76d8ed48007826dabe9aca41"
- "rebar_elixir_plugin::git://github.com/yrashk/rebar_elixir_plugin"
- "elixir::git://github.com/elixir-lang/elixir#branch=v1.0"
- "git://github.com/wooga/eredis"
- "sqlite3::git://github.com/alexeyr/erlang-sqlite3"
- "$pkgname.logrotate"
- "ejabberd.service"
- "sysuser.conf")
-md5sums=('f9d047866033ee6af04de7dcd25a33ab'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'f97c8a96160f30e0aecc9526c12e6606'
- 'a437aff9d7d477fb036d527205617e18'
- '458fc41be4adb9554a53b8f9ae05fbee')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- 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 \
- p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc \
- meck esip riak_pb riakc p1_utils protobuffs \
- ehyperloglog rebar_elixir_plugin elixir eredis \
- sqlite3; do
- rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
- mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
- done
-
- 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() {
- cd "$srcdir/$pkgname-$pkgver"
- [ -x configure ] || ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-all
- make debug=true
- make -C doc
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # make install workaround
- rm -f deps/sqlite3/include/sqlite3.hrl
-
- 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/"*
- mkdir -p $pkgdir/usr/bin
- mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
- chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
- rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
- install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
- install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
- # workaround
- ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
- rm -f $pkgdir/usr/bin/{elixir,iex,mix}
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-x86_64/PKGBUILD (from rev 145852, ejabberd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,141 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+
+#
+# cd deps ; ls -1 | while read g; do (test -d $g && cd $g && sh ../t.sh); done >qwe
+#
+# U=`grep 'url =' .git/config | cut -f2 -d= | tr -d ' '`
+# C=`git rev-parse HEAD`
+# N=`basename $(pwd)`
+# echo -e "\t\"$N::$U#commit=$C\""
+#
+
+pkgname=ejabberd
+pkgver=15.10
+pkgrel=1
+pkgdesc="Jabber server written in Erlang"
+arch=('x86_64' 'i686')
+url="http://www.ejabberd.im/"
+license=("GPL")
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc'
+ 'libyaml' 'sqlite')
+makedepends=('git' 'rebar' 'hevea' 'texlive-bin' 'texlive-core' 'texlive-latexextra')
+backup=('etc/ejabberd/ejabberd.yml'
+ 'etc/ejabberd/ejabberdctl.cfg'
+ 'etc/logrotate.d/ejabberd')
+install=$pkgname.install
+replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
+ 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+ "elixir::git://github.com/elixir-lang/elixir#commit=1d9548fd285d243721b7eba71912bde2ffd1f6c3"
+ "eredis::git://github.com/wooga/eredis#commit=bf12ecb30253c84a2331f4f0d93fd68856fcb9f4"
+ "esip::git://github.com/processone/p1_sip#commit=d662d3fe7f6288b444ea321d854de0bd6d40e022"
+ "goldrush::git://github.com/DeadZen/goldrush.git#commit=64864ba7fcf40988361340e48680b49a2c2938cf"
+ "jiffy::git://github.com/davisp/jiffy#commit=cfc61a2e952dc3182e0f9b1473467563699992e2"
+ "lager::git://github.com/basho/lager#commit=4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3"
+ "meck::git://github.com/eproxus/meck#commit=0845277398b8326f9dddddd9fc3cf73467ba6877"
+ "oauth2::git://github.com/prefiks/oauth2.git#commit=e6da9912e5d8f658e7e868f41a102d085bdbef59"
+ "p1_cache_tab::git://github.com/processone/cache_tab#commit=f7ea12b0ba962a3d2f9a406d2954cf7de4e27230"
+ "p1_iconv::git://github.com/processone/eiconv#commit=8b7542b1aaf0a851f335e464956956985af6d9a2"
+ "p1_mysql::git://github.com/processone/mysql#commit=dfa87da95f8fdb92e270741c2a53f796b682f918"
+ "p1_pam::git://github.com/processone/epam#commit=d3ce290b7da75d780a03e86e7a8198a80e9826a6"
+ "p1_pgsql::git://github.com/processone/pgsql#commit=e72c03c60bfcb56bbb5d259342021d9cb3581dac"
+ "p1_stringprep::git://github.com/processone/stringprep#commit=3c640237a3a7831dc39de6a6d329d3a9af25c579"
+ "p1_stun::git://github.com/processone/stun#commit=061bdae484268cbf0457ad4797e74b8516df3ad1"
+ "p1_tls::git://github.com/processone/tls#commit=e56321afd974e9da33da913cd31beebc8e73e75f"
+ "p1_utils::git://github.com/processone/p1_utils#commit=d7800881e6702723ce58b7646b60c9e4cd25d563"
+ "p1_xml::git://github.com/processone/xml#commit=1c8b016b0ac7986efb823baf1682a43565449e65"
+ "p1_yaml::git://github.com/processone/p1_yaml#commit=79f756ba73a235c4d3836ec07b5f7f2b55f49638"
+ "p1_zlib::git://github.com/processone/zlib#commit=e3d4222b7aae616d7ef2e7e2fa0bbf451516c602"
+ "protobuffs::git://github.com/basho/erlang_protobuffs.git#commit=ec7e99f57f5bbcd91c56242091485d41bc78c3d4"
+ "rebar_elixir_plugin::git://github.com/yrashk/rebar_elixir_plugin#commit=7058379b7c7e017555647f6b9cecfd87cd50f884"
+ "riakc::git://github.com/basho/riak-erlang-client#commit=8d33c020f4ca392200b2d0d973c77dd48164b263"
+ "riak_pb::git://github.com/basho/riak_pb#commit=0353be3e04b971ac802acbd6b78d74589db2f6df"
+ "sqlite3::git://github.com/alexeyr/erlang-sqlite3#commit=8350dc603804c503f99c92bfd2eab1dd6885758e"
+ "xmlrpc::git://github.com/rds13/xmlrpc.git#commit=42e6e96a0fe7106830274feed915125feb1056f3"
+ "$pkgname.logrotate"
+ "ejabberd.service"
+ "sysuser.conf"
+ "deps-build-fix.patch")
+md5sums=('0033e3b8fa8ab5d341893cecb6818cd5'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'f97c8a96160f30e0aecc9526c12e6606'
+ 'a437aff9d7d477fb036d527205617e18'
+ '458fc41be4adb9554a53b8f9ae05fbee'
+ '9ac450a7b81bbef95990aaa2365587fb')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+ for i in elixir eredis esip goldrush jiffy lager meck oauth2 p1_cache_tab \
+ p1_iconv p1_mysql p1_pam p1_pgsql p1_stringprep p1_stun p1_tls p1_utils \
+ p1_xml p1_yaml p1_zlib protobuffs rebar_elixir_plugin riakc riak_pb \
+ sqlite3 xmlrpc; do
+ rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+ mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+ done
+
+ (cd deps && patch -p1 <$srcdir/deps-build-fix.patch)
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ [ -x configure ] || ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --enable-all
+ make
+# make -C doc
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # make install workaround
+ rm -f deps/sqlite3/include/sqlite3.hrl
+
+ 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/"*
+ mkdir -p $pkgdir/usr/bin
+ mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl
+ chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
+ rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
+ install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+ install -Dm644 $srcdir/sysuser.conf "$pkgdir"/usr/lib/sysusers.d/ejabberd.conf
+ # workaround
+ ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
+ rm -f $pkgdir/usr/bin/{elixir,iex,mix}
+}
+
+# vim:set ts=2 sw=2 et:
Copied: ejabberd/repos/community-x86_64/deps-build-fix.patch (from rev 145852, ejabberd/trunk/deps-build-fix.patch)
===================================================================
--- community-x86_64/deps-build-fix.patch (rev 0)
+++ community-x86_64/deps-build-fix.patch 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,57 @@
+diff --git a/riakc/src/riakc_obj.erl b/riakc/src/riakc_obj.erl
+index 8086533..c95fdcf 100644
+--- a/riakc/src/riakc_obj.erl
++++ b/riakc/src/riakc_obj.erl
+@@ -79,7 +79,7 @@
+ -type key() :: binary() | 'undefined'. %% A key name
+ -type id() :: {bucket(), key()}.
+ -type vclock() :: binary(). %% An opaque vector clock
+--type metadata() :: dict(). %% Value metadata
++-type metadata() :: dict:dict(). %% Value metadata
+ -type content_type() :: string(). %% The media type of a value
+ -type value() :: binary(). %% An opaque value
+ -type contents() :: [{metadata(), value()}]. %% All metadata/value pairs in a `riakc_obj'.
+@@ -103,7 +103,7 @@
+ key :: key(),
+ vclock :: vclock(),
+ contents :: contents(),
+- updatemetadata :: dict(),
++ updatemetadata :: dict:dict(),
+ updatevalue :: value()
+ }).
+
+@@ -284,7 +284,7 @@ get_update_value(#riakc_obj{updatevalue=UV}=Object) ->
+ end.
+
+ %% @doc Return the content type from metadata
+--spec md_ctype(dict()) -> undefined | content_type().
++-spec md_ctype(dict:dict()) -> undefined | content_type().
+ md_ctype(MetaData) ->
+ case dict:find(?MD_CTYPE, MetaData) of
+ error ->
+diff --git a/riakc/src/riakc_pb_socket.erl b/riakc/src/riakc_pb_socket.erl
+index 77d27eb..4eb043f 100644
+--- a/riakc/src/riakc_pb_socket.erl
++++ b/riakc/src/riakc_pb_socket.erl
+@@ -117,7 +117,7 @@
+ queue_if_disconnected = false :: boolean(), % if true, add requests to queue if disconnected
+ sock :: port(), % gen_tcp socket
+ active :: #request{} | undefined, % active request
+- queue :: queue() | undefined, % queue of pending requests
++ queue :: queue:queue() | undefined, % queue of pending requests
+ connects=0 :: non_neg_integer(), % number of successful connects
+ failed=[] :: [connection_failure()], % breakdown of failed connects
+ connect_timeout=infinity :: timeout(), % timeout of TCP connection
+diff --git a/riak_pb/src/riak_pb_kv_codec.erl b/riak_pb/src/riak_pb_kv_codec.erl
+index c95fde6..0bcab88 100644
+--- a/riak_pb/src/riak_pb_kv_codec.erl
++++ b/riak_pb/src/riak_pb_kv_codec.erl
+@@ -49,7 +49,7 @@
+
+ -type symbolic_quorum() :: one | quorum | all | default.
+ -type value() :: binary().
+--type metadata() :: dict().
++-type metadata() :: dict:dict().
+ -type contents() :: [{metadata(), value()}].
+
+ %% @doc Convert a list of object {MetaData,Value} pairs to protocol
Deleted: community-x86_64/ejabberd.install
===================================================================
--- community-x86_64/ejabberd.install 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-x86_64/ejabberd.install 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,21 +0,0 @@
-post_install() {
- systemd-sysusers ejabberd.conf
- 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 \
- usr/lib/ejabberd/priv/bin/epam
- echo "!!! it is major update. Config must be converted to yaml format."
-}
Copied: ejabberd/repos/community-x86_64/ejabberd.install (from rev 145852, ejabberd/trunk/ejabberd.install)
===================================================================
--- community-x86_64/ejabberd.install (rev 0)
+++ community-x86_64/ejabberd.install 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,21 @@
+post_install() {
+ systemd-sysusers ejabberd.conf
+ 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 \
+ usr/lib/ejabberd/priv/bin/epam
+ echo "!!! it is major update. Config must be converted to yaml format."
+}
Deleted: community-x86_64/ejabberd.logrotate
===================================================================
--- community-x86_64/ejabberd.logrotate 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-x86_64/ejabberd.logrotate 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,12 +0,0 @@
-/var/log/ejabberd/ejabberd.log {
- weekly
- missingok
- rotate 10
- compress
- delaycompress
- ifempty
- nomail
- sharedscripts
- postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
- endscript
-}
Copied: ejabberd/repos/community-x86_64/ejabberd.logrotate (from rev 145852, ejabberd/trunk/ejabberd.logrotate)
===================================================================
--- community-x86_64/ejabberd.logrotate (rev 0)
+++ community-x86_64/ejabberd.logrotate 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,12 @@
+/var/log/ejabberd/ejabberd.log {
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ sharedscripts
+ postrotate ejabberdctl --node ejabberd reopen-log > /dev/null
+ endscript
+}
Deleted: community-x86_64/ejabberd.service
===================================================================
--- community-x86_64/ejabberd.service 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-x86_64/ejabberd.service 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,14 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=forking
-User=ejabberd
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/bin/ejabberdctl start
-ExecStop=/usr/bin/ejabberdctl stop
-
-[Install]
-WantedBy=multi-user.target
Copied: ejabberd/repos/community-x86_64/ejabberd.service (from rev 145852, ejabberd/trunk/ejabberd.service)
===================================================================
--- community-x86_64/ejabberd.service (rev 0)
+++ community-x86_64/ejabberd.service 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,14 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=forking
+User=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/sysuser.conf
===================================================================
--- community-x86_64/sysuser.conf 2015-11-03 17:03:47 UTC (rev 145852)
+++ community-x86_64/sysuser.conf 2015-11-03 17:20:09 UTC (rev 145853)
@@ -1,3 +0,0 @@
-g jabber 17 - -
-u ejabberd - - /var/lib/ejabberd
-m ejabberd jabber
Copied: ejabberd/repos/community-x86_64/sysuser.conf (from rev 145852, ejabberd/trunk/sysuser.conf)
===================================================================
--- community-x86_64/sysuser.conf (rev 0)
+++ community-x86_64/sysuser.conf 2015-11-03 17:20:09 UTC (rev 145853)
@@ -0,0 +1,3 @@
+g jabber 17 - -
+u ejabberd - - /var/lib/ejabberd
+m ejabberd jabber
More information about the arch-commits
mailing list