Skip to content

O
OpnSense
Commit d583f4cf authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: preparing for 17.1.r1 builds 

Now stable/17.1 is a little ahead of master, since master is
still used for both 16.7 and 17.1.
parent a0e9f738
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 72 deletions
Makefile
View file @ d583f4cf
# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org> # Copyright (c) 2014-2017 Franco Fichtner <franco@opnsense.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
...@@ -41,18 +41,11 @@ CORE_VERSION= ${CORE_COMMIT:C/-.*$//1} ...@@ -41,18 +41,11 @@ CORE_VERSION= ${CORE_COMMIT:C/-.*$//1}
CORE_HASH= ${CORE_COMMIT:C/^.*-//1} CORE_HASH= ${CORE_COMMIT:C/^.*-//1}
.endif .endif
CORE_ABI?= 16.7 CORE_ABI?= 17.1
CORE_ARCH?= ${ARCH} CORE_ARCH?= ${ARCH}
CORE_PY?= 27
.if ${CORE_ABI} == 16.7
CORE_BIND?= 910
CORE_PHP_SUHOSIN=php-suhosin
CORE_PHP?= 56
.else
CORE_BIND?= 911 CORE_BIND?= 911
CORE_PHP?= 70 CORE_PHP?= 70
.endif CORE_PY?= 27
.if "${CORE_RELEASE}" == yes .if "${CORE_RELEASE}" == yes
CORE_NAME?= opnsense CORE_NAME?= opnsense
...@@ -72,13 +65,13 @@ CORE_REPOSITORY?= ${FLAVOUR} ...@@ -72,13 +65,13 @@ CORE_REPOSITORY?= ${FLAVOUR}
CORE_PACKAGESITE?= http://pkg.opnsense.org CORE_PACKAGESITE?= http://pkg.opnsense.org
CORE_NAME?= opnsense-devel CORE_NAME?= opnsense-stable
CORE_FAMILY?= development CORE_FAMILY?= stable
CORE_ORIGIN?= opnsense/${CORE_NAME} CORE_ORIGIN?= opnsense/${CORE_NAME}
CORE_COMMENT?= OPNsense ${CORE_FAMILY} package CORE_COMMENT?= OPNsense ${CORE_FAMILY} package
CORE_MAINTAINER?= franco@opnsense.org CORE_MAINTAINER?= franco@opnsense.org
CORE_WWW?= https://opnsense.org/ CORE_WWW?= https://opnsense.org/
CORE_MESSAGE?= Thanks for all the fish... CORE_MESSAGE?= TBA
# CORE_DEPENDS_armv6 is empty # CORE_DEPENDS_armv6 is empty
CORE_DEPENDS_amd64?= beep bsdinstaller CORE_DEPENDS_amd64?= beep bsdinstaller
CORE_DEPENDS_i386?= ${CORE_DEPENDS_amd64} CORE_DEPENDS_i386?= ${CORE_DEPENDS_amd64}
...@@ -110,7 +103,6 @@ CORE_DEPENDS?= apinger \ ...@@ -110,7 +103,6 @@ CORE_DEPENDS?= apinger \
pecl-radius \ pecl-radius \
pftop \ pftop \
phalcon \ phalcon \
${CORE_PHP_SUHOSIN} \
php${CORE_PHP}-ctype \ php${CORE_PHP}-ctype \
php${CORE_PHP}-curl \ php${CORE_PHP}-curl \
php${CORE_PHP}-dom \ php${CORE_PHP}-dom \
......
src/etc/inc/plugins.inc
View file @ d583f4cf
...@@ -175,10 +175,6 @@ function plugins_configure($hook, $verbose = false) ...@@ -175,10 +175,6 @@ function plugins_configure($hook, $verbose = false)
$task($verbose); $task($verbose);
} }
} }
/* XXX compat glue from when configure wasn't indexed (remove in 17.1) */
if ($hook == 'bootup' && !is_array($worker)) {
$worker($verbose);
}
} }
} }
} }
......
src/etc/inc/system.inc
View file @ d583f4cf
...@@ -239,18 +239,13 @@ function get_locale_list() ...@@ -239,18 +239,13 @@ function get_locale_list()
$locales['en_US'] = gettext('English'); $locales['en_US'] = gettext('English');
$locales['cs_CZ'] = gettext('Czech'); $locales['cs_CZ'] = gettext('Czech');
$locales['zh_CN'] = gettext('Chinese (Simplified)'); $locales['zh_CN'] = gettext('Chinese (Simplified)');
$locales['nl_NL'] = gettext('Dutch');
$locales['fr_FR'] = gettext('French'); $locales['fr_FR'] = gettext('French');
$locales['de_DE'] = gettext('German'); $locales['de_DE'] = gettext('German');
$locales['it_IT'] = gettext('Italian'); $locales['it_IT'] = gettext('Italian');
$locales['ja_JP'] = gettext('Japanese'); $locales['ja_JP'] = gettext('Japanese');
$locales['mn_MN'] = gettext('Mongolian');
$locales['pt_BR'] = gettext('Portuguese (Brazil)'); $locales['pt_BR'] = gettext('Portuguese (Brazil)');
$locales['pt_PR'] = gettext('Portuguese (Portugal)'); $locales['pt_PR'] = gettext('Portuguese (Portugal)');
$locales['ru_RU'] = gettext('Russian'); $locales['ru_RU'] = gettext('Russian');
$locales['es_ES'] = gettext('Spanish');
$locales['sv_SE'] = gettext('Swedish');
$locales['tr_TR'] = gettext('Turkish');
return $locales; return $locales;
} }
......
src/etc/rc.loader.d/20-netgraph
View file @ d583f4cf
# The netgraph(4) framework is loaded here # The netgraph(4) framework is loaded here
# for backwards compat with the pre-16.7 # for backwards compat for when the kernel
# kernel configuration that compiled all of # had these compiled in, not as modules. This
# these modules into the kernel. This list # list needs further pruning and probing.
# needs further pruning and probing, it's
# possible we do not need frame relay anymore.
netgraph_load="YES" netgraph_load="YES"
ng_UI_load="YES" ng_UI_load="YES"
ng_async_load="YES" ng_async_load="YES"
......
src/etc/rc.php_ini_setup
View file @ d583f4cf
#!/bin/sh #!/bin/sh
# Copyright (C) 2014-2016 Franco Fichtner <franco@opnsense.org> # Copyright (C) 2014-2017 Franco Fichtner <franco@opnsense.org>
# Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com> # Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
# All rights reserved. # All rights reserved.
# #
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
if [ -d /usr/local/lib/php/20151012 ]; then if [ -d /usr/local/lib/php/20151012 ]; then
# PHP 7.0 # PHP 7.0
EXTENSIONSDIR="/usr/local/lib/php/20151012/" EXTENSIONSDIR="/usr/local/lib/php/20151012/"
elif [ -d /usr/local/lib/php/20131226 ]; then
# PHP 5.6
EXTENSIONSDIR="/usr/local/lib/php/20131226/"
else else
echo "No supported PHP version was found." echo "No supported PHP version was found."
exit 1 exit 1
...@@ -39,9 +36,6 @@ fi ...@@ -39,9 +36,6 @@ fi
PHP_INI=$(mktemp -q /tmp/php_ini.XXXXXX) PHP_INI=$(mktemp -q /tmp/php_ini.XXXXXX)
chmod 644 ${PHP_INI} chmod 644 ${PHP_INI}
# XXX can be removed in 17.1
rm -f /usr/local/etc/php/extensions.ini
# Fetch the timezone from the XML and set it here # Fetch the timezone from the XML and set it here
TIMEZONE=Etc/UTC TIMEZONE=Etc/UTC
if [ -f /conf/config.xml ]; then if [ -f /conf/config.xml ]; then
...@@ -84,31 +78,8 @@ date.timezone="${TIMEZONE}" ...@@ -84,31 +78,8 @@ date.timezone="${TIMEZONE}"
[xdebug] [xdebug]
xdebug.profiler_enable_trigger = 1 xdebug.profiler_enable_trigger = 1
xdebug.profiler_output_name = cachegrind.out.%t.%p xdebug.profiler_output_name = cachegrind.out.%t.%p
[suhosin]
suhosin.get.max_array_depth = 5000
suhosin.get.max_array_index_length = 256
suhosin.get.max_vars = 5000
suhosin.get.max_value_length = 500000
suhosin.post.max_array_depth = 5000
suhosin.post.max_array_index_length = 256
suhosin.post.max_vars = 5000
suhosin.post.max_value_length = 9000000
suhosin.request.max_array_depth = 5000
suhosin.request.max_array_index_length = 256
suhosin.request.max_vars = 5000
suhosin.request.max_value_length = 9000000
suhosin.memory_limit = 512435456
suhosin.session.cryptdocroot=Off
EOF EOF
PKGNAME="/usr/local/opnsense/version/opnsense.name"
if [ -f ${PKGNAME} -a "$(grep -c -- -devel$ ${PKGNAME})" != "0" ]; then
cat >> ${PHP_INI} << EOF
suhosin.executor.include.whitelist = phar://
EOF
fi
cp ${PHP_INI} /usr/local/etc/php.ini cp ${PHP_INI} /usr/local/etc/php.ini
cp ${PHP_INI} /usr/local/lib/php.ini cp ${PHP_INI} /usr/local/lib/php.ini
rm ${PHP_INI} rm ${PHP_INI}
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
View file @ d583f4cf
...@@ -496,9 +496,6 @@ class FirmwareController extends ApiControllerBase ...@@ -496,9 +496,6 @@ class FirmwareController extends ApiControllerBase
$current = $backend->configdRun("firmware ${type}"); $current = $backend->configdRun("firmware ${type}");
$current = explode("\n", trim($current)); $current = explode("\n", trim($current));
/* XXX remove this when 17.1 is out */
$response[$type] = array();
foreach ($current as $line) { foreach ($current as $line) {
$expanded = explode('|||', $line); $expanded = explode('|||', $line);
$translated = array(); $translated = array();
...@@ -510,9 +507,6 @@ class FirmwareController extends ApiControllerBase ...@@ -510,9 +507,6 @@ class FirmwareController extends ApiControllerBase
$translated[$key] = $expanded[$index++]; $translated[$key] = $expanded[$index++];
} }
/* XXX remove this when 17.1 is out */
$response[$type][] = $translated;
/* mark remote packages as "provided", local as "installed" */ /* mark remote packages as "provided", local as "installed" */
$translated['provided'] = $type == 'remote' ? "1" : "0"; $translated['provided'] = $type == 'remote' ? "1" : "0";
$translated['installed'] = $type == 'local' ? "1" : "0"; $translated['installed'] = $type == 'local' ? "1" : "0";
...@@ -531,11 +525,6 @@ class FirmwareController extends ApiControllerBase ...@@ -531,11 +525,6 @@ class FirmwareController extends ApiControllerBase
} }
} }
} }
/* XXX remove this when 17.1 is out */
usort($response[$type], function ($a, $b) {
return strnatcasecmp($a['name'], $b['name']);
});
} }
uksort($packages, function ($a, $b) { uksort($packages, function ($a, $b) {
......
src/opnsense/service/modules/ph_inline_actions.py
View file @ d583f4cf
...@@ -47,8 +47,6 @@ def execute(action, parameters): ...@@ -47,8 +47,6 @@ def execute(action, parameters):
tmpl = template.Template(action.root_dir) tmpl = template.Template(action.root_dir)
conf = config.Config(action.config) conf = config.Config(action.config)
tmpl.set_config(conf.get()) tmpl.set_config(conf.get())
# XXX backwards-compat for '.' syntax, remove post-17.1
parameters = parameters.replace('.', '/')
filenames = tmpl.generate(parameters) filenames = tmpl.generate(parameters)
del conf del conf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023