* updated sancp (1.6.1d -> 1.6.1)

* marked sancp stable
	* reworked sancp prelude support


git-svn-id: svn://svn.opensde.net/opensde/package/trunk@22001 10447126-35f2-4685-b0cf-6dd780d3921f

network/sancp/sancp.conf

@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../sancp/sancp.conf
+# Filename: package/.../sancp/sancp.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -10,36 +11,23 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 if [ "$prefix_auto" == 1 ]; then
         prefix=opt/sancp 
         set_confopt
 fi
 
+var_append makeopt ' ' "linux"
+
 makeinstopt=""
 
 pkg_sancp_prelude_prepatch() {
-	# creating a temporary directory 
-	tempdir=`mktemp -d`
-
-	# getting the full path of the original patch
-	orig_sancp_prelude_patch="`match_source_file -p prelude`"
-
-	# name of the patch we will include
-	sancp_prelude_patch="sancp-$ver-prelude-3.patch"
-
-	# removing "/root/" from the path of the effected files in the original patch
-	# and creating the sanitized patch in tempdir
-	sed -e "s/^\(\+\+\+\ \)\/root\//\1/g" $orig_sancp_prelude_patch > $tempdir/$sancp_prelude_patch 
-
-	# including the sanitized patch 
-	echo_status "Enabling Prelude-IDS Support by including ($sancp_prelude_patch)"
-	var_append patchfiles ' ' "$tempdir/$sancp_prelude_patch"
+	echo_status "Enabling Prelude-IDS Support"
+	var_append patchfiles ' ' "$confdir/*prelude*.diff"
 }
 
 pkg_sancp_premake() {
-
 	# adjusting default config file location 
 	sed -i "/CONFIG_DIR/s,/.*,$sysconfdir\"," sancp.h
 }

network/sancp/sancp.desc

@@ -25,22 +25,17 @@
 [T] must be validated through some means. Sancp uses rules to identify, record,
 [T] and tag traffic of interest.
   
-[U] http://www.metre.net/sancp.html 
+[U] http://www.metre.net/sancp.html
 
-[A] John Curry <[email protected]> 
-[M] Christian Wiese <jeru@ixplanet.org>
+[A] John Curry <[email protected]>
+[M] Christian Wiese <morfoh@opensde.org>
 
 [C] extra/security
 
-[L] OpenSource 
-
-[S] Beta 
-[V] 1.6.1d
+[L] QPL
+[S] Stable 
+[V] 1.6.1
 [P] X -----5---9 210.000
 
-[D] 3135059164 sancp-1.6.1.tar.gz http://sancp.sourceforge.net/ 
-[D] 732702543 sancp-1.6.1.fix200511.a.patch http://sancp.sourceforge.net/
-[D] 296217176 sancp-1.6.1.fix200511.b.patch http://sancp.sourceforge.net/
-[D] 3140914114 sancp-1.6.1.fix200601.c.patch http://sancp.sourceforge.net/
-[D] 3306561576 sancp-1.6.1.fix200606.d.patch http://sancp.sourceforge.net/
-[D] 3194366093 sancp-1.6.1-prelude-3.diff !https://trac.prelude-ids.org/attachment/ticket/91/sancp-1.6.1-prelude-3.diff?format=raw
+[D] 334908462 sancp-1.6.1-stable.tar.gz http://metre.net/files/
+#[D] 3194366093 sancp-1.6.1-prelude-3.diff !https://trac.prelude-ids.org/attachment/ticket/91/sancp-1.6.1-prelude-3.diff?format=raw