Update libpcap to not fight shared cache

48 files changed, 68 insertions, 7 deletions

diff --git a/data/libpcap/_metadata/description b/data/_libpcap/_metadata/description
index aed941faa..aed941faa 100644
--- a/data/libpcap/_metadata/description
+++ b/data/_libpcap/_metadata/description
diff --git a/data/libpcap/_metadata/license b/data/_libpcap/_metadata/license
index 8a4bc1936..8a4bc1936 120000
--- a/data/libpcap/_metadata/license
+++ b/data/_libpcap/_metadata/license
diff --git a/data/libpcap/_metadata/maintainer b/data/_libpcap/_metadata/maintainer
index 573d7ebef..573d7ebef 120000
--- a/data/libpcap/_metadata/maintainer
+++ b/data/_libpcap/_metadata/maintainer
diff --git a/data/libpcap/_metadata/priority b/data/_libpcap/_metadata/priority
index a6a7b9cd7..a6a7b9cd7 100644
--- a/data/libpcap/_metadata/priority
+++ b/data/_libpcap/_metadata/priority
diff --git a/data/libpcap/_metadata/role b/data/_libpcap/_metadata/role
index 8d0320866..8d0320866 100644
--- a/data/libpcap/_metadata/role
+++ b/data/_libpcap/_metadata/role
diff --git a/data/libpcap/_metadata/section b/data/_libpcap/_metadata/section
index 8708e4b54..8708e4b54 100644
--- a/data/libpcap/_metadata/section
+++ b/data/_libpcap/_metadata/section
diff --git a/data/libpcap/_metadata/tags b/data/_libpcap/_metadata/tags
index a8928cec8..a8928cec8 100644
--- a/data/libpcap/_metadata/tags
+++ b/data/_libpcap/_metadata/tags
diff --git a/data/libpcap/_metadata/version b/data/_libpcap/_metadata/version
index f8e233b27..f8e233b27 100644
--- a/data/libpcap/_metadata/version
+++ b/data/_libpcap/_metadata/version
diff --git a/data/_libpcap/dyld_cache.diff b/data/_libpcap/dyld_cache.diff
new file mode 100644
index 000000000..f3fee537e
--- /dev/null
+++ b/data/_libpcap/dyld_cache.diff
@@ -0,0 +1,32 @@
+diff -ur libpcap-1.9.0/Makefile.in libpcap-1.9.0+iPhone/Makefile.in
+--- libpcap-1.9.0/Makefile.in	2018-07-22 07:08:39.000000000 -1000
++++ libpcap-1.9.0+iPhone/Makefile.in	2019-04-08 14:13:56.000000000 -1000
+@@ -414,8 +414,8 @@
+ libpcap.dylib: $(OBJ)
+ 	rm -f libpcap*.dylib
+ 	VER=`cat $(srcdir)/VERSION`; \
+-	MAJOR_VER=A; \
+-	COMPAT_VER=1; \
++	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
++	COMPAT_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
+ 	CURRENT_VER=`sed 's/[^0-9.].*$$//' $(srcdir)/VERSION`; \
+ 	$(CC) -dynamiclib -undefined error $(LDFLAGS) \
+ 	    -o libpcap.$$VER.dylib $(OBJ) $(ADDLOBJS) $(LIBS) \
+@@ -626,7 +626,7 @@
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ 	VER=`cat $(srcdir)/VERSION`; \
+-	MAJOR_VER=A; \
++	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
+ 	$(INSTALL_PROGRAM) libpcap.$$VER.dylib $(DESTDIR)$(libdir)/libpcap.$$VER.dylib; \
+ 	ln -sf libpcap.$$VER.dylib $(DESTDIR)$(libdir)/libpcap.$$MAJOR_VER.dylib; \
+ 	ln -sf libpcap.$$MAJOR_VER.dylib $(DESTDIR)$(libdir)/libpcap.dylib
+@@ -706,7 +706,7 @@
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.so
+ uninstall-shared-dylib:
+ 	VER=`cat $(srcdir)/VERSION`; \
+-	MAJOR_VER=A; \
++	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.$$VER.dylib; \
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.$$MAJOR_VER.dylib; \
+ 	rm -f $(DESTDIR)$(libdir)/libpcap.dylib
diff --git a/data/libpcap/libpcap-1.9.0.tar.gz b/data/_libpcap/libpcap-1.9.0.tar.gz
index 32ab5c6a8..32ab5c6a8 100644
--- a/data/libpcap/libpcap-1.9.0.tar.gz
+++ b/data/_libpcap/libpcap-1.9.0.tar.gz
diff --git a/data/libpcap/make.sh b/data/_libpcap/make.sh
index b859c4a42..e8cb96def 100644
--- a/data/libpcap/make.sh
+++ b/data/_libpcap/make.sh
@@ -5,4 +5,3 @@ mkdir -p "${PKG_DEST}/usr/lib"
 pkg: mkdir -p /usr/bin
 make install install-shared DESTDIR="${PKG_DEST}"
 pkg: rm -f /usr/lib/libpcap.a
-pkg: ln -s libpcap.A.dylib /usr/lib/libpcap.0.dylib
diff --git a/data/kismet_/_metadata/libpcap.dep b/data/kismet_/_metadata/libpcap.dep
deleted file mode 120000
index 6c356a9b8..000000000
--- a/data/kismet_/_metadata/libpcap.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libpcap
\ No newline at end of file
diff --git a/data/kismet_/_metadata/libpcap1.dep b/data/kismet_/_metadata/libpcap1.dep
new file mode 120000
index 000000000..5ea06b02d
--- /dev/null
+++ b/data/kismet_/_metadata/libpcap1.dep
@@ -0,0 +1 @@
+../../libpcap1
\ No newline at end of file
diff --git a/data/libnids/_metadata/libpcap.dep b/data/libnids/_metadata/libpcap.dep
deleted file mode 120000
index 6c356a9b8..000000000
--- a/data/libnids/_metadata/libpcap.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libpcap
\ No newline at end of file
diff --git a/data/libnids/_metadata/libpcap1.dep b/data/libnids/_metadata/libpcap1.dep
new file mode 120000
index 000000000..5ea06b02d
--- /dev/null
+++ b/data/libnids/_metadata/libpcap1.dep
@@ -0,0 +1 @@
+../../libpcap1
\ No newline at end of file
diff --git a/data/libpcap-dev/_metadata/_libpcap.dep b/data/libpcap-dev/_metadata/_libpcap.dep
new file mode 120000
index 000000000..7109138a0
--- /dev/null
+++ b/data/libpcap-dev/_metadata/_libpcap.dep
@@ -0,0 +1 @@
+../../_libpcap
\ No newline at end of file
diff --git a/data/libpcap-dev/_metadata/_metadata b/data/libpcap-dev/_metadata/_metadata
new file mode 120000
index 000000000..7a076e35c
--- /dev/null
+++ b/data/libpcap-dev/_metadata/_metadata
@@ -0,0 +1 @@
+../../_libpcap/_metadata
\ No newline at end of file
diff --git a/data/libpcap-dev/_metadata/description b/data/libpcap-dev/_metadata/description
new file mode 100644
index 000000000..8cb10dae6
--- /dev/null
+++ b/data/libpcap-dev/_metadata/description
@@ -0,0 +1 @@
+low-level network capture library (development)
diff --git a/data/libpcap/_metadata/in.1443.00 b/data/libpcap-dev/_metadata/in.1443.00
index e69de29bb..e69de29bb 100644
--- a/data/libpcap/_metadata/in.1443.00
+++ b/data/libpcap-dev/_metadata/in.1443.00
diff --git a/data/libpcap-dev/_metadata/maintainer b/data/libpcap-dev/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libpcap-dev/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/libpcap-dev/_metadata/priority b/data/libpcap-dev/_metadata/priority
new file mode 100644
index 000000000..a6a7b9cd7
--- /dev/null
+++ b/data/libpcap-dev/_metadata/priority
@@ -0,0 +1 @@
+standard
diff --git a/data/libpcap-dev/_metadata/role b/data/libpcap-dev/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libpcap-dev/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libpcap-dev/_metadata/section b/data/libpcap-dev/_metadata/section
new file mode 100644
index 000000000..8708e4b54
--- /dev/null
+++ b/data/libpcap-dev/_metadata/section
@@ -0,0 +1 @@
+Networking
diff --git a/data/libpcap-dev/_metadata/tags b/data/libpcap-dev/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libpcap-dev/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libpcap-dev/_metadata/version b/data/libpcap-dev/_metadata/version
new file mode 120000
index 000000000..6b8df069c
--- /dev/null
+++ b/data/libpcap-dev/_metadata/version
@@ -0,0 +1 @@
+../../_libpcap/_metadata/version
\ No newline at end of file
diff --git a/data/libpcap-dev/make.sh b/data/libpcap-dev/make.sh
new file mode 100644
index 000000000..7d6bcea5c
--- /dev/null
+++ b/data/libpcap-dev/make.sh
@@ -0,0 +1,4 @@
+pkg: mkdir -p /usr/lib
+cp -a "$(PKG_DEST_ _libpcap)"/usr/{bin,include} "${PKG_DEST}"/usr/
+cp -a "$(PKG_DEST_ _libpcap)"/usr/lib/{lib*.dylib,pkgconfig} "${PKG_DEST}"/usr/lib
+rm "${PKG_DEST}"/usr/lib/lib*.*.dylib
diff --git a/data/libpcap1/_metadata/_libpcap.dep b/data/libpcap1/_metadata/_libpcap.dep
new file mode 120000
index 000000000..7109138a0
--- /dev/null
+++ b/data/libpcap1/_metadata/_libpcap.dep
@@ -0,0 +1 @@
+../../_libpcap
\ No newline at end of file
diff --git a/data/libpcap1/_metadata/_metadata b/data/libpcap1/_metadata/_metadata
new file mode 120000
index 000000000..7a076e35c
--- /dev/null
+++ b/data/libpcap1/_metadata/_metadata
@@ -0,0 +1 @@
+../../_libpcap/_metadata
\ No newline at end of file
diff --git a/data/libpcap1/_metadata/conflicts b/data/libpcap1/_metadata/conflicts
new file mode 100644
index 000000000..22a1e456b
--- /dev/null
+++ b/data/libpcap1/_metadata/conflicts
@@ -0,0 +1 @@
+libpcap
diff --git a/data/libpcap1/_metadata/description b/data/libpcap1/_metadata/description
new file mode 100644
index 000000000..aed941faa
--- /dev/null
+++ b/data/libpcap1/_metadata/description
@@ -0,0 +1 @@
+low-level network capture library
diff --git a/data/libpcap1/_metadata/in.1443.00 b/data/libpcap1/_metadata/in.1443.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/libpcap1/_metadata/in.1443.00
diff --git a/data/libpcap1/_metadata/maintainer b/data/libpcap1/_metadata/maintainer
new file mode 120000
index 000000000..573d7ebef
--- /dev/null
+++ b/data/libpcap1/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/sbingner
\ No newline at end of file
diff --git a/data/libpcap1/_metadata/priority b/data/libpcap1/_metadata/priority
new file mode 100644
index 000000000..a6a7b9cd7
--- /dev/null
+++ b/data/libpcap1/_metadata/priority
@@ -0,0 +1 @@
+standard
diff --git a/data/libpcap1/_metadata/provides b/data/libpcap1/_metadata/provides
new file mode 100644
index 000000000..22a1e456b
--- /dev/null
+++ b/data/libpcap1/_metadata/provides
@@ -0,0 +1 @@
+libpcap
diff --git a/data/libpcap1/_metadata/replaces b/data/libpcap1/_metadata/replaces
new file mode 100644
index 000000000..22a1e456b
--- /dev/null
+++ b/data/libpcap1/_metadata/replaces
@@ -0,0 +1 @@
+libpcap
diff --git a/data/libpcap1/_metadata/role b/data/libpcap1/_metadata/role
new file mode 100644
index 000000000..8d0320866
--- /dev/null
+++ b/data/libpcap1/_metadata/role
@@ -0,0 +1 @@
+developer
diff --git a/data/libpcap1/_metadata/section b/data/libpcap1/_metadata/section
new file mode 100644
index 000000000..8708e4b54
--- /dev/null
+++ b/data/libpcap1/_metadata/section
@@ -0,0 +1 @@
+Networking
diff --git a/data/libpcap1/_metadata/tags b/data/libpcap1/_metadata/tags
new file mode 100644
index 000000000..a8928cec8
--- /dev/null
+++ b/data/libpcap1/_metadata/tags
@@ -0,0 +1 @@
+purpose::library
diff --git a/data/libpcap1/_metadata/version b/data/libpcap1/_metadata/version
new file mode 120000
index 000000000..6b8df069c
--- /dev/null
+++ b/data/libpcap1/_metadata/version
@@ -0,0 +1 @@
+../../_libpcap/_metadata/version
\ No newline at end of file
diff --git a/data/libpcap1/make.sh b/data/libpcap1/make.sh
new file mode 100644
index 000000000..cde817676
--- /dev/null
+++ b/data/libpcap1/make.sh
@@ -0,0 +1,5 @@
+pkg: mkdir -p /usr/lib
+LIBNAME=${PKG_NAME%%[[:digit:]]*}
+LIBVER=${PKG_NAME#${LIBNAME}}
+LIBNAME=${LIBNAME#lib}
+cp -a "$(PKG_DEST_ _libpcap)"/usr/lib/lib${LIBNAME}.${LIBVER}.*dylib "${PKG_DEST}"/usr/lib
diff --git a/data/ngrep/_metadata/libpcap.dep b/data/ngrep/_metadata/libpcap.dep
deleted file mode 120000
index 6c356a9b8..000000000
--- a/data/ngrep/_metadata/libpcap.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libpcap
\ No newline at end of file
diff --git a/data/ngrep/_metadata/libpcap1.dep b/data/ngrep/_metadata/libpcap1.dep
new file mode 120000
index 000000000..5ea06b02d
--- /dev/null
+++ b/data/ngrep/_metadata/libpcap1.dep
@@ -0,0 +1 @@
+../../libpcap1
\ No newline at end of file
diff --git a/data/nmap/_metadata/libpcap.dep b/data/nmap/_metadata/libpcap.dep
deleted file mode 120000
index 6c356a9b8..000000000
--- a/data/nmap/_metadata/libpcap.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libpcap
\ No newline at end of file
diff --git a/data/nmap/_metadata/libpcap1.dep b/data/nmap/_metadata/libpcap1.dep
new file mode 120000
index 000000000..5ea06b02d
--- /dev/null
+++ b/data/nmap/_metadata/libpcap1.dep
@@ -0,0 +1 @@
+../../libpcap1
\ No newline at end of file
diff --git a/data/sniffit/_metadata/libpcap.dep b/data/sniffit/_metadata/libpcap.dep
deleted file mode 120000
index 6c356a9b8..000000000
--- a/data/sniffit/_metadata/libpcap.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libpcap
\ No newline at end of file
diff --git a/data/sniffit/_metadata/libpcap1.dep b/data/sniffit/_metadata/libpcap1.dep
new file mode 120000
index 000000000..5ea06b02d
--- /dev/null
+++ b/data/sniffit/_metadata/libpcap1.dep
@@ -0,0 +1 @@
+../../libpcap1
\ No newline at end of file
diff --git a/data/tcpdump/_metadata/libpcap.dep b/data/tcpdump/_metadata/libpcap.dep
deleted file mode 120000
index 6c356a9b8..000000000
--- a/data/tcpdump/_metadata/libpcap.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../libpcap
\ No newline at end of file
diff --git a/data/tcpdump/_metadata/libpcap1.dep b/data/tcpdump/_metadata/libpcap1.dep
new file mode 120000
index 000000000..5ea06b02d
--- /dev/null
+++ b/data/tcpdump/_metadata/libpcap1.dep
@@ -0,0 +1 @@
+../../libpcap1
\ No newline at end of file