summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorErich Eckner2019-03-20 15:07:52 +0100
committerErich Eckner2019-03-20 15:09:13 +0100
commit7caa283d91ee99860ce32f25bb0a13ed14c81eb8 (patch)
tree008a6460296a68d3d8d61ae7cb3cbf2fa88f0e60
parentf13f15da84bd9dbdd4dba3e730e901c8dd5a3270 (diff)
downloadaur-7caa283d91ee99860ce32f25bb0a13ed14c81eb8.tar.gz
jabberd2 r1169.bc2d7ae-1 -> r1175.376e632-7
-rw-r--r--.SRCINFO45
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD30
3 files changed, 23 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74b958a60f7b..a9cf36a863a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,7 @@
-pkgbase = jabberd2
- pkgdesc = Scalable, architecturally sound, and extensible XMPP server
- pkgver = 2.6.1
- pkgrel = 1
- url = http://jabberd2.org/
- install = install
- arch = i686
- arch = x86_64
- arch = armv6h
- license = GPL
- makedepends = sqlite3
- makedepends = postgresql-libs
- makedepends = autoconf-archive
- depends = udns
- depends = expat
- depends = gsasl
- depends = libidn
- depends = openssl
- optdepends = sqlite3
- optdepends = postgresql-libs
- options = !libtool
- backup = etc/jabberd/c2s.xml
- backup = etc/jabberd/jabberd.cfg
- backup = etc/jabberd/router-filter.xml
- backup = etc/jabberd/router-users.xml
- backup = etc/jabberd/router.xml
- backup = etc/jabberd/s2s.xml
- backup = etc/jabberd/sm.xml
- backup = etc/jabberd/templates/roster.xml
- backup = etc/pam.d/jabberd
- source = https://github.com/jabberd2/jabberd2/releases/download/jabberd-2.6.1/jabberd-2.6.1.tar.xz
- source = https://patch-diff.githubusercontent.com/raw/jabberd2/jabberd2/pull/129.patch
- source = pam_jabberd
- sha512sums = 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea
- sha512sums = f3bdd2d35ca76e13532b890aff4d36d925f9832ffb300a70b637a6d68c6fa56761bdc67a1bc3befbfe3a3465ee4ca6f271d053df3e29f7a2708b7835c9d4dd00
- sha512sums = e6507a2a7e226398253623bb46db7ae853b01649b7ac00f3eee0a9b57c2ef0e8ac1f90c4934269f5fe2b7667e56572bed233b847d0b66a3fd37a88b7ed8adc31
-
-pkgname = jabberd2
-
pkgbase = jabberd2-git
pkgdesc = Scalable, architecturally sound, and extensible XMPP server
- pkgver = r1169.bc2d7ae
- pkgrel = 1
+ pkgver = r1175.376e632
+ pkgrel = 7
url = http://jabberd2.org/
install = install
arch = i686
@@ -67,7 +28,7 @@ pkgbase = jabberd2-git
backup = etc/jabberd/sm.xml
backup = etc/jabberd/templates/roster.xml
backup = etc/pam.d/jabberd
- source = git+https://github.com/jabberd2/jabberd2.git
+ source = jabberd2-git::git+https://github.com/jabberd2/jabberd2.git#commit=376e632
source = pam_jabberd
sha512sums = SKIP
sha512sums = e6507a2a7e226398253623bb46db7ae853b01649b7ac00f3eee0a9b57c2ef0e8ac1f90c4934269f5fe2b7667e56572bed233b847d0b66a3fd37a88b7ed8adc31
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..917d1df51179
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+jabberd2-git
+*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 7592f257f87a..2e4dc72c3007 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
# Contributor: Moritz Rudert (helios) <helios@planetcyborg.de>
# Contributer: Janusz Lewandowski <lew21@enves.pl>
# Contributor: ushi <ushi+arch@honkgong.info>
-# Maintainer: dequis <dx@dxzone.com.ar>
-# Maintainer: sxw <sxw@chronowerks.de>
+# Contributor: dequis <dx@dxzone.com.ar>
+# Contributor: sxw <sxw@chronowerks.de>
+# Maintainer: Erich Eckner <arch at eckner dot net>
pkgname=jabberd2-git
_pkgname=jabberd2
-pkgver=r1169.bc2d7ae
-pkgrel=1
+pkgver=r1175.376e632
+_commit=${pkgver#*.}
+pkgrel='7'
pkgdesc='Scalable, architecturally sound, and extensible XMPP server'
arch=('i686' 'x86_64' 'armv6h')
url='http://jabberd2.org/'
@@ -19,7 +21,7 @@ optdepends=('sqlite3' 'postgresql-libs')
makedepends=('sqlite3' 'postgresql-libs' 'autoconf-archive')
install=install
source=(
- "git+https://github.com/${_pkgname}/${_pkgname}.git"
+ "${pkgname}::git+https://github.com/${_pkgname}/${_pkgname}.git#commit=${_commit}"
'pam_jabberd'
)
sha512sums=('SKIP'
@@ -38,12 +40,15 @@ backup=(
)
pkgver() {
- cd "${srcdir}/${_pkgname}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ printf "r%s.%s" "$(
+ git -C "${srcdir}/${pkgname}" rev-list --count ${_commit}
+ )" "$(
+ git -C "${srcdir}/${pkgname}" rev-parse --short ${_commit}
+ )"
}
prepare() {
- cd "${srcdir}/${_pkgname}"
+ cd "${srcdir}/${pkgname}"
libtoolize --force
aclocal
autoheader
@@ -52,7 +57,7 @@ prepare() {
}
build() {
- cd "${srcdir}/${_pkgname}"
+ cd "${srcdir}/${pkgname}"
./configure \
--prefix=/usr \
@@ -62,13 +67,14 @@ build() {
--enable-pgsql \
--enable-pam \
--enable-pipe \
- --enable-anon
+ --enable-anon \
+ --enable-debug
make
}
package() {
- cd "${srcdir}/${_pkgname}"
+ cd "${srcdir}/${pkgname}"
make DESTDIR="${pkgdir}" install
@@ -78,7 +84,7 @@ package() {
install -d "${pkgdir}/usr/share/jabberd/"
install tools/{db-setup.*,pipe-auth.pl,jabberd-authpipe-pam-0.1.pl} "${pkgdir}/usr/share/jabberd/"
- chmod o= "${pkgdir}/etc/jabberd/"
+ chmod -R o= "${pkgdir}/etc/jabberd/"
rm -fr "${pkgdir}/usr/etc"
rm -f "${pkgdir}/etc/jabberd/"jabberd-*.conf