diff --git a/sysutils/pfSense-pkg-syslog-ng/Makefile b/sysutils/pfSense-pkg-syslog-ng/Makefile index 1438b9b3b07b..8d96d9cf6ca6 100644 --- a/sysutils/pfSense-pkg-syslog-ng/Makefile +++ b/sysutils/pfSense-pkg-syslog-ng/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-syslog-ng -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.inc b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.inc index 41fce41649d4..0d416a14bad3 100644 --- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.inc +++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.inc @@ -27,23 +27,19 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -require_once('globals.inc'); require_once('config.inc'); -require_once('util.inc'); +require_once('globals.inc'); +require_once('interfaces.inc'); require_once('pfsense-utils.inc'); require_once('pkg-utils.inc'); +require_once('services.inc'); require_once('service-utils.inc'); - +require_once('util.inc'); if (!function_exists("filter_configure")) { require_once("filter.inc"); } -$pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); -if ($pf_version == "2.1" || $pf_version == "2.2") { - define("SYSLOGNG_BASEDIR", "/usr/pbi/syslog-ng-" . php_uname("m") . "/"); -} else { - define("SYSLOGNG_BASEDIR", "/usr/local/"); -} +define("SYSLOGNG_BASEDIR", "/usr/local/"); function syslogng_get_real_interface_address($interface) { $interface = convert_friendly_interface_to_real_interface_name($interface); @@ -52,13 +48,7 @@ function syslogng_get_real_interface_address($interface) { } function syslogng_install_command() { - if (is_link("/usr/local/lib/syslog-ng")) { - unlink("/usr/local/lib/syslog-ng"); - } - if (!file_exists("/usr/local/lib/syslog-ng")) { - @symlink(SYSLOGNG_BASEDIR . "local/lib/syslog-ng", "/usr/local/lib/syslog-ng"); - } - $crontask = "/usr/bin/nice -n20 " . SYSLOGNG_BASEDIR . "local/sbin/logrotate /usr/local/etc/logrotate.conf"; + $crontask = "/usr/bin/nice -n20 " . SYSLOGNG_BASEDIR . "sbin/logrotate /usr/local/etc/logrotate.conf"; install_cron_job("${crontask}", true, "0"); syslogng_resync(); } @@ -67,7 +57,7 @@ function syslogng_deinstall_command() { if (is_link("/usr/local/lib/syslog-ng")) { unlink("/usr/local/lib/syslog-ng"); } - $crontask = "/usr/bin/nice -n20 " . SYSLOGNG_BASEDIR . "local/sbin/logrotate /usr/local/etc/logrotate.conf"; + $crontask = "/usr/bin/nice -n20 " . SYSLOGNG_BASEDIR . "sbin/logrotate /usr/local/etc/logrotate.conf"; install_cron_job("${crontask}", false); unlink_if_exists("/usr/local/etc/logrotate.conf"); unlink_if_exists("/usr/local/etc/syslog-ng.conf"); @@ -89,7 +79,7 @@ function syslogng_validate_general($post, &$input_errors) { $input_errors[] = 'You must enter a valid port number in the \'Default Port\' field'; } - $sockstat = trim(shell_exec("sockstat -l -P " . $post['default_protocol'] . " -p " . $post['default_port'] . " | grep -v ^USER | grep -v syslog-ng")); + $sockstat = trim(shell_exec("/usr/bin/sockstat -l -P " . $post['default_protocol'] . " -p " . $post['default_port'] . " | /usr/bin/grep -v ^USER | /usr/bin/grep -v syslog-ng")); if (!empty($sockstat)) { $input_errors[] = 'The port specified in the \'Default Port\' field is already in use'; } @@ -342,9 +332,7 @@ function syslogng_resync() { $config['installedpackages']['syslogngadvanced']['config'] = $objects; if ($settings['enable'] == 'on') { - if (!file_exists($settings['default_logdir'])) { - exec("mkdir -p " . $settings['default_logdir']); - } + safe_mkdir("{$settings['default_logdir']}", 0755); syslogng_write_rcfile(); @@ -380,27 +368,27 @@ function syslogng_write_rcfile() { $pid_file = "/var/run/syslog-ng.pid"; $rc['file'] = 'syslog-ng.sh'; $rc['start'] = <<<EOD -if [ -z "`ps auxw | grep "syslog-ng" | grep -v "syslog-ng.sh" | grep -v "grep"`" ]; then +if [ -z "`/bin/ps auxw | /usr/bin/grep "syslog-ng" | /usr/bin/grep -v "syslog-ng.sh" | /usr/bin/grep -v "grep"`" ]; then /usr/local/sbin/syslog-ng -p {$pid_file} fi EOD; $rc['stop'] = <<<EOD if [ -s "{$pid_file}" ]; then - kill `cat {$pid_file}` 2>/dev/null + /bin/kill `cat {$pid_file}` 2>/dev/null fi # Just in case pid file didn't exist or process is still running... sleep 5 -killall -9 syslog-ng 2>/dev/null +/usr/bin/killall -9 syslog-ng 2>/dev/null EOD; $rc['restart'] = <<<EOD -if [ -z "`ps auxw | grep "syslog-ng" | grep -v "syslog-ng.sh"`" ]; then +if [ -z "`/bin/ps auxw | /usr/bin/grep "syslog-ng" | /usr/bin/grep -v "syslog-ng.sh"`" ]; then /usr/local/sbin/syslog-ng -p {$pid_file} elif [ -s "{$pid_file}" ]; then - kill -s HUP `cat {$pid_file}` 2>/dev/null + /bin/kill -s HUP `cat {$pid_file}` 2>/dev/null else - killall -9 syslog-ng 2>/dev/null + /usr/bin/killall -9 syslog-ng 2>/dev/null /usr/local/sbin/syslog-ng -p {$pid_file} fi diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.xml b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.xml index 81942926874c..92f3b12d967a 100644 --- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.xml +++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng.xml @@ -42,7 +42,7 @@ ]]> </copyright> <name>Syslog-ng</name> - <version>1.1.1</version> + <version>1.1.2</version> <title>Services: Syslog-ng</title> <include_file>/usr/local/pkg/syslog-ng.inc</include_file> <menu> @@ -190,6 +190,6 @@ syslogng_deinstall_command(); </custom_php_deinstall_command> <filter_rules_needed> - syslogng_generate_rules(); + syslogng_generate_rules </filter_rules_needed> </packagegui> diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng_advanced.xml b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng_advanced.xml index 940675808d5a..64f1fb0e3321 100644 --- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng_advanced.xml +++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/pkg/syslog-ng_advanced.xml @@ -42,7 +42,7 @@ ]]> </copyright> <name>Syslog-ng Advanced</name> - <version>1.0.8</version> + <version>1.1.2</version> <title>Services: Syslog-ng Advanced</title> <include_file>/usr/local/pkg/syslog-ng.inc</include_file> <delete_string>An object has been deleted.</delete_string> diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml index 9ab89a9c76d0..4fb0ecf7bc49 100644 --- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml +++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml @@ -5,18 +5,10 @@ <website>http://www.balabit.com/network-security/syslog-ng/</website> <descr><![CDATA[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>System</category> - <version>1.1.1</version> + <version>1.1.2</version> <status>BETA</status> - <required_version>2.2</required_version> - <depends_on_package_pbi>syslog-ng-3.6.2_3-##ARCH##.pbi</depends_on_package_pbi> - <port_category>sysutils</port_category> - <run_depends>sbin/syslog-ng:sysutils/syslog-ng</run_depends> - <build_pbi> - <ports_before>sysutils/logrotate</ports_before> - <port>sysutils/syslog-ng</port> - </build_pbi> + <required_version>2.3</required_version> <maintainer>laleger@gmail.com</maintainer> - <config_file>https://packages.pfsense.org/packages/config/syslog-ng/syslog-ng.xml</config_file> <configurationfile>syslog-ng.xml</configurationfile> </package> </pfsensepkgs> diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/www/syslog-ng_log_viewer.php b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/www/syslog-ng_log_viewer.php index c914110a0141..3f48eae24dd0 100644 --- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/www/syslog-ng_log_viewer.php +++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/www/syslog-ng_log_viewer.php @@ -94,7 +94,6 @@ $pgtitle = "Services: Syslog-ng Log Viewer"; include("head.inc"); ?> -<body link="#000000" vlink="#000000" alink="#000000"> <?php include("fbegin.inc"); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="syslog-ng_log_viewer.php" method="post" name="iform"> @@ -164,6 +163,4 @@ </td></tr> </table> </form> -<?php include("fend.inc"); ?> -</body> -</html> +<?php include("foot.inc"); ?>