From 41403b812238d571297a41d54697bbdef9540f60 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 16 Aug 2013 13:31:32 -0400 Subject: Add the most common values as default in system patches for path strip, base, and whitespace. Also bump version. --- config/systempatches/system_patches_edit.php | 4 ++++ config/systempatches/systempatches.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/systempatches/system_patches_edit.php b/config/systempatches/system_patches_edit.php index 5b30c9c5..ffa2fe13 100644 --- a/config/systempatches/system_patches_edit.php +++ b/config/systempatches/system_patches_edit.php @@ -63,6 +63,10 @@ if (isset($id) && $a_patches[$id]) { $pconfig['ignorewhitespace'] = isset($a_patches[$id]['ignorewhitespace']); $pconfig['autoapply'] = isset($a_patches[$id]['autoapply']); $pconfig['uniqid'] = $a_patches[$id]['uniqid']; +} else { + $pconfig['pathstrip'] = 1; + $pconfig['basedir'] = "/"; + $pconfig['ignorewhitespace'] = true; } if (isset($_GET['dup'])) diff --git a/config/systempatches/systempatches.xml b/config/systempatches/systempatches.xml index f221588b..73974af0 100644 --- a/config/systempatches/systempatches.xml +++ b/config/systempatches/systempatches.xml @@ -40,7 +40,7 @@ None Applies patches supplied by the user to the firewall. System Patches - 0.10 + 1.0 System: Patches /usr/local/pkg/patches.inc diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 72fba445..ea761050 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1745,7 +1745,7 @@ System Patches A package to apply and maintain custom system patches. jimp@pfsense.org - 0.10 + 1.0 System RELEASE http://www.pfsense.com/packages/config/systempatches/systempatches.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d8e9b461..e70de7c7 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1732,7 +1732,7 @@ System Patches A package to apply and maintain custom system patches. jimp@pfsense.org - 0.10 + 1.0 System RELEASE http://www.pfsense.com/packages/config/systempatches/systempatches.xml -- cgit v1.2.3