summaryrefslogtreecommitdiff
path: root/community/jabberd14
diff options
context:
space:
mode:
Diffstat (limited to 'community/jabberd14')
-rw-r--r--community/jabberd14/PKGBUILD34
-rw-r--r--community/jabberd14/build-fix.patch84
-rw-r--r--community/jabberd14/jabberd58
3 files changed, 0 insertions, 176 deletions
diff --git a/community/jabberd14/PKGBUILD b/community/jabberd14/PKGBUILD
deleted file mode 100644
index 5fdb75f88..000000000
--- a/community/jabberd14/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 64996 2012-02-19 13:18:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=jabberd14
-pkgver=1.6.1.1
-pkgrel=11
-pkgdesc="old (1.4) jabber server branch"
-arch=(i686 x86_64)
-url="http://jabberd.org/"
-license=("GPL")
-depends=(pth libidn expat popt gnutls)
-optdepends=(libmysqlclient)
-conflicts=(jabberd)
-backup=(etc/jabberd/jabber.xml)
-options=('!libtool')
-source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz
- build-fix.patch
- jabberd)
-md5sums=('597c7ee14518ba22b1cee883b4737d87'
- 'ad795626f26c01700a23515e0e75d654'
- '5869169394d70977858320648075c7a6')
-
-build() {
- cd $srcdir/jabberd14-$pkgver
- export LDFLAGS="$LDFLAGS -lgcrypt"
- [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var
- echo "#undef HAVE_GNUTLS_EXTRA" >>config.h
- [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch
- make -j1
- make DESTDIR=$pkgdir install
- install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd
- rm -rf $pkgdir/var/run
-}
diff --git a/community/jabberd14/build-fix.patch b/community/jabberd14/build-fix.patch
deleted file mode 100644
index 4f39b523e..000000000
--- a/community/jabberd14/build-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc
---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2011-08-09 00:37:29.000000000 +0400
-+++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2007-04-07 23:43:18.000000000 +0400
-@@ -910,8 +910,8 @@
- }
-
- /* separate this step from the next one, and check for a predicate in this step */
-- start_predicate = strchr((char*)path, '[');
-- next_step = strchr((char*)path, '/');
-+ start_predicate = strchr(path, '[');
-+ next_step = strchr(path, '/');
- if (start_predicate == NULL && next_step == NULL) {
- this_step = pstrdup(p, path);
- } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) {
-@@ -1833,8 +1833,7 @@
- if (lang != NULL && strchr(lang, '-') != NULL) {
- snprintf(general_lang, sizeof(general_lang), "%s", lang);
- if (strchr(lang, '-') != NULL) {
-- char *tmp = strchr((char*)lang, '-');
-- tmp[0] = 0;
-+ strchr(lang, '-')[0] = 0;
- } else {
- general_lang[0] = 0;
- }
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc
---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc 2011-08-09 00:37:29.000000000 +0400
-+++ jabberd14-1.6.1.1/jabberd/log.cc 2007-07-20 17:56:59.000000000 +0400
-@@ -86,7 +86,7 @@
- char *pos, c = '\0';
- if(zone != NULL && debug__zones != NULL)
- {
-- pos = strchr((char*)zone,'.');
-+ pos = strchr(zone,'.');
- if(pos != NULL)
- {
- c = *pos;
-diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc
---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc 2011-08-09 00:53:55.000000000 +0400
-+++ jabberd14-1.6.1.1/jabberd/mio_tls.cc 2007-07-17 03:20:44.000000000 +0400
-@@ -43,7 +43,6 @@
- #include <vector>
- #include <list>
- #include <iostream>
--#include <gnutls/openpgp.h>
-
- // Tell gcrypt that we are using libpth - had to move this to a plain C file
- extern "C" void mio_tls_gcrypt_init(void);
-@@ -613,8 +612,7 @@
- }
-
- // load OpenPGP key/certificate
--// ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
-- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
-+ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
- if (ret < 0) {
- log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
- continue;
-@@ -633,8 +631,7 @@
- }
-
- // load the OpenPGP keyring
--// ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
-- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
-+ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
- if (ret < 0) {
- log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
- continue;
-@@ -643,8 +640,6 @@
- continue;
- }
-
--
--/*
- // load GnuPG trustdb
- if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) {
- char const *const file = xmlnode_get_data(cur);
-@@ -661,7 +656,6 @@
- continue;
- }
- }
--*/
-
- // setup protocols to use
- if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
diff --git a/community/jabberd14/jabberd b/community/jabberd14/jabberd
deleted file mode 100644
index afbe6ef69..000000000
--- a/community/jabberd14/jabberd
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
- pidof /usr/bin/jabberd
-}
-
-case "$1" in
- start)
- stat_busy "Starting Jabber daemon"
-
- [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd
- [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid
- PID=`get_pid`
- if [ -z "$PID" ]; then
- /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- sleep 1 # wait on children
- echo `get_pid` > /var/run/jabberd/jabberd.pid
- add_daemon jabberd
- sleep 1
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Jabber daemon"
- PID=`get_pid`
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- sleep 2
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/jabberd/jabberd.pid &> /dev/null
- rm_daemon jabberd
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0