jabberd2-git -> jabberd2 (submodule)

6 files changed, 3 insertions, 116 deletions

diff --git a/.gitmodules b/.gitmodules
index 1fde6ac5d..01799e6e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "python-ipympl"]
 	path = python-ipympl
 	url = ssh://aur@aur.archlinux.org/python-ipympl.git
+[submodule "jabberd2"]
+	path = jabberd2
+	url = ssh://aur@aur.archlinux.org/jabberd2.git
diff --git a/jabberd2 b/jabberd2
new file mode 160000
+Subproject a8561ebb4d507bb07cfde25768c72eca0bb04ca
diff --git a/jabberd2-git/.gitignore b/jabberd2-git/.gitignore
deleted file mode 100644
index 917d1df51..000000000
--- a/jabberd2-git/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-jabberd2-git
-*.pkg.tar.xz
diff --git a/jabberd2-git/PKGBUILD b/jabberd2-git/PKGBUILD
deleted file mode 100644
index 31894129c..000000000
--- a/jabberd2-git/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Moritz Rudert (helios) <helios@planetcyborg.de>
-# Contributer: Janusz Lewandowski <lew21@enves.pl>
-# Contributor: ushi <ushi+arch@honkgong.info>
-# Contributor: dequis <dx@dxzone.com.ar>
-# Contributor: sxw <sxw@chronowerks.de>
-# Maintainer: Erich Eckner <arch at eckner dot net>
-
-pkgname=jabberd2-git
-pkgver=r1175.376e632
-_commit=${pkgver#*.}
-pkgrel=14
-pkgdesc='Scalable, architecturally sound, and extensible XMPP server'
-arch=('i686' 'pentium4' 'x86_64' 'armv6h')
-url='http://jabberd2.org/'
-license=('GPL')
-options=('!libtool')
-depends=('udns' 'expat' 'gsasl' 'libidn' 'openssl')
-optdepends=('sqlite3' 'postgresql-libs')
-makedepends=('sqlite3' 'postgresql-libs' 'autoconf-archive')
-install=install
-source=(
-  "${pkgname}::git+https://github.com/${pkgname%-git}/${pkgname%-git}.git#commit=${_commit}"
-  'pam_jabberd'
-)
-sha512sums=('SKIP'
-            'e6507a2a7e226398253623bb46db7ae853b01649b7ac00f3eee0a9b57c2ef0e8ac1f90c4934269f5fe2b7667e56572bed233b847d0b66a3fd37a88b7ed8adc31')
-
-backup=(
-  'etc/jabberd/c2s.xml'
-  'etc/jabberd/jabberd.cfg'
-  'etc/jabberd/router-filter.xml'
-  'etc/jabberd/router-users.xml'
-  'etc/jabberd/router.xml'
-  'etc/jabberd/s2s.xml'
-  'etc/jabberd/sm.xml'
-  'etc/jabberd/templates/roster.xml'
-  'etc/pam.d/jabberd'
-)
-
-pkgver() {
-  printf "r%s.%s" "$(
-    git -C "${srcdir}/${pkgname}" rev-list --count ${_commit}
-  )" "$(
-    git -C "${srcdir}/${pkgname}" rev-parse --short ${_commit}
-  )"
-}
-
-prepare() {
-  cd "${srcdir}/${pkgname}"
-  libtoolize --force
-  aclocal
-  autoheader
-  automake --add-missing --force-missing
-  autoconf
-}
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib \
-    --sysconfdir=/etc/jabberd \
-    --enable-sqlite \
-    --enable-pgsql \
-    --enable-pam \
-    --enable-pipe \
-    --enable-anon \
-    --enable-debug
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/pam.d/"
-  install ../pam_jabberd "${pkgdir}/etc/pam.d/jabberd"
-
-  install -d "${pkgdir}/usr/share/jabberd/"
-  install tools/{db-setup.*,pipe-auth.pl,jabberd-authpipe-pam-0.1.pl} "${pkgdir}/usr/share/jabberd/"
-
-  chmod -R o= "${pkgdir}/etc/jabberd/"
-
-  rm -fr "${pkgdir}/usr/etc"
-  rm -f "${pkgdir}/etc/jabberd/"jabberd-*.conf
-  rm -f "${pkgdir}/etc/jabberd/"{,templates/}*.dist
-}
diff --git a/jabberd2-git/install b/jabberd2-git/install
deleted file mode 100644
index e4771c681..000000000
--- a/jabberd2-git/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group jabber &>/dev/null || groupadd -r jabber >/dev/null
-	getent passwd jabber &>/dev/null || useradd -r -g jabber -d /etc/jabberd -s /bin/false -c jabber jabber >/dev/null
-	mkdir -p /var/lib/jabberd/{db,log,pid}
-	[ -f /var/lib/jabberd/db/sqlite.db ] || sqlite3 /var/lib/jabberd/db/sqlite.db < /usr/share/jabberd/db-setup.sqlite
-	chown -R jabber:jabber /var/lib/jabberd
-	chown -R root:jabber /etc/jabberd
-	cat <<EOF
-==> Customize the configuration files in /etc/jabberd/.
-==> For details, see: https://github.com/jabberd2/jabberd2/wiki/InstallGuide
-EOF
-}
-
-pre_remove() {
-	systemctl stop jabberd.service
-}
-
-post_remove() {
-	getent passwd jabber &>/dev/null && userdel jabber >/dev/null
-	getent group jabber &>/dev/null && groupdel jabber >/dev/null
-}
diff --git a/jabberd2-git/pam_jabberd b/jabberd2-git/pam_jabberd
deleted file mode 100644
index fed9b451e..000000000
--- a/jabberd2-git/pam_jabberd
+++ /dev/null
@@ -1,2 +0,0 @@
-auth       required     pam_unix.so
-account    required     pam_unix.so