From 43f0d5031db2a43ecdbee6f7dfda75cef6d4f56e Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@wildernessvoice.com>
Date: Tue, 24 Nov 2015 23:17:00 -0800
Subject: Added apache 2 license verbage

Change-Id: I6a0b484496f7f3ba77c3584f5ab5a1acf353b298
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
---
 framework/src/suricata/scripts/setup-app-layer-detect.sh | 6 ++++--
 framework/src/suricata/scripts/setup-app-layer-logger.sh | 8 +++++---
 framework/src/suricata/scripts/setup-app-layer.sh        | 6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'framework/src/suricata/scripts')

diff --git a/framework/src/suricata/scripts/setup-app-layer-detect.sh b/framework/src/suricata/scripts/setup-app-layer-detect.sh
index ef3b741e..ef4bccaa 100755
--- a/framework/src/suricata/scripts/setup-app-layer-detect.sh
+++ b/framework/src/suricata/scripts/setup-app-layer-detect.sh
@@ -34,9 +34,11 @@ function copy_template_file() {
 
     echo "Creating ${dst}."
 
-    sed -e "s/TEMPLATE/${protoname_upper}/g" \
+    sed -e '/TEMPLATE_START_REMOVE/,/TEMPLATE_END_REMOVE/d' \
+	-e "s/TEMPLATE/${protoname_upper}/g" \
 	-e "s/template/${protoname_lower}/g" \
-	-e "s/Template/${protoname}/g" > ${dst} < ${src}
+	-e "s/Template/${protoname}/g" \
+	> ${dst} < ${src}
 }
 
 function copy_templates() {
diff --git a/framework/src/suricata/scripts/setup-app-layer-logger.sh b/framework/src/suricata/scripts/setup-app-layer-logger.sh
index be32c393..13342412 100755
--- a/framework/src/suricata/scripts/setup-app-layer-logger.sh
+++ b/framework/src/suricata/scripts/setup-app-layer-logger.sh
@@ -38,9 +38,11 @@ function copy_template_file() {
 
     echo "Creating ${dst}."
     
-    sed -e "s/TEMPLATE/${protoname_upper}/g" \
+    sed -e '/TEMPLATE_START_REMOVE/,/TEMPLATE_END_REMOVE/d' \
+	-e "s/TEMPLATE/${protoname_upper}/g" \
 	-e "s/template/${protoname_lower}/g" \
-	-e "s/Template/${protoname}/g" > ${dst} < ${src}
+	-e "s/Template/${protoname}/g" \
+	> ${dst} < ${src}
 }
 
 function copy_templates() {
@@ -62,7 +64,7 @@ function patch_makefile_am() {
     ed -s ${filename} > /dev/null <<EOF
 /output-json-template.c
 t-
-s/template/${protoname_lower}/
+s/template/${protoname_lower}/g
 w
 EOF
 }
diff --git a/framework/src/suricata/scripts/setup-app-layer.sh b/framework/src/suricata/scripts/setup-app-layer.sh
index b24b5e61..2789f20d 100755
--- a/framework/src/suricata/scripts/setup-app-layer.sh
+++ b/framework/src/suricata/scripts/setup-app-layer.sh
@@ -37,9 +37,11 @@ function copy_template_file() {
 
     echo "Creating ${dst}."
     
-    sed -e "s/TEMPLATE/${protoname_upper}/g" \
+    sed -e '/TEMPLATE_START_REMOVE/,/TEMPLATE_END_REMOVE/d' \
+	-e "s/TEMPLATE/${protoname_upper}/g" \
 	-e "s/template/${protoname_lower}/g" \
-	-e "s/Template/${protoname}/g" > ${dst} < ${src}
+	-e "s/Template/${protoname}/g" \
+	> ${dst} < ${src}
 }
 
 function copy_app_layer_templates {
-- 
cgit 1.2.3-korg