From 001730056fba3d32fd3d8c38176a1894a427ba4f7fdaa067f2a51528a03e9684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 9 Jul 2015 07:48:02 +0000
Subject: [PATCH] Accepting request 315638 from home:stroeder:branches:network

Update to upstream release 3.0.9, successfully tested on Tumbleweed x86_64 and armv6l (rasperry pi)

OBS-URL: https://build.opensuse.org/request/show/315638
OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=74
---
 freeradius-server-3.0.8.tar.bz2                   |   3 ---
 freeradius-server-3.0.8.tar.bz2.sig               | Bin 152 -> 0 bytes
 freeradius-server-3.0.9.tar.bz2                   |   3 +++
 freeradius-server-3.0.9.tar.bz2.sig               | Bin 0 -> 152 bytes
 ...radius-server-rlm_sql_unixodbc-configure.patch |  11 +++++++++++
 freeradius-server.changes                         |  10 ++++++++++
 freeradius-server.spec                            |   5 ++++-
 7 files changed, 28 insertions(+), 4 deletions(-)
 delete mode 100644 freeradius-server-3.0.8.tar.bz2
 delete mode 100644 freeradius-server-3.0.8.tar.bz2.sig
 create mode 100644 freeradius-server-3.0.9.tar.bz2
 create mode 100644 freeradius-server-3.0.9.tar.bz2.sig
 create mode 100644 freeradius-server-rlm_sql_unixodbc-configure.patch

diff --git a/freeradius-server-3.0.8.tar.bz2 b/freeradius-server-3.0.8.tar.bz2
deleted file mode 100644
index 68559d3..0000000
--- a/freeradius-server-3.0.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b89721c609e5a106936112fe8122e470f02a5197bb614e202d2c386f4821d902
-size 2945423
diff --git a/freeradius-server-3.0.8.tar.bz2.sig b/freeradius-server-3.0.8.tar.bz2.sig
deleted file mode 100644
index 258cde560a5f481cc70e1d37e8cdaedf0c72d3f3d937dabd53f6fdc8ece09760..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152
zcmV;J0B8S+0F?s;097~GyQwahi{t`HeE|aBV*~$F_K^?O_<(Ft0%WRg+_&fmpoLT=
zUFm6j5oS|`$pgwLC+6Hjz?md7<G-Y2PirekW2+()nV{E2=+<+%60cqWH55*8)6hJn
zt|lBo0U1uWhVXKogX-3$S1Wc&kM^(ht1k3SPS6Z^?g_)Cg;GR~(+W4>q}JgO7Md}h
G04&Rc7)F->

diff --git a/freeradius-server-3.0.9.tar.bz2 b/freeradius-server-3.0.9.tar.bz2
new file mode 100644
index 0000000..408005f
--- /dev/null
+++ b/freeradius-server-3.0.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:030d9bfe5ef42d0fd4be94a1fe03a60af9dff35b7ee89e50b0a73ff78606f7e9
+size 2977670
diff --git a/freeradius-server-3.0.9.tar.bz2.sig b/freeradius-server-3.0.9.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..eee28896f3872f8a8686d10e79a912f26e098030bb60900b3cad32a5273893a0
GIT binary patch
literal 152
zcmV;J0B8S+0F?s;09Bn;AE_>vi{t`HeE|YVgaiIO$TqmgoKUU#^~v?z(D8PC+Cf0;
zXvB#^suHn3mU~;F!j<Uv^jfsFhj2t+C1db{lS%umT2|Vbo_DRg)`+%Ml%3t)yMC^E
z)qMTk49P=D#T*6y*|DCZ<-xN`PXnFL0$M^s1Egg?Z_maw&5L}<fjXkksQSIe10Dfe
GF)3PBpich)

literal 0
HcmV?d00001

diff --git a/freeradius-server-rlm_sql_unixodbc-configure.patch b/freeradius-server-rlm_sql_unixodbc-configure.patch
new file mode 100644
index 0000000..5ebade9
--- /dev/null
+++ b/freeradius-server-rlm_sql_unixodbc-configure.patch
@@ -0,0 +1,11 @@
+--- freeradius-server-3.0.9-orig/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure	2015-07-08 22:43:41.921011659 +0200
++++ freeradius-server-3.0.9/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure	2015-07-08 22:45:58.874299508 +0200
+@@ -1843,7 +1843,7 @@
+ fi
+ 
+ 
+-		smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib"
++		smart_try_dir="$unixodbc_lib_dir"
+ 	ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/freeradius-server.changes b/freeradius-server.changes
index c4b3711..7921acd 100644
--- a/freeradius-server.changes
+++ b/freeradius-server.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jul  8 20:05:24 UTC 2015 - michael@stroeder.com
+
+- update to 3.0.9
+  * for a detailed list of changes look at:
+    /usr/share/doc/packages/freeradius-server/ChangeLog
+- freeradius-server-rlm_sql_unixodbc-configure.patch removes
+  hard-coded directory in configure script of rlm_sql_unixodbc
+- install new module rlm_sqlhpwippool.so
+
 -------------------------------------------------------------------
 Thu Apr 23 14:22:17 UTC 2015 - vcizek@suse.com
 
diff --git a/freeradius-server.spec b/freeradius-server.spec
index ddb026e..dd743e4 100644
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -20,7 +20,7 @@
 %define apxs2 apxs2-prefork
 %define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR)
 Name:           freeradius-server
-Version:        3.0.8
+Version:        3.0.9
 Release:        0
 Summary:        Very Highly Configurable Radius Server
 License:        GPL-2.0 and LGPL-2.1
@@ -34,6 +34,7 @@ Patch1:         freeradius-server-tmpfiles.patch
 Patch2:         freeradius-server-radiusd-logrotate.patch
 Patch3:         freeradius-server-rcradiusd.patch
 Patch4:         freeradius-server-fix-cert-bootstrap.patch
+Patch5:         freeradius-server-rlm_sql_unixodbc-configure.patch
 BuildRequires:  apache2-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel
@@ -190,6 +191,7 @@ This plugin provides the SQLite support for the FreeRADIUS server project.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -608,6 +610,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf
 %{_libdir}/freeradius/rlm_unpack.so
 %{_libdir}/freeradius/rlm_cache_memcached.so
 %{_libdir}/freeradius/rlm_cache_rbtree.so
+%{_libdir}/freeradius/rlm_sqlhpwippool.so
 
 %files utils
 %defattr(-,root,root)