cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- split libnet port into two versions

Browse Source 
- worked on by myself, pvalchev and mjc

"put it in" pvalchev@
This commit is contained in:
msf 2005-05-23 23:50:39 +00:00
parent 3f5db04dd0
commit 35989e5539
26 changed files with 252 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/libnet/1.0/Makefile Normal file
View File

@ -0,0 +1,14 @@
# $OpenBSD: Makefile,v 1.1 2005/05/23 23:50:39 msf Exp $
REVISION= 1.0
VERSION= ${REVISION}.2a
MASTER_SITES= http://www.packetfactory.net/libnet/dist/deprecated/
WRKDIST= ${WRKDIR}/Libnet-1.0.2a
post-install:
@ln -sf libnet-1.0/libnet.so.0.0 \
${PREFIX}/lib
.include <bsd.port.mk>

1
net/libnet/distinfo → net/libnet/1.0/distinfo
View File

@ -1,4 +1,3 @@
MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
RMD160 (libnet-1.0.2a.tar.gz) = 43dd2edc31e56b42792727b88d81342dc26d3308
SHA1 (libnet-1.0.2a.tar.gz) = 804eaf43bb90f93e505d46a9668c914a112bf136
SIZE (libnet-1.0.2a.tar.gz) = 140191

17
net/libnet/patches/patch-Makefile.in → net/libnet/1.0/patches/patch-Makefile.in
View File

@ -1,5 +1,16 @@
--- Makefile.in.orig Mon Feb 5 18:51:41 2001
+++ Makefile.in Mon Mar 14 11:18:27 2005
--- Makefile.in.orig Mon Feb 5 12:51:41 2001
+++ Makefile.in Fri Sep 10 16:04:46 2004
@@ -14,8 +14,8 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
srcdir = @srcdir@
BIN_PREFIX = @bindir@/
-INC_PREFIX = @includedir@/
-LIB_PREFIX = @libdir@/
+INC_PREFIX = @includedir@/libnet-1.0/
+LIB_PREFIX = @libdir@/libnet-1.0/
MAN_PREFIX = @MAN_PREFIX@
LIBNET = libnet
@@ -36,7 +36,7 @@ AR = @AR@
LN = @LN@
CC = @CC@
@ -80,7 +91,7 @@
+ $(INSTALL_DATA) -m 0644 $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+ $(INSTALL_DATA) -m 0644 $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+ $(INSTALL_DATA) -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)
+ $(INSTALL_DATA) -m 0755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+ $(INSTALL_DATA) -m 0755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)/libnet-config-1.0

8
net/libnet/patches/patch-configure.in → net/libnet/1.0/patches/patch-configure.in
View File

@ -1,12 +1,12 @@
--- configure.in.orig Wed Jan 17 21:59:30 2001
+++ configure.in Mon Mar 14 11:18:27 2005
--- configure.in.orig Wed Jan 17 15:59:30 2001
+++ configure.in Wed Sep 22 16:09:21 2004
@@ -33,6 +33,9 @@ AC_PREFIX_DEFAULT(/usr)
if test "$prefix" = "NONE"; then
prefix="/usr"
+else
+ LIBNET_CONFIG_CFLAGS="-I${prefix}/include"
+ LIBNET_CONFIG_LIBS="-L${prefix}/lib"
+ LIBNET_CONFIG_CFLAGS="-I${prefix}/include/libnet-1.0"
+ LIBNET_CONFIG_LIBS="-L${prefix}/lib/libnet-1.0"
fi
dnl

2
net/libnet/patches/patch-doc_libnet_3 → net/libnet/1.0/patches/patch-doc_libnet_3
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-doc_libnet_3,v 1.1 2005/03/14 14:04:18 espie Exp $
$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

2
net/libnet/patches/patch-include_libnet_h → net/libnet/1.0/patches/patch-include_libnet_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-include_libnet_h,v 1.1 2003/12/31 13:33:11 espie Exp $
$OpenBSD: patch-include_libnet_h,v 1.1 2005/05/23 23:50:40 msf Exp $
--- include/libnet.h.orig 2003-12-31 14:25:53.000000000 +0100
+++ include/libnet.h 2003-12-31 14:26:14.000000000 +0100
@@ -84,9 +84,9 @@

2
net/libnet/patches/patch-src_libnet_if_addr_c → net/libnet/1.0/patches/patch-src_libnet_if_addr_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_libnet_if_addr_c,v 1.1 2005/03/14 14:04:18 espie Exp $
$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

2
net/libnet/patches/patch-src_libnet_link_bpf_c → net/libnet/1.0/patches/patch-src_libnet_link_bpf_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_libnet_link_bpf_c,v 1.1 2005/03/14 14:04:18 espie Exp $
$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
@@ -61,7 +61,7 @@ libnet_bpf_open(char *errbuf)

2
net/libnet/patches/patch-src_libnet_port_list_c → net/libnet/1.0/patches/patch-src_libnet_port_list_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_libnet_port_list_c,v 1.1 2005/03/14 14:04:18 espie Exp $
$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

2
net/libnet/patches/patch-src_libnet_resolve_c → net/libnet/1.0/patches/patch-src_libnet_resolve_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_libnet_resolve_c,v 1.1 2005/03/14 14:04:18 espie Exp $
$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
@@ -35,10 +35,12 @@

0
net/libnet/pkg/DESCR → net/libnet/1.0/pkg/DESCR
View File

3
net/libnet/1.0/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2005/05/23 23:50:40 msf Exp $
@lib lib/libnet-1.0/libnet.so.0.0
@lib lib/libnet.so.0.0

17
net/libnet/1.0/pkg/PLIST Normal file
View File

@ -0,0 +1,17 @@
@comment $OpenBSD: PLIST,v 1.1 2005/05/23 23:50:40 msf Exp $
@option no-default-conflict
%%SHARED%%
bin/libnet-config-1.0
include/libnet-1.0/
include/libnet-1.0/libnet/
include/libnet-1.0/libnet.h
include/libnet-1.0/libnet/libnet-asn1.h
include/libnet-1.0/libnet/libnet-functions.h
include/libnet-1.0/libnet/libnet-headers.h
include/libnet-1.0/libnet/libnet-macros.h
include/libnet-1.0/libnet/libnet-ospf.h
include/libnet-1.0/libnet/libnet-structures.h
lib/libnet-1.0/
lib/libnet-1.0/libnet.a
lib/libnet-1.0/libpwrite.a
@man man/man3/libnet.3

19
net/libnet/1.1/Makefile Normal file
View File

@ -0,0 +1,19 @@
# $OpenBSD: Makefile,v 1.1 2005/05/23 23:50:40 msf Exp $
REVISION= 1.1
VERSION= ${REVISION}.2.1
WRKDIST= ${WRKDIR}/libnet
MASTER_SITES= http://www.packetfactory.net/libnet/dist/
AUTOCONF_VERSION= 2.59
SHLIB_VERSION= 11.0
MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/libnet-config \
${PREFIX}/bin/libnet-config-1.1
@ln -sf libnet-${REVISION}/libnet.so.${SHLIB_VERSION} \
${PREFIX}/lib
.include <bsd.port.mk>

3
net/libnet/1.1/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (libnet-1.1.2.1.tar.gz) = be845c41170d72c7db524f3411b50256
RMD160 (libnet-1.1.2.1.tar.gz) = 2d8d87930d09a74ab369bd7c240af4b5426ae380
SHA1 (libnet-1.1.2.1.tar.gz) = 760783a2adbd845b731e2000aafa3cd9c3b028d5

16
net/libnet/1.1/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
--- Makefile.in.orig Thu Mar 11 13:50:20 2004
+++ Makefile.in Fri Sep 10 12:22:20 2004
@@ -43,10 +43,10 @@ datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
-libdir = @libdir@
+libdir = @libdir@/libnet-1.1
infodir = @infodir@
mandir = @mandir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@

16
net/libnet/1.1/patches/patch-include_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-include_Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
--- include/Makefile.in.orig Thu Mar 11 13:50:20 2004
+++ include/Makefile.in Fri Sep 10 12:22:44 2004
@@ -37,10 +37,10 @@ datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
-libdir = @libdir@
+libdir = @libdir@/libnet-1.1
infodir = @infodir@
mandir = @mandir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@

12
net/libnet/1.1/patches/patch-include_libnet_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-include_libnet_Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
--- include/libnet/Makefile.in.orig Fri Sep 10 14:02:13 2004
+++ include/libnet/Makefile.in Fri Sep 10 14:02:26 2004
@@ -40,7 +40,7 @@ localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@

76
net/libnet/1.1/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,76 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
--- src/Makefile.in.orig Thu Mar 11 11:50:20 2004
+++ src/Makefile.in Sat Oct 23 13:21:53 2004
@@ -43,10 +43,10 @@ datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
-libdir = @libdir@
+libdir = @libdir@/libnet-1.1
infodir = @infodir@
mandir = @mandir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -109,8 +109,10 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
DISTCLEANFILES = *~
-lib_LIBRARIES = libnet.a
+SHLIB= libnet.so.$(SHLIB_VERSION)
+lib_LIBRARIES = libnet.a $(SHLIB)
+
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
libnet_raw.$(OBJEXT) libnet_resolve.$(OBJEXT) \
libnet_version.$(OBJEXT) libnet_write.$(OBJEXT)
libnet_a_OBJECTS = $(am_libnet_a_OBJECTS)
+SHOBJECTS= $(am_libnet_a_OBJECTS:S/.o/.so/)
+PICFLAG= -fPIC
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
@@ -226,7 +230,7 @@ SOURCES = $(libnet_a_SOURCES) $(EXTRA_li
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .o .obj
+.SUFFIXES: .c .o .so .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign src/Makefile
@@ -249,8 +253,6 @@ install-libLIBRARIES: $(lib_LIBRARIES)
@list='$(lib_LIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
- $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
@@ -269,6 +271,10 @@ libnet.a: $(libnet_a_OBJECTS) $(libnet_a
$(libnet_a_AR) libnet.a $(libnet_a_OBJECTS) $(libnet_a_LIBADD)
$(RANLIB) libnet.a
+$(SHLIB): $(SHOBJECTS) $(libnet_a_DEPENDENCIES)
+ -rm -f $(SHLIB)
+ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SHOBJECTS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -277,6 +283,9 @@ distclean-compile:
.c.o:
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.so:
+ $(COMPILE) $(PICFLAG) -DPIC -c `test -f '$<' || echo '$(srcdir)/'`$< -o $@
.c.obj:
$(COMPILE) -c `cygpath -w $<`

1
net/libnet/1.1/pkg/DESCR Normal file
View File

@ -0,0 +1 @@
Raw IP packet construction library.

3
net/libnet/1.1/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2005/05/23 23:50:40 msf Exp $
@lib lib/libnet-1.1/libnet.so.11.0
@lib lib/libnet.so.11.0

16
net/libnet/1.1/pkg/PLIST Normal file
View File

@ -0,0 +1,16 @@
@comment $OpenBSD: PLIST,v 1.1 2005/05/23 23:50:40 msf Exp $
@option no-default-conflict
@conflict libnet-1.1->=1.1
%%SHARED%%
bin/libnet-config-1.1
include/libnet-1.1/
include/libnet-1.1/libnet/
include/libnet-1.1/libnet.h
include/libnet-1.1/libnet/libnet-asn1.h
include/libnet-1.1/libnet/libnet-functions.h
include/libnet-1.1/libnet/libnet-headers.h
include/libnet-1.1/libnet/libnet-macros.h
include/libnet-1.1/libnet/libnet-structures.h
include/libnet-1.1/libnet/libnet-types.h
lib/libnet-1.1/
lib/libnet-1.1/libnet.a

34
net/libnet/Makefile
View File

@ -1,32 +1,6 @@
# $OpenBSD: Makefile,v 1.30 2005/03/14 14:04:18 espie Exp $
# $OpenBSD: Makefile,v 1.31 2005/05/23 23:50:39 msf Exp $
COMMENT= "raw IP packet construction library"
SUBDIR += 1.0
SUBDIR += 1.1
DISTNAME= libnet-1.0.2a
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
MASTER_SITES= http://www.packetfactory.net/libnet/dist/deprecated/
HOMEPAGE= http://www.packetfactory.net/projects/libnet/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= autoconf no-autoheader
WRKDIST= ${WRKDIR}/Libnet-1.0.2a
REGRESS_TARGET= test
REGRESS_IS_INTERACTIVE= Yes
post-regress:
@cd ${WRKSRC}/test; ${SUDO} ./test-step.sh
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
MAKE_ENV+= NO_SHARED_LIBS=Yes
.endif
.include <bsd.port.subdir.mk>

28
net/libnet/Makefile.inc Normal file
View File

@ -0,0 +1,28 @@
# $OpenBSD: Makefile.inc,v 1.1 2005/05/23 23:50:39 msf Exp $
COMMENT= "raw IP packet construction library"
DISTNAME= libnet-${VERSION}
CATEGORIES= net
HOMEPAGE= http://www.packetfactory.net/projects/libnet/
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= autoconf no-autoheader
REGRESS_TARGET= test
REGRESS_IS_INTERACTIVE= Yes
post-regress:
@cd ${WRKSRC}/test; ${SUDO} ./test-step.sh
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"
MAKE_ENV+= NO_SHARED_LIBS=Yes
.endif

2
net/libnet/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:17:41 espie Exp $
@lib lib/libnet.so.0.0

14
net/libnet/pkg/PLIST
View File

@ -1,14 +0,0 @@
@comment $OpenBSD: PLIST,v 1.8 2004/09/15 18:17:41 espie Exp $
bin/libnet-config
include/libnet/
include/libnet.h
include/libnet/libnet-asn1.h
include/libnet/libnet-functions.h
include/libnet/libnet-headers.h
include/libnet/libnet-macros.h
include/libnet/libnet-ospf.h
include/libnet/libnet-structures.h
lib/libnet.a
lib/libpwrite.a
@man man/man3/libnet.3
%%SHARED%%