(racoon2 52) racoon2 patch for libpcap issue

--=-1bru8izlqBjMgdbf3m6+
Content-Type: multipart/mixed; boundary="=-MnMHIcTBoiNDVC6PAkBg"


--=-MnMHIcTBoiNDVC6PAkBg
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

I had meant to send this a while back and simply forgot.  I had an issue
compiling racoon2 on my system with libpcap 0.8.2.  Here's the patch and
patch description:

racoon2-20051102a-pcap-collision.patch
	Fixes a namespace collision with libpcap 0.8.2.  A variable
	named "pcap_file" used in main.c is also the name of a libpcap
	function, causing the compiler to error on redefinition.
	This variable has been renamed to "pcfile"


--=20
Dustin D. Trammell
Vulnerability Researcher
Sipera Systems Inc. http://www.sipera.com

--=-MnMHIcTBoiNDVC6PAkBg
Content-Disposition: attachment; filename=racoon2-20051102a-pcap-collision.patch
Content-Type: text/x-patch; name=racoon2-20051102a-pcap-collision.patch;
	charset=us-ascii
Content-Transfer-Encoding: base64

ZGlmZiAtcmMgcmFjb29uMi0yMDA1MTEwMmEvaWtlZC9tYWluLmMgcmFjb29uMi0yMDA1MTEwMmEt
bW9kL2lrZWQvbWFpbi5jDQoqKiogcmFjb29uMi0yMDA1MTEwMmEvaWtlZC9tYWluLmMJMjAwNS0x
MC0xOCAwNzo1NDoyOC4wMDAwMDAwMDAgLTA1MDANCi0tLSByYWNvb24yLTIwMDUxMTAyYS1tb2Qv
aWtlZC9tYWluLmMJMjAwNS0xMS0xNiAxNDozMzoxNi4wMDAwMDAwMDAgLTA2MDANCioqKioqKioq
KioqKioqKg0KKioqIDY3LDczICoqKioNCiAgaW50IG9wdF9pcHY2X29ubHkgPSBGQUxTRTsNCiAg
aW50IGlzYWttcF9wb3J0ID0gSUtFVjJfVURQX1BPUlQ7DQogICNpZmRlZiBIQVZFX0xJQlBDQVAN
CiEgY2hhciAqcGNhcF9maWxlID0gTlVMTDsNCiAgI2VuZGlmDQogIA0KICAjZGVmaW5lCURFQlVH
X0ZMQUdfREVCVUcJMHgwMDAxDQotLS0gNjcsNzMgLS0tLQ0KICBpbnQgb3B0X2lwdjZfb25seSA9
IEZBTFNFOw0KICBpbnQgaXNha21wX3BvcnQgPSBJS0VWMl9VRFBfUE9SVDsNCiAgI2lmZGVmIEhB
VkVfTElCUENBUA0KISBjaGFyICpwY19maWxlID0gTlVMTDsNCiAgI2VuZGlmDQogIA0KICAjZGVm
aW5lCURFQlVHX0ZMQUdfREVCVUcJMHgwMDAxDQoqKioqKioqKioqKioqKioNCioqKiAyMjUsMjMx
ICoqKioNCiAgCQkJYnJlYWs7DQogICNpZmRlZiBIQVZFX0xJQlBDQVANCiAgCQljYXNlICdQJzoN
CiEgCQkJcGNhcF9maWxlID0gb3B0YXJnOw0KICAJCQlicmVhazsNCiAgI2VuZGlmDQogIAkJY2Fz
ZSAnOic6CS8qIG9wdGlvbiByZXF1aXJlcyBhcmd1bWVudCAqLw0KLS0tIDIyNSwyMzEgLS0tLQ0K
ICAJCQlicmVhazsNCiAgI2lmZGVmIEhBVkVfTElCUENBUA0KICAJCWNhc2UgJ1AnOg0KISAJCQlw
Y19maWxlID0gb3B0YXJnOw0KICAJCQlicmVhazsNCiAgI2VuZGlmDQogIAkJY2FzZSAnOic6CS8q
IG9wdGlvbiByZXF1aXJlcyBhcmd1bWVudCAqLw0KKioqKioqKioqKioqKioqDQoqKiogMzU1LDM2
NyAqKioqDQogIAl7DQogIAkJY2hhciAqZHVtcF9maWxlOw0KICAJCWNoYXIgKmR1bXBfbW9kZTsN
CiEgCQlpZiAocGNhcF9maWxlICE9IE5VTEwpIHsNCiEgCQkJaWYgKHBjYXBfZmlsZVswXSA9PSAn
KycpIHsNCiAgCQkJCWR1bXBfbW9kZSA9ICJhIjsNCiEgCQkJCWR1bXBfZmlsZSA9IHBjYXBfZmls
ZSArIDE7DQogIAkJCX0gZWxzZSB7DQogIAkJCQlkdW1wX21vZGUgPSAidyI7DQohIAkJCQlkdW1w
X2ZpbGUgPSBwY2FwX2ZpbGU7DQogIAkJCX0NCiAgCQkJaWYgKHJjX3BjYXBfaW5pdChkdW1wX2Zp
bGUsIGR1bXBfbW9kZSkpIHsNCiAgCQkJCXBsb2coUExPR19DUklUSUNBTCwgUExPR0xPQywgMCwN
Ci0tLSAzNTUsMzY3IC0tLS0NCiAgCXsNCiAgCQljaGFyICpkdW1wX2ZpbGU7DQogIAkJY2hhciAq
ZHVtcF9tb2RlOw0KISAJCWlmIChwY19maWxlICE9IE5VTEwpIHsNCiEgCQkJaWYgKHBjX2ZpbGVb
MF0gPT0gJysnKSB7DQogIAkJCQlkdW1wX21vZGUgPSAiYSI7DQohIAkJCQlkdW1wX2ZpbGUgPSBw
Y19maWxlICsgMTsNCiAgCQkJfSBlbHNlIHsNCiAgCQkJCWR1bXBfbW9kZSA9ICJ3IjsNCiEgCQkJ
CWR1bXBfZmlsZSA9IHBjX2ZpbGU7DQogIAkJCX0NCiAgCQkJaWYgKHJjX3BjYXBfaW5pdChkdW1w
X2ZpbGUsIGR1bXBfbW9kZSkpIHsNCiAgCQkJCXBsb2coUExPR19DUklUSUNBTCwgUExPR0xPQywg
MCwNCg==


--=-MnMHIcTBoiNDVC6PAkBg--

--=-1bru8izlqBjMgdbf3m6+
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQBDvtfFiJrIfB1nTHwRAs/KAJ9cN3AtppU3kMbY6/uCVg9lu6wQDACeLyBb
+KnX0xrEd+8LpSbZYfoswoQ=
=zmdu
-----END PGP SIGNATURE-----

--=-1bru8izlqBjMgdbf3m6+--