libdaq: remove package

Replaced with libdaq3.

Signed-off-by: W. Michael Petullo <mike@flyn.org>

diff --git a/libs/libdaq/Makefile b/libs/libdaq/Makefile
deleted file mode 100644 (file)
index b4bd7d8..0000000
--- a/libs/libdaq/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2012-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdaq
-PKG_VERSION:=2.2.2
-PKG_RELEASE:=3
-
-PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
-PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz
-PKG_HASH:=7cd818cabb1ad35360e83076e54775f07165ee71407dc672d147e27d3cd37f7b
-PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libdaq
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=DAQ library
-  URL:=$(PKG_SOURCE_URL)
-  DEPENDS:=+libdnet +libpcap
-endef
-
-define Package/libdaq/description
- Data Acquisition library for packet I/O.
-endef
-
-CONFIGURE_ARGS+= \
-       --disable-static \
-       --disable-nfq-module \
-       --with-dnet-includes="$(STAGING_DIR)/usr/include" \
-       --with-dnet-libraries="$(STAGING_DIR)/usr/lib" \
-       --with-libpcap-includes="$(STAGING_DIR)/usr/include" \
-       --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/include/daq2
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/daq2/
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/daq2/
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2/daq
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq2/daq/
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/
-       $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/daq-modules-config
-       $(INSTALL_DIR) $(2)/bin
-       $(LN) ../../usr/bin/daq-modules-config $(2)/bin/daq-modules-config
-endef
-
-define Package/libdaq/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/daq
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/*.so* $(1)/usr/lib/daq/
-endef
-
-$(eval $(call BuildPackage,libdaq))

diff --git a/libs/libdaq/patches/001-compile.patch b/libs/libdaq/patches/001-compile.patch
deleted file mode 100644 (file)
index fce2b02..0000000
--- a/libs/libdaq/patches/001-compile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -13244,10 +13244,11 @@ if ${daq_cv_libpcap_version_1x+:} false;
- else
- 
-     if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+#as_fn_error $? "cannot run test program while cross compiling
-+#See \`config.log' for more details" "$LINENO" 5; }
-+        echo "    No cross compiling test."
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */

diff --git a/libs/libdaq/patches/100-musl-compat.patch b/libs/libdaq/patches/100-musl-compat.patch
deleted file mode 100644 (file)
index c510564..0000000
--- a/libs/libdaq/patches/100-musl-compat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/os-daq-modules/daq_ipfw.c
-+++ b/os-daq-modules/daq_ipfw.c
-@@ -23,10 +23,10 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
- 
- #include <netinet/in.h>
- #include <sys/socket.h>
---- a/os-daq-modules/daq_ipq.c
-+++ b/os-daq-modules/daq_ipq.c
-@@ -24,10 +24,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
- 
- #include <netinet/ip.h>
- 
---- a/os-daq-modules/daq_nfq.c
-+++ b/os-daq-modules/daq_nfq.c
-@@ -24,10 +24,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
- 
- #include <netinet/ip.h>
-