aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-08-05 14:41:23 -0400
committerjim-p <jimp@pfsense.org>2010-08-05 14:41:23 -0400
commit83158cd9f865cb8c10e0eac82759c25381a45e71 (patch)
treee65e8ee786920717f2e46512d02ac72149440431
parent087dd063817d0cdf8573db503ea72b26a0c39438 (diff)
downloadpfsense-packages-83158cd9f865cb8c10e0eac82759c25381a45e71.tar.gz
pfsense-packages-83158cd9f865cb8c10e0eac82759c25381a45e71.tar.bz2
pfsense-packages-83158cd9f865cb8c10e0eac82759c25381a45e71.zip
Fix a misplaced line in this patch.
-rw-r--r--config/packetcapturefix/packetcapturefix.patch16
-rwxr-xr-xpkg_config.7.xml2
2 files changed, 7 insertions, 11 deletions
diff --git a/config/packetcapturefix/packetcapturefix.patch b/config/packetcapturefix/packetcapturefix.patch
index 659fdd10..992d0d61 100644
--- a/config/packetcapturefix/packetcapturefix.patch
+++ b/config/packetcapturefix/packetcapturefix.patch
@@ -1,18 +1,14 @@
-diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
-index 69fd677..91d61cd 100644
---- a/usr/local/www/diag_packet_capture.php
-+++ b/usr/local/www/diag_packet_capture.php
-@@ -265,6 +265,9 @@ include("head.inc"); ?>
- <textarea style="width:98%" name="code" rows="15" cols="66" wrap="off" readonly="readonly">
+--- diag_packet_capture.php.orig 2010-08-05 18:33:38.000000000 +0000
++++ diag_packet_capture.php 2010-08-05 18:40:24.000000000 +0000
+@@ -266,6 +266,7 @@
<?php
system ("/usr/sbin/tcpdump $disabledns $detail -r $fp$fn");?>
-+
-+ conf_mount_ro();
-+
</textarea><?php
++ conf_mount_ro();
}
}?>
-@@ -277,8 +280,6 @@ include("head.inc"); ?>
+ </td>
+@@ -277,8 +278,6 @@
</td></tr></table>
<?php
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 3ce26d30..b9746cce 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -1061,7 +1061,7 @@
<descr>Patch to fix packet capture on 1.2.3 embedded (NanoBSD)</descr>
<category>System</category>
<config_file>http://www.pfsense.com/packages/config/packetcapturefix/packetcapturefix.xml</config_file>
- <version>0.1</version>
+ <version>0.2</version>
<status>BETA</status>
<required_version>1.2.3</required_version>
<maximum_version>1.2.3</maximum_version>