From: Fajar A. Nugraha Date: Tue, 7 Aug 2012 06:30:28 +0000 (+0700) Subject: Fix debian package to work even without freeradius-mysql X-Git-Tag: release_2_2_0~77^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F74%2Fhead;p=thirdparty%2Ffreeradius-server.git Fix debian package to work even without freeradius-mysql Added a patch to comment-out the line referencing mysql on modules/dhcp_sqlippool in the default debian package. This is needed so that by default users installing "freeradius" package can always start the server, even without "freeeradius-mysql" package installed. --- diff --git a/debian/patches/dhcp_sqlippool-comment-out-mysql.diff b/debian/patches/dhcp_sqlippool-comment-out-mysql.diff new file mode 100644 index 0000000000..d0d2143a10 --- /dev/null +++ b/debian/patches/dhcp_sqlippool-comment-out-mysql.diff @@ -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/debian/patches/series b/debian/patches/series index 944f2135a0..d2760f6953 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ radiusd-to-freeradius.diff dialupadmin-help.diff gitignore.diff rlm_sql.libs.diff +dhcp_sqlippool-comment-out-mysql.diff