Remove some really unnecessary manual downloading of libraries/packages during install of these.

2 files changed, 0 insertions, 46 deletions

diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index 37e57aa8..ffd3dde1 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -99,41 +99,6 @@ function freeradius_install_command() {
 	if (file_exists(RADDB . "/sites-enabled/control-socket")) { unlink(RADDB . "/sites-enabled/control-socket"); }
 	if (file_exists(RADDB . "/sites-enabled/inner-tunnel")) { unlink(RADDB . "/sites-enabled/inner-tunnel"); }
 
-/* freeradius2: additionald downloaded files temp disabled to check if we need them with the ne built packages
-	// We need some additional files in /usr/local/lib for the LDAP module. We fetch these files dependent on the architecture.
-	if (!file_exists("/usr/local/lib/libasn1.so.10") || !file_exists("/usr/local/lib/libgssapi.so.10") || !file_exists("/usr/local/lib/libheimntlm.so.10") || !file_exists("/usr/local/lib/libhx509.so.10") || !file_exists("/usr/local/lib/ldd/libkrb5.so.10") || !file_exists("/usr/local/lib/libroken.so.10")) {
-		// 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");
-		}
-	}
-*/
 	// We run this here just to suppress some warnings on syslog if file doesn't exist
 	freeradius_authorizedmacs_resync();
 
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 4ed5f393..1e29f358 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -156,17 +156,6 @@ EOD;
 	fclose($fd);
 	exec("/etc/rc.d/devd restart");
 
-	/* Workaround for the old package deleting the binary on unload instead of the package */
-	if (!file_exists("/usr/local/sbin/haproxy")) {
-		if (substr(trim(`uname -r`), 0, 1) == "8") {
-			exec("cd /var/db/pkg && pkg_delete `ls | grep haproxy`");
-			if (trim(`uname -m`) == 'i386')
-				exec("pkg_add -r http://e-sac.siteseguro.ws/pfsense/8/All/haproxy-1.4.18.tbz");
-			else
-				exec("pkg_add -r http://e-sac.siteseguro.ws/pfsense/8/amd64/All/haproxy-1.4.18.tbz");
-		}
-	}
-
 	/* Do XML upgrade from haproxy 0.31 to haproxy-dev */
 	if (is_array($config['installedpackages']['haproxy']['ha_servers'])) {
 		/* We have an old config */