[jabberd] updated to 2.2.17

Adrian Reber adrian at fedoraproject.org
Mon Aug 27 11:42:50 UTC 2012


commit a51075fd3c9c42df4a8913074f47ed36eb829b49
Author: Adrian Reber <adrian at lisas.de>
Date:   Mon Aug 27 13:42:42 2012 +0200

    updated to 2.2.17
    
    - removed all three patches which are now included

 .gitignore   |    1 +
 jabberd.spec |   19 +++++++------------
 sources      |    2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 187c430..a606f05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /jabberd-2.2.13.tar.bz2
 /jabberd-2.2.14.tar.bz2
 /jabberd-2.2.16.tar.gz
+/jabberd-2.2.17.tar.xz
diff --git a/jabberd.spec b/jabberd.spec
index 6d1d17c..01f7806 100644
--- a/jabberd.spec
+++ b/jabberd.spec
@@ -1,21 +1,15 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
-Version:        2.2.16
-Release:        5%{?dist}
+Version:        2.2.17
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
-Source0:        https://github.com/downloads/Jabberd2/jabberd2/jabberd-%{version}.tar.gz
+Source0:        https://github.com/downloads/Jabberd2/jabberd2/jabberd-%{version}.tar.xz
 Source1:        jabberd.service
 Source2:        jabberd-c2s.service
 Source3:        jabberd-s2s.service
 Source4:        jabberd-sm.service
 Source5:        jabberd-router.service
-Patch0:         https://github.com/Jabberd2/jabberd2/commit/41884d9919.patch
-# https://github.com/Jabberd2/jabberd2/pull/5
-Patch1:         https://github.com/Jabberd2/jabberd2/commit/d452eec68b342977cd9fc6863c2e1aee1b99feb3.patch
-# http://xmpp.org/resources/security-notices/server-dialback/
-# Vulnerability in XMPP Server Dialback Implementations
-Patch2:		https://github.com/Jabberd2/jabberd2/commit/aabcffae560d5fd00cd1d2ffce5d760353cf0a4d.patch
 URL:            http://codex.xiaoka.com/wiki/jabberd2:start
 BuildRequires:  openssl-devel libidn-devel expat-devel
 BuildRequires:  systemd-units cppunit-devel
@@ -48,9 +42,6 @@ This package defaults to use pam and sqlite.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 export CFLAGS="%{optflags}"
@@ -211,6 +202,10 @@ fi
 %attr(700, jabber, jabber) %{_var}/lib/%{name}
 
 %changelog
+* Mon Aug 27 2012 Adrian Reber <adrian at lisas.de> - 2.2.17-1
+- updated to 2.2.17
+- removed all three patches which are now included
+
 * Wed Aug 22 2012 Adrian Reber <adrian at lisas.de> - 2.2.16-5
 - included patch for "Vulnerability in XMPP Server Dialback Implementations"
   http://xmpp.org/resources/security-notices/server-dialback/
diff --git a/sources b/sources
index fd51dba..35ce75c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f76684548fc746fce48c4c19ae2765e4  jabberd-2.2.16.tar.gz
+8b7d654deaa6566e58ab6630112f9b10  jabberd-2.2.17.tar.xz


More information about the scm-commits mailing list