regenerate patches in order that the next commit is more

readable; no package change.
This commit is contained in:
sthen 2008-11-08 22:09:40 +00:00
parent 604917d4c4
commit c798e25019
6 changed files with 38 additions and 38 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_libnet_3,v 1.1 2005/05/23 23:50:40 msf Exp $
--- doc/libnet.3.orig Mon Mar 14 11:33:02 2005
+++ doc/libnet.3 Mon Mar 14 11:33:34 2005
@@ -19,7 +19,7 @@ supplementary and complementary function
$OpenBSD: patch-doc_libnet_3,v 1.2 2008/11/08 22:09:40 sthen Exp $
--- doc/libnet.3.orig Sun Feb 4 00:27:21 2001
+++ doc/libnet.3 Sat Nov 8 22:07:54 2008
@@ -19,7 +19,7 @@ supplementary and complementary functionality.
For a much more verbose treatment of libnet, including verbosely commented
examples, please see the online web-based documentation at

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/05/23 23:50:40 msf Exp $
--- src/libnet_if_addr.c.orig Mon Mar 14 11:25:21 2005
+++ src/libnet_if_addr.c Mon Mar 14 11:37:14 2005
@@ -64,7 +64,7 @@ libnet_ifaddrlist(register struct libnet
$OpenBSD: patch-src_libnet_if_addr_c,v 1.2 2008/11/08 22:09:40 sthen Exp $
--- src/libnet_if_addr.c.orig Sun Jan 7 18:55:16 2001
+++ src/libnet_if_addr.c Sat Nov 8 22:07:54 2008
@@ -64,7 +64,7 @@ libnet_ifaddrlist(register struct libnet_ifaddr_list *
fd = socket(AF_INET, SOCK_DGRAM, 0);
if (fd < 0)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/05/23 23:50:40 msf Exp $
return (-1);
}
ifc.ifc_len = sizeof(ibuf);
@@ -74,7 +74,7 @@ libnet_ifaddrlist(register struct libnet
@@ -74,7 +74,7 @@ libnet_ifaddrlist(register struct libnet_ifaddr_list *
SIOCGIFCONF,
(char *)&ifc) < 0 || ifc.ifc_len < sizeof(struct ifreq))
{
@ -19,7 +19,7 @@ $OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/05/23 23:50:40 msf Exp $
close(fd);
return (-1);
}
@@ -110,7 +110,7 @@ libnet_ifaddrlist(register struct libnet
@@ -110,7 +110,7 @@ libnet_ifaddrlist(register struct libnet_ifaddr_list *
if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0)
{
if (errno == ENXIO) continue;
@ -28,7 +28,7 @@ $OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/05/23 23:50:40 msf Exp $
"SIOCGIFFLAGS: %.*s: %s",
(int)sizeof(ifr.ifr_name),
ifr.ifr_name,
@@ -129,7 +129,7 @@ libnet_ifaddrlist(register struct libnet
@@ -129,7 +129,7 @@ libnet_ifaddrlist(register struct libnet_ifaddr_list *
device[sizeof(device) - 1] = '\0';
if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0)
{
@ -37,7 +37,7 @@ $OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/05/23 23:50:40 msf Exp $
close(fd);
return (-1);
}
@@ -170,12 +170,12 @@ libnet_select_device(struct sockaddr_in
@@ -170,12 +170,12 @@ libnet_select_device(struct sockaddr_in *sin, char **d
c = libnet_ifaddrlist(&address_list, err_buf);
if (c < 0)
{
@ -52,7 +52,7 @@ $OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/05/23 23:50:40 msf Exp $
return (-1);
}
if (*device)
@@ -189,7 +189,7 @@ libnet_select_device(struct sockaddr_in
@@ -189,7 +189,7 @@ libnet_select_device(struct sockaddr_in *sin, char **d
}
if (i <= 0)
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/05/23 23:50:40 msf Exp $
--- src/libnet_link_bpf.c.orig Mon Mar 14 11:23:41 2005
+++ src/libnet_link_bpf.c Mon Mar 14 11:37:47 2005
$OpenBSD: patch-src_libnet_link_bpf_c,v 1.2 2008/11/08 22:09:40 sthen Exp $
--- src/libnet_link_bpf.c.orig Mon Jan 8 01:13:48 2001
+++ src/libnet_link_bpf.c Sat Nov 8 22:07:54 2008
@@ -61,7 +61,7 @@ libnet_bpf_open(char *errbuf)
*/
for (i = 0;;i++)
@ -19,7 +19,7 @@ $OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/05/23 23:50:40 msf Exp $
}
return (fd);
}
@@ -104,7 +104,7 @@ libnet_open_link_interface(char *device,
@@ -104,7 +104,7 @@ libnet_open_link_interface(char *device, char *ebuf)
l = (struct libnet_link_int *)malloc(sizeof(*l));
if (!l)
{
@ -28,7 +28,7 @@ $OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/05/23 23:50:40 msf Exp $
#if (__DEBUG)
libnet_error(LN_ERR_CRITICAL, "bpf libnet_open_link_interface: malloc %s",
ll_strerror(errno));
@@ -125,13 +125,13 @@ libnet_open_link_interface(char *device,
@@ -125,13 +125,13 @@ libnet_open_link_interface(char *device, char *ebuf)
*/
if (ioctl(l->fd, BIOCVERSION, (caddr_t)&bv) < 0)
{
@ -44,7 +44,7 @@ $OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/05/23 23:50:40 msf Exp $
goto bad;
}
@@ -141,7 +141,7 @@ libnet_open_link_interface(char *device,
@@ -141,7 +141,7 @@ libnet_open_link_interface(char *device, char *ebuf)
strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
if (ioctl(l->fd, BIOCSETIF, (caddr_t)&ifr) == -1)
{
@ -53,7 +53,7 @@ $OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/05/23 23:50:40 msf Exp $
goto bad;
}
@@ -150,7 +150,7 @@ libnet_open_link_interface(char *device,
@@ -150,7 +150,7 @@ libnet_open_link_interface(char *device, char *ebuf)
*/
if (ioctl(l->fd, BIOCGDLT, (caddr_t)&v) == -1)
{
@ -62,7 +62,7 @@ $OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/05/23 23:50:40 msf Exp $
goto bad;
}
@@ -161,7 +161,7 @@ libnet_open_link_interface(char *device,
@@ -161,7 +161,7 @@ libnet_open_link_interface(char *device, char *ebuf)
#if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT)
if (ioctl(l->fd, BIOCSHDRCMPLT, &spoof_eth_src) == -1)
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_libnet_port_list_c,v 1.1 2005/05/23 23:50:40 msf Exp $
--- src/libnet_port_list.c.orig Mon Mar 14 11:26:27 2005
+++ src/libnet_port_list.c Mon Mar 14 11:28:58 2005
@@ -256,16 +256,18 @@ libnet_plist_chain_dump_string(struct li
$OpenBSD: patch-src_libnet_port_list_c,v 1.2 2008/11/08 22:09:40 sthen Exp $
--- src/libnet_port_list.c.orig Tue Dec 12 18:18:48 2000
+++ src/libnet_port_list.c Sat Nov 8 22:07:54 2008
@@ -256,16 +256,18 @@ libnet_plist_chain_dump_string(struct libnet_plist_cha
{
if (p->bport == p->eport)
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_libnet_resolve_c,v 1.1 2005/05/23 23:50:40 msf Exp $
--- src/libnet_resolve.c.orig Mon Mar 14 11:19:14 2005
+++ src/libnet_resolve.c Mon Mar 14 11:38:17 2005
$OpenBSD: patch-src_libnet_resolve_c,v 1.2 2008/11/08 22:09:40 sthen Exp $
--- src/libnet_resolve.c.orig Sun Jan 7 18:29:05 2001
+++ src/libnet_resolve.c Sat Nov 8 22:07:54 2008
@@ -35,10 +35,12 @@
#endif
#include "../include/libnet.h"
@ -15,7 +15,7 @@ $OpenBSD: patch-src_libnet_resolve_c,v 1.1 2005/05/23 23:50:40 msf Exp $
static u_short which;
u_char *p;
@@ -63,7 +65,8 @@ libnet_host_lookup(u_long in, u_short us
@@ -63,7 +65,8 @@ libnet_host_lookup(u_long in, u_short use_name)
{
p = (u_char *)&in;
@ -25,7 +25,7 @@ $OpenBSD: patch-src_libnet_resolve_c,v 1.1 2005/05/23 23:50:40 msf Exp $
(p[0] & 255), (p[1] & 255), (p[2] & 255), (p[3] & 255));
}
else if (use_name == LIBNET_RESOLVE)
@@ -91,13 +94,12 @@ libnet_host_lookup_r(u_long in, u_short
@@ -91,13 +94,12 @@ libnet_host_lookup_r(u_long in, u_short use_name, u_ch
{
p = (u_char *)&in;
@ -41,7 +41,7 @@ $OpenBSD: patch-src_libnet_resolve_c,v 1.1 2005/05/23 23:50:40 msf Exp $
}
}
@@ -175,7 +177,7 @@ libnet_get_ipaddr(struct libnet_link_int
@@ -175,7 +177,7 @@ libnet_get_ipaddr(struct libnet_link_int *l, const cha
fd = socket(PF_INET, SOCK_DGRAM, 0);
if (fd < 0)
{

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/31 14:03:28 steven Exp $
--- src/Makefile.in.orig Thu Mar 11 10:50:20 2004
+++ src/Makefile.in Mon May 23 23:36:28 2005
$OpenBSD: patch-src_Makefile_in,v 1.4 2008/11/08 22:09:40 sthen Exp $
--- src/Makefile.in.orig Thu Mar 11 18:50:20 2004
+++ src/Makefile.in Sat Nov 8 22:07:59 2008
@@ -43,10 +43,10 @@ datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
@ -14,7 +14,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/31 14:03:28 steven Exp $
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -109,8 +109,10 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
@@ -109,8 +109,10 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
DISTCLEANFILES = *~
@ -26,7 +26,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/31 14:03:28 steven Exp $
libnet_a_SOURCES = libnet_asn1.c \
libnet_build_802.1q.c \
libnet_build_802.1x.c \
@@ -203,6 +205,8 @@ am_libnet_a_OBJECTS = libnet_asn1.$(OBJE
@@ -203,6 +205,8 @@ am_libnet_a_OBJECTS = libnet_asn1.$(OBJEXT) \
libnet_raw.$(OBJEXT) libnet_resolve.$(OBJEXT) \
libnet_version.$(OBJEXT) libnet_write.$(OBJEXT)
libnet_a_OBJECTS = $(am_libnet_a_OBJECTS)
@ -35,7 +35,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/31 14:03:28 steven Exp $
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
@@ -226,7 +230,7 @@ SOURCES = $(libnet_a_SOURCES) $(EXTRA_li
@@ -226,7 +230,7 @@ SOURCES = $(libnet_a_SOURCES) $(EXTRA_libnet_a_SOURCES
all: all-am
.SUFFIXES:
@ -53,7 +53,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/31 14:03:28 steven Exp $
else :; fi; \
done
@@ -269,6 +271,10 @@ libnet.a: $(libnet_a_OBJECTS) $(libnet_a
@@ -269,6 +271,10 @@ libnet.a: $(libnet_a_OBJECTS) $(libnet_a_DEPENDENCIES)
$(libnet_a_AR) libnet.a $(libnet_a_OBJECTS) $(libnet_a_LIBADD)
$(RANLIB) libnet.a