removed conflicting libpcap spec file, really ready for 3.91 release I hope

2026-01-05 22:19:03 +00:00 · 2005-09-11 11:21:38 +00:00
parent e93e746aa4
commit df0dd19d10
146 changed files with 794 additions and 104 deletions
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,13 +1,13 @@

 CC=gcc
 CPP=g++
-INCLUDE_FLAGS= -I.. -I../nbase -I../libpcap-possiblymodified
-LINK_FLAGS=-L.. -L../nbase -L../libpcap-possiblymodified
+INCLUDE_FLAGS= -I.. -I../nbase -I../libpcap
+LINK_FLAGS=-L.. -L../nbase -L../libpcap
 NMAP_OBJS=../osscan.o ../nmap_error.o ../utils.o ../tcpip.o ../output.o ../nmap.o ../scan_engine.o ../portlist.o ../timing.o ../nmap_rpc.o ../charpool.o ../services.o ../targets.o ../idle_scan.o ../MACLookup.o ../protocols.o ../FingerPrintResults.o ../NmapOps.o ../TargetGroup.o ../Target.o ../NmapOutputTable.o ../service_scan.o ../nsock/src/libnsock.a
 DEFINES=-DHAVE_CONFIG_H=1
 DATAFILES = nmap-os-fingerprints nmap-service-probes nmap-services nmap-rpc nmap-protocols nmap-mac-prefixes
 SHTOOL = ../shtool
-LIBPCAPDIR=libpcap-possiblymodified
+LIBPCAPDIR=libpcap
 NBASEDIR=nbase

 all: fingermatch fingerdiff servicematch
@@ -83,34 +83,43 @@ distro:
                    /usr/tmp/nmap-$(NMAP_VERSION)/mswin32

 	$(SHTOOL) mkdir /usr/tmp/nmap-$(NMAP_VERSION)/$(LIBPCAPDIR)
-	cd ../$(LIBPCAPDIR); cp -ra --parents SUNOS4/nit_if.o.sparc \
-           SUNOS4/nit_if.o.sun3 SUNOS4/nit_if.o.sun4c.4.0.3c CHANGES \
-           CREDITS FILES INSTALL.txt LICENSE Makefile.in \
-           NMAP_MODIFICATIONS README README.aix README.linux \
-           README.tru64 TODO VERSION acconfig.h aclocal.m4 \
-           arcnet.h bpf_dump.c bpf_image.c config.guess config.h.in \
-           config.sub configure configure.ac etherent.c ethertype.h gencode.c \
-           gencode.h grammar.y inet.c install-sh llc.h mkdep nametoaddr.c \
-           nlpid.h optimize.c pcap-bpf.c pcap-dlpi.c pcap-enet.c pcap-int.h \
-           pcap-linux.c pcap-namedb.h pcap-nit.c pcap-nit.h pcap-null.c \
-           pcap-pf.c pcap-pf.h pcap-snit.c pcap-snoop.c pcap.3 pcap.c pcap.h \
-           ppp.h savefile.c scanner.c scanner.l sll.h tokdefs.h \
-           bpf/net/bpf_filter.c bpf/net/bpf.h lbl/os-aix4.h lbl/os-osf4.h \
-           lbl/os-solaris2.h lbl/os-sunos4.h lbl/os-ultrix4.h lbl/os-hpux11.h \
-           lbl/os-osf5.h atmuni31.h config.h fad-getad.c fad-gifc.c \
-           fad-glifc.c fad-null.c fad-win32.c pcap-bpf.h pcap-dag.c \
-           pcap-dag.h version.h grammar.c pcap-stdinc.h pcap-win32.c pf.h \
-           rawss7.h README.dag README.hpux README.Win32 snprintf.c \
-           sunatmpos.h Win32/Include/addrinfo.h Win32/Include/Gnuc.h \
-           Win32/Include/arpa/nameser.h Win32/Include/net/if.h \
-           Win32/Include/net/netdb.h Win32/Include/net/paths.h \
-           Win32/Include/bittypes.h Win32/Include/cdecl_ext.h \
-           Win32/Include/inetprivate.h Win32/Include/ip6_misc.h \
-           Win32/Include/sockstorage.h Win32/Prj/libpcap.dsp \
-           Win32/Prj/libpcap.dsw Win32/Src/getnetbynm.c Win32/Src/ffs.c \
-           Win32/Src/getaddrinfo.c Win32/Src/getnetent.c Win32/Src/getopt.c \
-           Win32/Src/getservent.c Win32/Src/inet_aton.c Win32/Src/inet_net.c \
-           Win32/Src/inet_pton.c /usr/tmp/nmap-$(NMAP_VERSION)/$(LIBPCAPDIR)
+	cd ../$(LIBPCAPDIR); cp -ra --parents acconfig.h aclocal.m4 arcnet.h \
+            atmuni31.h bpf/net/bpf.h bpf/net/bpf_filter.c \
+            bpf_dump.c bpf_image.c CHANGES \
+            ChmodBPF/ChmodBPF ChmodBPF/StartupParameters.plist config.guess \
+            config.h config.h.in config.log config.status config.sub \
+            configure configure.ac CREDITS doc/pcap.txt doc/pcap.xml \
+            doc/pcap.html etherent.c ethertype.h fad-getad.c fad-gifc.c \
+            fad-glifc.c fad-null.c fad-win32.c FILES gencode.c gencode.h \
+            grammar.c grammar.y inet.c install-sh INSTALL.txt lbl/os-sunos4.h \
+            lbl/os-ultrix4.h lbl/os-aix4.h lbl/os-osf4.h lbl/os-hpux11.h \
+            lbl/os-osf5.h lbl/os-solaris2.h LICENSE llc.h Makefile.in \
+            missing/snprintf.c mkdep msdos/makefile.wc msdos/bin2c.c \
+            msdos/pkt_rx0.asm msdos/pktdrvr.h msdos/ndis2.h msdos/ndis2.c \
+            msdos/pkt_rx1.s msdos/common.dj msdos/makefile msdos/pktdrvr.c \
+            msdos/readme.dos msdos/ndis_0.asm msdos/makefile.dj nametoaddr.c \
+            nlpid.h NMAP_MODIFICATIONS optimize.c packaging/pcap.spec.in \
+            packaging/pcap.spec pcap1.h pcap.3 pcap-bpf.c pcap-bpf.h pcap.c \
+            pcap-dag.c pcap-dag.h pcap-dlpi.c pcap-dos.c pcap-dos.h \
+            pcap-enet.c pcap.h pcap-int.h pcap-linux.c pcap-namedb.h \
+            pcap-nit.c pcap-nit.h pcap-null.c pcap-pf.c pcap-pf.h \
+            pcap-septel.c pcap-septel.h pcap-snit.c pcap-snoop.c \
+            pcap-stdinc.h pcap-win32.c pf.h ppp.h README README.aix \
+            README.dag README.hpux README.linux README.macosx README.septel \
+            README.tru64 README.Win32 savefile.c scanner.c scanner.l sll.h \
+            sunatmpos.h SUNOS4/nit_if.o.sun4c.4.0.3c SUNOS4/nit_if.o.sun3 \
+            SUNOS4/nit_if.o.sparc TODO tokdefs.h VERSION version.h \
+            Win32/Include/addrinfo.h Win32/Include/Gnuc.h \
+            Win32/Include/arpa/nameser.h Win32/Include/cdecl_ext.h \
+            Win32/Include/ip6_misc.h Win32/Include/bittypes.h \
+            Win32/Include/net/if.h Win32/Include/net/paths.h \
+            Win32/Include/net/netdb.h Win32/Include/sockstorage.h \
+            Win32/Include/inetprivate.h Win32/Src/getservent.c \
+            Win32/Src/getaddrinfo.c Win32/Src/ffs.c Win32/Src/getnetbynm.c \
+            Win32/Src/inet_net.c Win32/Src/getnetent.c Win32/Src/getopt.c \
+            Win32/Src/inet_aton.c Win32/Src/inet_pton.c Win32/Prj/libpcap.dsw \
+            Win32/Prj/libpcap.dsp \
+            /usr/tmp/nmap-$(NMAP_VERSION)/$(LIBPCAPDIR)
 	$(SHTOOL) mkdir /usr/tmp/nmap-$(NMAP_VERSION)/docs
 	cd ../docs; cp -ra README nmap_gpgkeys.txt \
                    nmap-fingerprinting-article.txt \