Merge pull request #191 from Nachtfalkeaw/master

freeradius2 updates pkg v1.4.7

3 files changed, 50 insertions, 27 deletions

diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index ecf21a5e..a15aba8e 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -90,7 +90,40 @@ function freeradius_install_command() {
 	// Disable virtual-server we do not need by default
 	unlink("/usr/local/etc/raddb/sites-enabled/control-socket");
 	unlink("/usr/local/etc/raddb/sites-enabled/inner-tunnel");
-
+	
+	// We need some additional files in /usr/local/lib for the LDAP module. We fetch these files dependent on the architecture.
+	// For i386 systems
+	if (exec("uname -m") == "i386") {
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/All/ldd/libasn1.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/All/ldd/libgssapi.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/All/ldd/libheimntlm.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/All/ldd/libhx509.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/All/ldd/libkrb5.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/All/ldd/libroken.so.10");
+		exec("chmod 0755 /usr/local/lib/libasn1.so.10");
+		exec("chmod 0755 /usr/local/lib/libgssapi.so.10");
+		exec("chmod 0755 /usr/local/lib/libheimntlm.so.10");
+		exec("chmod 0755 /usr/local/lib/libhx509.so.10");
+		exec("chmod 0755 /usr/local/lib/ldd/libkrb5.so.10");
+		exec("chmod 0755 /usr/local/lib/libroken.so.10");
+	}
+	// For amd64 systems
+	else {
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/amd64/All/ldd/libasn1.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/amd64/All/ldd/libgssapi.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/amd64/All/ldd/libheimntlm.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/amd64/All/ldd/libhx509.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/amd64/All/ldd/libkrb5.so.10");
+		exec("cd /usr/local/lib/ && fetch http://e-sac.siteseguro.ws/pfsense/8/amd64/All/ldd/libroken.so.10");
+		exec("chmod 0755 /usr/local/lib/libasn1.so.10");
+		exec("chmod 0755 /usr/local/lib/libgssapi.so.10");
+		exec("chmod 0755 /usr/local/lib/libheimntlm.so.10");
+		exec("chmod 0755 /usr/local/lib/libhx509.so.10");
+		exec("chmod 0755 /usr/local/lib/ldd/libkrb5.so.10");
+		exec("chmod 0755 /usr/local/lib/libroken.so.10");
+	}
+	
+	
 	$rcfile = array();
 	$rcfile['file'] = 'radiusd.sh';
 	$rcfile['start'] = '/usr/local/etc/rc.d/radiusd onestart';
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index ab361e09..0da76fa7 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -802,27 +802,21 @@
 		<name>freeradius2</name>
 		<website>http://www.freeradius.org/</website>
 		<descr><![CDATA[A free implementation of the RADIUS protocol.<br>
-				Do not use together with freeradius package. Both are using the same XML files.]]></descr>
+					Support: MySQL, PostgreSQL, LDAP, Kerberos<br>
+					FreeRADIUS and FreeRADIUS2 settings are not compatible so don't use them together or try to update<br>
+					On pfSense docs there is a how-to which could help you on porting users.]]></descr>
 		<pkginfolink>http://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
 		<category>System</category>
-		<version>2.1.12 pkg v1.4.6</version>
+		<version>2.1.12 pkg v1.4.7</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>nachtfalkeaw@web.de</maintainer>
-		<depends_on_package_base_url>http://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/All/</depends_on_package_base_url>
+		<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>freeradius-2.1.12.tbz</depends_on_package>
-		<depends_on_package>python27-2.7.2_3.tbz</depends_on_package>
-		<depends_on_package>perl-5.12.4_3.tbz</depends_on_package>
-		<depends_on_package>libltdl-2.4_1.tbz</depends_on_package>
-		<depends_on_package>gdbm-1.9.1.tbz</depends_on_package>
+		<depends_on_package>openldap-sasl-client-2.4.26.tbz</depends_on_package>
 		<config_file>http://www.pfsense.org/packages/config/freeradius2/freeradius.xml</config_file>
 		<configurationfile>freeradius.xml</configurationfile>
-		<build_port_path>/usr/ports/net/freeradius2</build_port_path>
-		<build_port_path>/usr/ports/lang/python27</build_port_path>
-		<build_port_path>/usr/ports/lang/perl5.12</build_port_path>
-		<build_port_path>/usr/ports/devel/libltdl</build_port_path>
-		<build_port_path>/usr/ports/databases/gdbm</build_port_path>
-		<after_install_info>Please visit Services: freeRADIUS</after_install_info>
+		<after_install_info>Please visit Services: FreeRADIUS</after_install_info>
 	</package>	
 	<package>
 		<name>bandwidthd</name>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 1abd599e..7338ab13 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -849,27 +849,23 @@
 		<name>freeradius2</name>
 		<website>http://www.freeradius.org/</website>
 		<descr><![CDATA[A free implementation of the RADIUS protocol.<br>
-				Do not use together with freeradius package. Both are using the same XML files.]]></descr>
+					Support: MySQL, PostgreSQL, LDAP, Kerberos<br>
+					FreeRADIUS and FreeRADIUS2 settings are not compatible so don't use them together or try to update<br>
+					On pfSense docs there is a how-to which could help you on porting users.]]></descr>
 		<pkginfolink>http://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
 		<category>System</category>
-		<version>2.1.12 pkg v1.4.6</version>
+		<version>2.1.12 pkg v1.4.7</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<maintainer>nachtfalkeaw@web.de</maintainer>
-		<depends_on_package_base_url>http://ftp.freebsd.org/pub/FreeBSD/ports/amd64/packages-8-stable/All/</depends_on_package_base_url>
+		<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/amd64/8/All/</depends_on_package_base_url>
 		<depends_on_package>freeradius-2.1.12.tbz</depends_on_package>
-		<depends_on_package>python27-2.7.2_3.tbz</depends_on_package>
-		<depends_on_package>perl-5.12.4_3.tbz</depends_on_package>
-		<depends_on_package>libltdl-2.4_1.tbz</depends_on_package>
-		<depends_on_package>gdbm-1.9.1.tbz</depends_on_package>
+		<depends_on_package>mysql-client-5.5.19.tbz</depends_on_package>
+		<depends_on_package>postgresql-client-9.1.2.tbz</depends_on_package>
+		<depends_on_package>openldap-sasl-client-2.4.26.tbz</depends_on_package>
 		<config_file>http://www.pfsense.org/packages/config/freeradius2/freeradius.xml</config_file>
 		<configurationfile>freeradius.xml</configurationfile>
-		<build_port_path>/usr/ports/net/freeradius2</build_port_path>
-		<build_port_path>/usr/ports/lang/python27</build_port_path>
-		<build_port_path>/usr/ports/lang/perl5.12</build_port_path>
-		<build_port_path>/usr/ports/devel/libltdl</build_port_path>
-		<build_port_path>/usr/ports/databases/gdbm</build_port_path>
-		<after_install_info>Please visit Services: freeRADIUS</after_install_info>
+		<after_install_info>Please visit Services: FreeRADIUS</after_install_info>
 	</package>
 	<package>
 		<name>bandwidthd</name>