rpms/freeradius
7
0
Fork 0
Code Issues Pull Requests Releases Activity

resolves: bug#876564 - fails to start without freeradius-mysql

Browse Source
This commit is contained in:
John Dennis 2012-12-10 16:00:01 -05:00
parent 3a2d4bb605
commit 30eb81d451
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freeradius-dhcp_sqlippool.patch Normal file
View File

@ -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})"

7
freeradius.spec
View File

@ -1,7 +1,7 @@
Summary: High-performance and highly configurable free RADIUS server Summary: High-performance and highly configurable free RADIUS server
Name: freeradius Name: freeradius
Version: 2.2.0 Version: 2.2.0
Release: 0%{?dist} Release: 1%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.freeradius.org/ URL: http://www.freeradius.org/
@ -16,6 +16,7 @@ Patch1: freeradius-cert-config.patch
Patch2: freeradius-radtest.patch Patch2: freeradius-radtest.patch
Patch3: freeradius-radeapclient-ipv6.patch Patch3: freeradius-radeapclient-ipv6.patch
Patch4: freeradius-exclude-config-file.patch Patch4: freeradius-exclude-config-file.patch
Patch5: freeradius-dhcp_sqlippool.patch
Obsoletes: freeradius-devel Obsoletes: freeradius-devel
Obsoletes: freeradius-libs Obsoletes: freeradius-libs
@ -151,6 +152,7 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
%patch2 -p1 -b .radtest %patch2 -p1 -b .radtest
%patch3 -p1 -b radeapclient-ipv6 %patch3 -p1 -b radeapclient-ipv6
%patch4 -p1 -b exclude-config-file %patch4 -p1 -b exclude-config-file
%patch5 -p1 -b dhcp_sqlippool
# Some source files mistakenly have execute permissions set # 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 {} + find $RPM_BUILD_DIR/freeradius-server-%{version} \( -name '*.c' -o -name '*.h' \) -a -perm /0111 -exec chmod a-x {} +
@ -601,6 +603,9 @@ exit 0
%{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
%changelog %changelog
* Mon Dec 10 2012 John Dennis <jdennis@redhat.com> - 2.2.0-1
- resolves: bug#876564 - fails to start without freeradius-mysql
* Wed Oct 3 2012 John Dennis <jdennis@redhat.com> - 2.2.0-0 * Wed Oct 3 2012 John Dennis <jdennis@redhat.com> - 2.2.0-0
- Add new patch to avoid reading .rpmnew, .rpmsave and other invalid - Add new patch to avoid reading .rpmnew, .rpmsave and other invalid
files when loading config files files when loading config files