From 08cdd2800aa2b7b27c468c7f7c7b83593744dfc0b23eb765131475dc84d69412 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 1 Oct 2013 00:01:46 +0000
Subject: [PATCH] atheme-7.0.6

OBS-URL: https://build.opensuse.org/package/show/server:irc/atheme?expand=0&rev=49
---
 ...esolve-compile-warning-in-servtree.c.patch | 35 +++++++++++++++++++
 atheme-services-7.0.5.tar.bz2                 |  3 --
 atheme-services-7.0.6.tar.bz2                 |  3 ++
 atheme.changes                                |  8 +++++
 atheme.spec                                   |  7 ++--
 5 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 0001-build-resolve-compile-warning-in-servtree.c.patch
 delete mode 100644 atheme-services-7.0.5.tar.bz2
 create mode 100644 atheme-services-7.0.6.tar.bz2

diff --git a/0001-build-resolve-compile-warning-in-servtree.c.patch b/0001-build-resolve-compile-warning-in-servtree.c.patch
new file mode 100644
index 0000000..62e84c9
--- /dev/null
+++ b/0001-build-resolve-compile-warning-in-servtree.c.patch
@@ -0,0 +1,35 @@
+From be48e415d9937014c4eac4d957ceb3bcc09b406d Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 1 Oct 2013 01:56:13 +0200
+Subject: [PATCH] build: resolve compile warning in servtree.c
+
+rpmlint is holding up the red flag in atheme 7.0.6
+
+I: Program returns random data in a function
+E: atheme no-return-in-nonvoid-function servtree.c:405
+
+gcc had to say:
+servtree.c:405:1: warning: control reaches end of non-void
+function [-Wreturn-type]
+
+The function added in commit f6fcaaa760913fb242cf0d330178a0078d458861
+lacks a return call for the potential case of exiting the loop.
+---
+ libathemecore/servtree.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libathemecore/servtree.c b/libathemecore/servtree.c
+index cc57bee..a4e205b 100644
+--- a/libathemecore/servtree.c
++++ b/libathemecore/servtree.c
+@@ -402,6 +402,7 @@ service_t *service_find_any(void)
+ 
+ 	MOWGLI_PATRICIA_FOREACH(sptr, &state, services_name)
+ 		return sptr;
++	return NULL;
+ }
+ 
+ service_t *service_find(const char *name)
+-- 
+1.8.2
+
diff --git a/atheme-services-7.0.5.tar.bz2 b/atheme-services-7.0.5.tar.bz2
deleted file mode 100644
index 74714bd..0000000
--- a/atheme-services-7.0.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25271eb1e9218ceeec87824dbe90a2bfc59f116e258b6ee803573dfa8c4fcc30
-size 1062605
diff --git a/atheme-services-7.0.6.tar.bz2 b/atheme-services-7.0.6.tar.bz2
new file mode 100644
index 0000000..1d3b6ba
--- /dev/null
+++ b/atheme-services-7.0.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:314fd708dc63145e9db10c5a2ed5afebf16b398d617a633c5e80d003039afdeb
+size 1086070
diff --git a/atheme.changes b/atheme.changes
index d99ce55..275cf59 100644
--- a/atheme.changes
+++ b/atheme.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Sep 30 23:51:08 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 7.0.6
+* chanfix: Restrict registering scored channels
+* memoserv/delete: Only accept numeric indexes
+- Add 0001-build-resolve-compile-warning-in-servtree.c.patch
+
 -------------------------------------------------------------------
 Wed Nov 21 00:00:07 UTC 2012 - jengelh@inai.de
 
diff --git a/atheme.spec b/atheme.spec
index 5213778..1221ea5 100644
--- a/atheme.spec
+++ b/atheme.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package atheme
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 Name:           atheme
 %define pkg_name atheme-services
 %define lname	libathemecore1
-Version:        7.0.5
+Version:        7.0.6
 Release:        0
 Url:            http://atheme.net/
 Summary:        A portable, secure set of open source, modular IRC services
@@ -34,6 +34,7 @@ Source3:        atheme-tmpfiles.conf
 Patch1:         atheme-lockmodes.diff
 Patch2:         atheme-config.diff
 Patch3:         atheme-nodate.diff
+Patch4:         0001-build-resolve-compile-warning-in-servtree.c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cracklib-devel
 BuildRequires:  fdupes
@@ -80,7 +81,7 @@ in %lname.
 
 %prep
 %setup -qn %name-services-%version
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 # use system libmowgli
 rm -Rf libmowgli*;