From 425e547428e4dd58d82b1dcd19ccd60cabf920a4 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 9 Feb 2015 14:47:48 -0200
Subject: Attempt to fix syslog-ng creating a symlink of lib/syslog-ng on
 /usr/local/lib. While here, move config version to 3.6 and bump package to
 1.0.3

---
 config/syslog-ng/syslog-ng.inc | 9 ++++++++-
 pkg_config.10.xml              | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index e373f62e..aaf3af9b 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -37,6 +37,9 @@ require_once('service-utils.inc');
 if(!function_exists("filter_configure")) 
 	require_once("filter.inc");
 
+if (!defined("SYSLOGNG_BSEDIR"))
+	define("SYSLOGNG_BASEDIR", "/usr/pbi/syslog-ng-" . php_uname("m") . "/");
+
 function syslogng_get_real_interface_address($interface) {
 	$interface = convert_friendly_interface_to_real_interface_name($interface);
 	$line = trim(shell_exec("ifconfig $interface | grep inet | grep -v inet6 | awk '{ print \$2, \$4 }'"));
@@ -47,6 +50,8 @@ function syslogng_get_real_interface_address($interface) {
 
 function syslogng_install_command() {
 	conf_mount_rw();
+	if (!file_exists("/usr/local/lib/syslog-ng"))
+		@symlink("/usr/local/lib/syslog-ng", SYSLOGNG_BSEDIR . "local/lib/syslog-ng");
 	syslogng_install_cron(true);
 	conf_mount_ro();
 	syslogng_resync();
@@ -56,6 +61,8 @@ function syslogng_deinstall_command() {
 	conf_mount_rw();
 	exec("/usr/local/etc/rc.d/syslog-ng.sh stop");
 	unlink_if_exists("/usr/local/etc/rc.d/syslog-ng.sh");
+	if (is_link("/usr/local/lib/syslog-ng"))
+		unlink_if_exists("/usr/local/lib/syslog-ng");
 	syslogng_install_cron(false);
 	conf_mount_ro();
 	filter_configure();
@@ -249,7 +256,7 @@ function syslogng_get_log_files($objects) {
 function syslogng_build_conf($objects) {
 	$conf = "# This file is automatically generated by pfSense\n";
 	$conf .= "# Do not edit manually !\n";
-	$conf .= "@version:3.5\n";
+	$conf .= "@version:3.6\n";
 	
 	foreach($objects as $object) {
 		if($object['objecttype'] == 'log' || $object['objecttype'] == 'options') {
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index ba38318f..af263dfb 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1308,7 +1308,7 @@
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr>
 		<category>Services</category>
-		<version>3.6.2_3 pkg.v.1.0.2</version>
+		<version>3.6.2_3 pkg.v.1.0.3</version>
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>syslog-ng-3.6.2_3-##ARCH##.pbi</depends_on_package_pbi>
-- 
cgit v1.2.3