[honeyd] patch adjustment

[Peter Vrabec]

commit 4f35e9eb15597215df38e1534dfb45ee01e66f9b
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Wed Sep 22 13:42:40 2010 +0200

    patch adjustment

 honeyd-1.5c-gcc.patch |   21 +++++----------------
 honeyd.spec           |    5 ++++-
 2 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/honeyd-1.5c-gcc.patch b/honeyd-1.5c-gcc.patch
index f0cc958..59a985a 100644
--- a/honeyd-1.5c-gcc.patch
+++ b/honeyd-1.5c-gcc.patch
@@ -1,18 +1,7 @@
 diff -up honeyd-1.5c/arpd/arpd.c.gcc honeyd-1.5c/arpd/arpd.c
 --- honeyd-1.5c/arpd/arpd.c.gcc	2003-02-09 05:20:40.000000000 +0100
-+++ honeyd-1.5c/arpd/arpd.c	2008-07-22 17:09:17.000000000 +0200
-@@ -7,6 +7,10 @@
-  * $Id: honeyd-1.5c-gcc.patch,v 1.1 2008/08/11 16:11:01 pvrabec Exp $
-  */
- 
-+/*
-+ * Modified by Calin Radoni to compile with gcc version 4.0.0 20050519 (RedHat 4.0.0-8)
-+ */
-+
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -265,8 +269,8 @@ arpd_send(eth_t *eth, int op,
++++ honeyd-1.5c/arpd/arpd.c	2010-09-22 13:29:20.867293388 +0200
+@@ -265,8 +265,8 @@ arpd_send(eth_t *eth, int op,
  	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);
  	
  	if (op == ARP_OP_REQUEST) {
@@ -23,7 +12,7 @@ diff -up honeyd-1.5c/arpd/arpd.c.gcc honeyd-1.5c/arpd/arpd.c
  	} else if (op == ARP_OP_REPLY) {
  		syslog(LOG_INFO, "arp reply %s is-at %s",
  		    addr_ntoa(spa), addr_ntoa(sha));
-@@ -282,7 +286,7 @@ arpd_lookup(struct addr *addr)
+@@ -282,7 +282,7 @@ arpd_lookup(struct addr *addr)
  	int error;
  
  	if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
@@ -32,7 +21,7 @@ diff -up honeyd-1.5c/arpd/arpd.c.gcc honeyd-1.5c/arpd/arpd.c
  		    addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
  		return (0);
  	}
-@@ -291,10 +295,10 @@ arpd_lookup(struct addr *addr)
+@@ -291,10 +291,10 @@ arpd_lookup(struct addr *addr)
  	error = arp_get(arpd_arp, &arpent);
  	
  	if (error == -1) {
@@ -46,7 +35,7 @@ diff -up honeyd-1.5c/arpd/arpd.c.gcc honeyd-1.5c/arpd/arpd.c
  		    addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
  	}
  	return (error);
-@@ -423,7 +427,7 @@ arpd_recv_cb(u_char *u, const struct pca
+@@ -423,7 +423,7 @@ arpd_recv_cb(u_char *u, const struct pca
  		if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
  			addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
  			    ethip->ar_sha, ETH_ADDR_LEN);
diff --git a/honeyd.spec b/honeyd.spec
index 2721295..98d010e 100644
--- a/honeyd.spec
+++ b/honeyd.spec
@@ -1,7 +1,7 @@
 Summary: Honeypot daemon
 Name: honeyd
 Version: 1.5c
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and BSD
 Group: Applications/Internet
 URL: http://www.honeyd.org/
@@ -112,6 +112,9 @@ fi
 %{_mandir}/man8/farpd.8*
 
 %changelog
+* Wed Sep 22 2010 Peter Vrabec <pvrabec at redhat.com> 1.5c-11
+- rebuild
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1.5c-10
 - recompiling .py files against Python 2.7 (rhbz#623317)