aboutsummaryrefslogtreecommitdiffstats
path: root/config/systempatches
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2013-05-23 19:25:20 -0400
committerbmeeks8 <bmeeks8@bellsouth.net>2013-05-23 19:25:20 -0400
commit6a1dc3a79459a5ba917e77c297b3c98599fd1af6 (patch)
tree748d3a5deccd741cc3833e5d4883018552cad455 /config/systempatches
parentf362732e77b071e78c249d2e0d5b46387411d52e (diff)
parent3203270cc58d6f0a5aa5ff586efc524fb13d12da (diff)
downloadpfsense-packages-6a1dc3a79459a5ba917e77c297b3c98599fd1af6.tar.gz
pfsense-packages-6a1dc3a79459a5ba917e77c297b3c98599fd1af6.tar.bz2
pfsense-packages-6a1dc3a79459a5ba917e77c297b3c98599fd1af6.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/systempatches')
-rw-r--r--config/systempatches/patches.inc2
-rw-r--r--config/systempatches/system_patches.php2
-rw-r--r--config/systempatches/systempatches.xml2
3 files changed, 4 insertions, 2 deletions
diff --git a/config/systempatches/patches.inc b/config/systempatches/patches.inc
index 9b347620..0547f2cf 100644
--- a/config/systempatches/patches.inc
+++ b/config/systempatches/patches.inc
@@ -52,12 +52,14 @@ function patch_commit($patch, $action, $test=false, $fulldetail=false) {
$whitespace = isset($patch['ignorewhitespace']) ? "--ignore-whitespace" : "";
$pathstrip = '-p' . $patch['pathstrip'];
$full_patch_command = "{$patch_cmd} --directory={$directory} {$force} {$pathstrip} {$filename} {$check} {$direction} {$whitespace}";
+ conf_mount_rw();
patch_write($patch);
if (!$fulldetail)
$output = (mwexec($full_patch_command, true) == 0);
else
$output = $full_patch_command . "\n\n" . shell_exec($full_patch_command . ' 2>&1');
patch_erase($patch);
+ conf_mount_ro();
return $output;
}
diff --git a/config/systempatches/system_patches.php b/config/systempatches/system_patches.php
index 70260e4b..7fe860bd 100644
--- a/config/systempatches/system_patches.php
+++ b/config/systempatches/system_patches.php
@@ -260,7 +260,7 @@ foreach ($a_patches as $thispatch):
</td></tr>
<?php $i++; $npatches++; endforeach; ?>
<tr>
- <td class="list" colspan="7"></td>
+ <td class="list" colspan="8"></td>
<td class="list" valign="middle" nowrap>
<table border="0" cellspacing="0" cellpadding="1" summary="edit">
<tr>
diff --git a/config/systempatches/systempatches.xml b/config/systempatches/systempatches.xml
index ea0eee78..c5e0a784 100644
--- a/config/systempatches/systempatches.xml
+++ b/config/systempatches/systempatches.xml
@@ -40,7 +40,7 @@
<requirements>None</requirements>
<faq>Applies patches supplied by the user to the firewall.</faq>
<name>System Patches</name>
- <version>0.8</version>
+ <version>0.9</version>
<title>System: Patches</title>
<include_file>/usr/local/pkg/patches.inc</include_file>
<menu>