rmccurdy# uname -a
FreeBSD rmccurdy.no-ip.com 6.0-SECURITY FreeBSD 6.0-SECURITY #0: Tue Apr 18 08:56:09 UTC 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
rmccurdy# cvs -d:pserver:anonymous@cvs.snort.org:/cvsroot co snort
rmccurdy# bash -x ./patchsnort.sh ./src/
+ snortpath=./src/
+ '[' ./src/ = '' ']'
+ snortversion=n
+ '[' -r ./src//snort.c ']'
+ '[' -r ./src//twofish.c ']'
+ snortversion=1.8
+ case ${snortversion} in
+ echo 'Patching Snort version 1.8...'
Patching Snort version 1.8...
+ cp snortpatchb ./src/
+ cp snortpatch8 ./src/
+ cd ./src/
+ patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN snort/src/output-plugins/spo_alert_fwsam.c snort-patched/src/output-plugins/spo_alert_fwsam.c
|--- snort/src/output-plugins/spo_alert_fwsam.c Wed Dec 31 18:00:00 1969
|+++ snort-patched/src/output-plugins/spo_alert_fwsam.c Mon Sep 27 00:05:29 2004
--------------------------
(Creating file spo_alert_fwsam.c...)
Patching file spo_alert_fwsam.c using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN snort/src/output-plugins/spo_alert_fwsam.h snort-patched/src/output-plugins/spo_alert_fwsam.h
|--- snort/src/output-plugins/spo_alert_fwsam.h Wed Dec 31 18:00:00 1969
|+++ snort-patched/src/output-plugins/spo_alert_fwsam.h Mon Sep 27 00:05:23 2004
--------------------------
(Creating file spo_alert_fwsam.h...)
Patching file spo_alert_fwsam.h using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN snort/src/twofish.c snort-patched/src/twofish.c
|--- snort/src/twofish.c Wed Dec 31 18:00:00 1969
|+++ snort-patched/src/twofish.c Sun Sep 26 21:54:35 2004
--------------------------
(Creating file twofish.c...)
Patching file twofish.c using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN snort/src/twofish.h snort-patched/src/twofish.h
|--- snort/src/twofish.h Wed Dec 31 18:00:00 1969
|+++ snort-patched/src/twofish.h Sun Sep 26 21:54:35 2004
--------------------------
(Creating file twofish.h...)
Patching file twofish.h using Plan A...
Hunk #1 succeeded at 1.
done
+ patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN snort/plugbase.c snort-patched/plugbase.c
|--- snort/plugbase.c Tue Apr 23 18:44:53 2002
|+++ snort-patched/plugbase.c Fri Oct 25 15:13:02 2002
--------------------------
Patching file plugbase.c using Plan A...
Hunk #1 failed at 105.
1 out of 1 hunks failed--saving rejects to plugbase.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN snort/plugbase.h snort-patched/plugbase.h
|--- snort/plugbase.h Mon Jun 3 09:31:29 2002
|+++ snort-patched/plugbase.h Sun Oct 13 00:28:22 2002
--------------------------
Patching file plugbase.h using Plan A...
Hunk #1 failed at 67.
1 out of 1 hunks failed--saving rejects to plugbase.h.rej
done
+ echo '#define PLUGIN_FWSAM 27'
+ rm snortpatchb snortpatch8
+ rm spo_alert_fwsam.c.orig spo_alert_fwsam.h.orig twofish.c.orig twofish.h.orig
+ echo '/* Dummy util.h file created by SnortSam patch */'
+ echo 'Patching Makefiles...'
Patching Makefiles...
+ mv Makefile.in Makefile.in.bak
mv: rename Makefile.in to Makefile.in.bak: No such file or directory
+ cat Makefile.in.bak
+ sed 's/plugbase\.c/plugbase\.c\ twofish\.c\ twofish\.h\ spo_alert_fwsam\.c\ spo_alert_fwsam\.h/'
+ sed 's/plugbase\.o/plugbase\.o\ twofish\.o\ spo_alert_fwsam\.o/'
cat: Makefile.in.bak+ sed 's/plugbase\...OBJEXT./plugbase\.${OBJEXT}\ twofish\.${OBJEXT}\ spo_alert_fwsam\.${OBJEXT}/'
: No such file or directory
+ mv Makefile.am Makefile.am.bak
+ cat Makefile.am.bak
+ sed 's/plugbase\.c/plugbase\.c\ twofish\.c\ twofish\.h\ spo_alert_fwsam\.c\ spo_alert_fwsam\.h/'
+ sed 's/plugbase\.o/plugbase\.o\ twofish\.o\ spo_alert_fwsam\.o/'
+ sed 's/plugbase\...OBJEXT./plugbase\.${OBJEXT}\ twofish\.${OBJEXT}\ spo_alert_fwsam\.${OBJEXT}/'
+ echo Done
Done