[jabberd] update to 2.2.14 (#700390, CVE-2011-1755) remove unneeded upstart configuration files

[Dominic Hopf]

commit b71211ecfd60d72874d08cf8c68192cf76cf09a1
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Wed Jun 1 21:53:18 2011 +0200

    update to 2.2.14 (#700390, CVE-2011-1755)
    remove unneeded upstart configuration files

 .gitignore   |    1 +
 jabberd.spec |   12 ++++++++++--
 sources      |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 937bf12..5f6ff8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jabberd-2.2.13.tar.bz2
+/jabberd-2.2.14.tar.bz2
diff --git a/jabberd.spec b/jabberd.spec
index ae279a9..39fa69e 100644
--- a/jabberd.spec
+++ b/jabberd.spec
@@ -1,7 +1,7 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
-Version:        2.2.13
-Release:        3%{?dist}
+Version:        2.2.14
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 Source0:        http://ftp.xiaoka.com/jabberd2/releases/jabberd-%{version}.tar.bz2
@@ -110,6 +110,10 @@ sed -i -e "s,__BINDIR__,%{_bindir},g" \
 # remove static libraries
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
+# Remove Upstart configuration files, they are not needed for Fedora
+rm -f $RPM_BUILD_ROOT/etc/jabberd/*.conf
+rm -f $RPM_BUILD_ROOT/usr/etc/init/*.conf
+
 #default authentication backend
 #enable SSL certificate
 #clients must do STARTTLS
@@ -197,6 +201,10 @@ fi
 %attr(700, jabber, jabber) %{_var}/lib/%{name}
 
 %changelog
+* Wed Jun 01 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.14-1
+- update to 2.2.14 (#700390, CVE-2011-1755)
+- remove unneeded upstart configuration files
+
 * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 2.2.13-3
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 
diff --git a/sources b/sources
index 0fea004..3a48e97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-366419ad94089e86278352b6e01fdada  jabberd-2.2.13.tar.bz2
+e03edad18aebaa7292c422ef476cdd53  jabberd-2.2.14.tar.bz2