src: so this is 17.7.a

Makefile

-# 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
 # modification, are permitted provided that the following conditions
@@ -41,18 +41,11 @@ CORE_VERSION=	${CORE_COMMIT:C/-.*$//1}
 CORE_HASH=	${CORE_COMMIT:C/^.*-//1}
 .endif
 
-CORE_ABI?=	16.7
+CORE_ABI?=	17.1
 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_PHP?=	70
-.endif
+CORE_PY?=	27
 
 .if "${CORE_RELEASE}" == yes
 CORE_NAME?=		opnsense
@@ -110,7 +103,6 @@ CORE_DEPENDS?=		apinger \
 			pecl-radius \
 			pftop \
 			phalcon \
-			${CORE_PHP_SUHOSIN} \
 			php${CORE_PHP}-ctype \
 			php${CORE_PHP}-curl \
 			php${CORE_PHP}-dom \

plist

@@ -306,8 +306,6 @@
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php
 /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist
 /usr/local/opnsense/contrib/tzdata/iso3166.tab
-/usr/local/opnsense/firmware-message
-/usr/local/opnsense/firmware-upgrade
 /usr/local/opnsense/mvc/app/cache/README
 /usr/local/opnsense/mvc/app/config/config.php
 /usr/local/opnsense/mvc/app/config/loader.php

src/boot/logo-hourglass.4th

@@ -50,7 +50,7 @@
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" logo+
 	s" @@@@@@@@@@@@@@@@@@@@@@@@@@@@  " logo+
 	s"  #[m                              " logo+
-	s"   17.1  ``Insert Name Here''  #[m" logo+
+	s"   17.7  ``Insert Name Here''  #[m" logo+
 
 	2drop
 ;

src/etc/inc/plugins.inc

@@ -175,10 +175,6 @@ function plugins_configure($hook, $verbose = false)
                         $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/rc.loader.d/20-netgraph

 # The netgraph(4) framework is loaded here
-# for backwards compat with the pre-16.7
-# kernel configuration that compiled all of
-# these modules into the kernel.  This list
-# needs further pruning and probing, it's
-# possible we do not need frame relay anymore.
+# for backwards compat for when the kernel
+# had these compiled in, not as modules. This
+# list needs further pruning and probing.
 netgraph_load="YES"
 ng_UI_load="YES"
 ng_async_load="YES"

src/etc/rc.php_ini_setup

 #!/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>
 # All rights reserved.
 #
@@ -28,9 +28,6 @@
 if [ -d /usr/local/lib/php/20151012 ]; then
 	# PHP 7.0
 	EXTENSIONSDIR="/usr/local/lib/php/20151012/"
-elif [ -d /usr/local/lib/php/20131226 ]; then
-	# PHP 5.6
-	EXTENSIONSDIR="/usr/local/lib/php/20131226/"
 else
 	echo "No supported PHP version was found."
 	exit 1
@@ -39,9 +36,6 @@ fi
 PHP_INI=$(mktemp -q /tmp/php_ini.XXXXXX)
 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
 TIMEZONE=Etc/UTC
 if [ -f /conf/config.xml ]; then
@@ -84,31 +78,8 @@ date.timezone="${TIMEZONE}"
 [xdebug]
 xdebug.profiler_enable_trigger = 1
 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
 
-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/lib/php.ini
 rm ${PHP_INI}

src/opnsense/firmware-message

-<p>Dear friends and followers,</p>
-<p>This is the EOL announcement for the 16.7 series of OPNsense. As such it
-will not receive any more updates, but the upgrade to the new 17.1 series is
-seamless, except for the following points:</p>
-<p><ul><li>The integrated authentication framework is now used as a system-wide
-default including login(1), su(1) and sudo(8). This means that e.g. 2FA
-will be used for low-level password prompts as well and plain passwords are
-disabled by default. If this behaviour is undesired, set the "Disable
-integrated authentication" option under System: Settings: Administration.</li>
-<li>The console settings received a non-backwards compatible change. If the
-VGA console is not working, simply reconfigure it from System: Settings:
-Administration as it was likely set to "Serial" due to a wrong GUI default.</li>
-<li>FreeBSD 11.0 switched to the vt(4) console driver, but we are keeping
-sc(4) as the default. You can change this after installation by enabling the
-virtual terminal driver under System: Settings: Administration.</li>
-<li>The access privileges for "Lobby: Login / Logout / Dashboard" and
-"Diagnostics: Backup / Restore" have been remapped internally and need to be
-reapplied when they have been assigned explicitly.</li>
-<li>The inherited 6rd kernel patches are not included in standard FreeBSD
-11.0. The state of 6rd is possibly broken. We ask for volunteers to pick up
-the work if 6rd is still a requirement, as we do not have access to such
-setups.</li>
-<li>Fundamental WiFi stack changes in FreeBSD 11.0 could still affect overall
-operability. Please let us know about these right away.</li>
-<li>The following services moved to individual plugins and need to be
-reinstalled in order to be used: SNMP, Load Balancer, Wake on LAN, Universal
-Plug and Play, IGMP Proxy. Their respective configurations will be preserved
-by the system even if these plugins are not installed.</li>
-<li>The Intel e1000 driver plugin has been removed due to an incompatibility
-with FreeBSD 11.0. All previously known bugs of the FreeBSD 11.0 e1000 driver
-have been fixed in OPNsense 17.1 and reported to FreeBSD.</li> </ul></p>
-<p>We would like to encourage everyone to supervise this major upgrade physically.
-As such, it cannot be performed from the GUI. Instead, go to the root console
-menu, choose option 12 and type "17.1" at the prompt. The process will download
-a full set of updates and reboot multiple. All operating system files and packages
-will be reinstalled as a consequence. This process can also be remotely triggered
-via SSH.</p>
-<p> Another method is to import and reinstall using a new installation image,
-which will retain your settings (selecting "Import Configuration"), then
-reformat the disk and apply a clean system (selecting "Guided Installation").</p>
-<p>Please heed these points carefully before upgrading. Backup your configs,
-preview the new version via the live CD or in a virtual machine. Create
-snapshots. If all else fails, report back
-<a href="https://forum.opnsense.org/" target="_blank">in the forums</a> for
-assistance. You don't have to do this on your own. :)</p>
-<p><em>Dancing Dolphin</em>, you've served us well.</p>
-<p>See you on the other side,<br>Your OPNsense team</p>

src/opnsense/firmware-upgrade

-17.1

src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php

@@ -496,9 +496,6 @@ class FirmwareController extends ApiControllerBase
             $current = $backend->configdRun("firmware ${type}");
             $current = explode("\n", trim($current));
 
-            /* XXX remove this when 17.1 is out */
-            $response[$type] = array();
-
             foreach ($current as $line) {
                 $expanded = explode('|||', $line);
                 $translated = array();
@@ -510,9 +507,6 @@ class FirmwareController extends ApiControllerBase
                     $translated[$key] = $expanded[$index++];
                 }
 
-                /* XXX remove this when 17.1 is out */
-                $response[$type][] = $translated;
-
                 /* mark remote packages as "provided", local as "installed" */
                 $translated['provided'] = $type == 'remote' ? "1" : "0";
                 $translated['installed'] = $type == 'local' ? "1" : "0";
@@ -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) {

src/opnsense/service/modules/ph_inline_actions.py

@@ -47,8 +47,6 @@ def execute(action, parameters):
         tmpl = template.Template(action.root_dir)
         conf = config.Config(action.config)
         tmpl.set_config(conf.get())
-        # XXX backwards-compat for '.' syntax, remove post-17.1
-        parameters = parameters.replace('.', '/')
         filenames = tmpl.generate(parameters)
 
         del conf