From: Fajar A. Nugraha <github@fajar.net>
Date: Fri, 10 Aug 2012 05:54:27 +0000 (+0700)
Subject: redhat:import debian/patches/dhcp_sqlippool-comment-out-mysql.diff
X-Git-Tag: release_2_2_0~75^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d56a50dafd3814d03b90019935a28f46d7f6b103;p=thirdparty%2Ffreeradius-server.git

redhat:import debian/patches/dhcp_sqlippool-comment-out-mysql.diff
---

diff --git a/redhat/freeradius-dhcp_sqlippool.patch b/redhat/freeradius-dhcp_sqlippool.patch
new file mode 100644
index 00000000000..d0d2143a106
--- /dev/null
+++ b/redhat/freeradius-dhcp_sqlippool.patch
@@ -0,0 +1,18 @@
+diff --git a/raddb/modules/dhcp_sqlippool b/raddb/modules/dhcp_sqlippool
+index 39358b2..2a29daf 100644
+--- a/raddb/modules/dhcp_sqlippool
++++ b/raddb/modules/dhcp_sqlippool
+@@ -14,8 +14,11 @@ sqlippool dhcp_sqlippool {
+ 	# Client's MAC address is mapped to Calling-Station-Id in policy.conf
+ 	pool-key = "%{Calling-Station-Id}"
+ 
+-	# For now, it only works with MySQL.
+-	$INCLUDE ${confdir}/sql/mysql/ippool-dhcp.conf
++	# For now, it only works with MySQL. 
++	# This line is commented by default to enable clean startup when you
++	# don't have freeradius-mysql installed. Uncomment this line if you 
++	# use this module.
++	#$INCLUDE ${confdir}/sql/mysql/ippool-dhcp.conf
+  
+ 	sqlippool_log_exists = "DHCP: Existing IP: %{reply:Framed-IP-Address} (did %{Called-Station-Id} cli %{Calling-Station-Id} port %{NAS-Port} user %{User-Name})"
+ 
diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index fbba78d4c1e..44f33916e6d 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -18,6 +18,7 @@ Patch2: freeradius-radtest.patch
 Patch5: freeradius-radeapclient-ipv6.patch
 Patch6: freeradius-postgres-sql.patch
 #Patch7: freeradius-perl.patch
+Patch8: freeradius-dhcp_sqlippool.patch
 
 Obsoletes: freeradius-devel
 Obsoletes: freeradius-libs
@@ -154,6 +155,7 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
 %patch5 -p1 -b radeapclient-ipv6
 %patch6 -p1 -b postgres-sql
 #%patch7 -p1 -b perl
+%patch8 -p1 -b dhcp_sqlippool
 
 # Some source files mistakenly have execute permissions set
 find $RPM_BUILD_DIR/freeradius-server-%{version} \( -name '*.c' -o -name '*.h' \) -a -perm /0111 -exec chmod a-x {} +