backport-0001-CVE-2023-7256.patch

@@ -1,38 +0,0 @@
-From 73da0d4d65ef0925772b7b7f82a5fbb3ff2c5e4f Mon Sep 17 00:00:00 2001
-From: Rose <83477269+AtariDreams@users.noreply.github.com>
-Date: Tue, 16 May 2023 12:37:11 -0400
-Subject: [PATCH] Remove unused variable retval in sock_present2network
-
-This quiets the compiler since it is not even returned anyway, and is a misleading variable name.
-
-(cherry picked from commit c7b90298984c46d820d3cee79a96d24870b5f200)
-
-Conflict:NA
-Reference:https://github.com/the-tcpdump-group/libpcap/commit/73da0d4d65ef0925772b7b7f82a5fbb3ff2c5e4f
-
----
- sockutils.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/sockutils.c b/sockutils.c
-index 1c07f76fd1..6752f296af 100644
---- a/sockutils.c
-+++ b/sockutils.c
-@@ -2082,7 +2082,6 @@ int sock_getascii_addrport(const struct sockaddr_storage *sockaddr, char *addres
-  */
- int sock_present2network(const char *address, struct sockaddr_storage *sockaddr, int addr_family, char *errbuf, int errbuflen)
- {
--	int retval;
- 	struct addrinfo *addrinfo;
- 	struct addrinfo hints;
- 
-@@ -2090,7 +2089,7 @@ int sock_present2network(const char *address, struct sockaddr_storage *sockaddr,
- 
- 	hints.ai_family = addr_family;
- 
--	if ((retval = sock_initaddress(address, "22222" /* fake port */, &hints, &addrinfo, errbuf, errbuflen)) == -1)
-+	if (sock_initaddress(address, "22222" /* fake port */, &hints, &addrinfo, errbuf, errbuflen) == -1)
- 		return 0;
- 
- 	if (addrinfo->ai_family == PF_INET)
-

backport-0002-CVE-2023-7256.patch

@@ -1,366 +0,0 @@
-From 2aa69b04d8173b18a0e3492e0c8f2f7fabdf642d Mon Sep 17 00:00:00 2001
-From: Guy Harris <gharris@sonic.net>
-Date: Thu, 28 Sep 2023 00:37:57 -0700
-Subject: [PATCH] Have sock_initaddress() return the list of addrinfo
- structures or NULL.
-
-Its return address is currently 0 for success and -1 for failure, with a
-pointer to the first element of the list of struct addrinfos returned
-through a pointer on success; change it to return that pointer on
-success and NULL on failure.
-
-That way, we don't have to worry about what happens to the pointer
-pointeed to by the argument in question on failure; we know that we got
-NULL back if no struct addrinfos were found because getaddrinfo()
-failed.  Thus, we know that we have something to free iff
-sock_initaddress() returned a pointer to that something rather than
-returning NULL.
-
-This avoids a double-free in some cases.
-
-This is apparently CVE-2023-40400.
-
-(backported from commit 262e4f34979872d822ccedf9f318ed89c4d31c03)
-
-Conflict:NA
-Reference:https://github.com/the-tcpdump-group/libpcap/commit/2aa69b04d8173b18a0e3492e0c8f2f7fabdf642d
-
----
- pcap-rpcap.c    | 48 ++++++++++++++++++++--------------------
- rpcapd/daemon.c |  8 +++++--
- rpcapd/rpcapd.c |  8 +++++--
- sockutils.c     | 58 ++++++++++++++++++++++++++++---------------------
- sockutils.h     |  5 ++---
- 5 files changed, 72 insertions(+), 55 deletions(-)
-
-diff --git a/pcap-rpcap.c b/pcap-rpcap.c
-index ef0cd6e49c..f1992e4aea 100644
---- a/pcap-rpcap.c
-+++ b/pcap-rpcap.c
-@@ -1024,7 +1024,6 @@ rpcap_remoteact_getsock(const char *host, int *error, char *errbuf)
- {
- 	struct activehosts *temp;			/* temp var needed to scan the host list chain */
- 	struct addrinfo hints, *addrinfo, *ai_next;	/* temp var needed to translate between hostname to its address */
--	int retval;
- 
- 	/* retrieve the network address corresponding to 'host' */
- 	addrinfo = NULL;
-@@ -1032,9 +1031,9 @@ rpcap_remoteact_getsock(const char *host, int *error, char *errbuf)
- 	hints.ai_family = PF_UNSPEC;
- 	hints.ai_socktype = SOCK_STREAM;
- 
--	retval = sock_initaddress(host, NULL, &hints, &addrinfo, errbuf,
-+	addrinfo = sock_initaddress(host, NULL, &hints, errbuf,
- 	    PCAP_ERRBUF_SIZE);
--	if (retval != 0)
-+	if (addrinfo == NULL)
- 	{
- 		*error = 1;
- 		return NULL;
-@@ -1186,7 +1185,9 @@ static int pcap_startcapture_remote(pcap_t *fp)
- 		hints.ai_flags = AI_PASSIVE;	/* Data connection is opened by the server toward the client */
- 
- 		/* Let's the server pick up a free network port for us */
--		if (sock_initaddress(NULL, NULL, &hints, &addrinfo, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-+		addrinfo = sock_initaddress(NULL, NULL, &hints, fp->errbuf,
-+		    PCAP_ERRBUF_SIZE);
-+		if (addrinfo == NULL)
- 			goto error_nodiscard;
- 
- 		if ((sockdata = sock_open(NULL, addrinfo, SOCKOPEN_SERVER,
-@@ -1311,7 +1312,9 @@ static int pcap_startcapture_remote(pcap_t *fp)
- 			snprintf(portstring, PCAP_BUF_SIZE, "%d", ntohs(startcapreply.portdata));
- 
- 			/* Let's the server pick up a free network port for us */
--			if (sock_initaddress(host, portstring, &hints, &addrinfo, fp->errbuf, PCAP_ERRBUF_SIZE) == -1)
-+			addrinfo = sock_initaddress(host, portstring, &hints,
-+			    fp->errbuf, PCAP_ERRBUF_SIZE);
-+			if (addrinfo == NULL)
- 				goto error;
- 
- 			if ((sockdata = sock_open(host, addrinfo, SOCKOPEN_CLIENT, 0, fp->errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
-@@ -2340,16 +2343,16 @@ rpcap_setup_session(const char *source, struct pcap_rmtauth *auth,
- 		if (port[0] == 0)
- 		{
- 			/* the user chose not to specify the port */
--			if (sock_initaddress(host, RPCAP_DEFAULT_NETPORT,
--			    &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
--				return -1;
-+			addrinfo = sock_initaddress(host, RPCAP_DEFAULT_NETPORT,
-+			    &hints, errbuf, PCAP_ERRBUF_SIZE);
- 		}
- 		else
- 		{
--			if (sock_initaddress(host, port, &hints, &addrinfo,
--			    errbuf, PCAP_ERRBUF_SIZE) == -1)
--				return -1;
-+			addrinfo = sock_initaddress(host, port, &hints,
-+			    errbuf, PCAP_ERRBUF_SIZE);
- 		}
-+		if (addrinfo == NULL)
-+			return -1;
- 
- 		if ((*sockctrlp = sock_open(host, addrinfo, SOCKOPEN_CLIENT, 0,
- 		    errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
-@@ -2950,19 +2953,19 @@ SOCKET pcap_remoteact_accept_ex(const char *address, const char *port, const cha
- 	/* Do the work */
- 	if ((port == NULL) || (port[0] == 0))
- 	{
--		if (sock_initaddress(address, RPCAP_DEFAULT_NETPORT_ACTIVE, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
--		{
--			return (SOCKET)-2;
--		}
-+		addrinfo = sock_initaddress(address,
-+		    RPCAP_DEFAULT_NETPORT_ACTIVE, &hints, errbuf,
-+		    PCAP_ERRBUF_SIZE);
- 	}
- 	else
- 	{
--		if (sock_initaddress(address, port, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
--		{
--			return (SOCKET)-2;
--		}
-+		addrinfo = sock_initaddress(address, port, &hints, errbuf,
-+		    PCAP_ERRBUF_SIZE);
-+	}
-+	if (addrinfo == NULL)
-+	{
-+		return (SOCKET)-2;
- 	}
--
- 
- 	if ((sockmain = sock_open(NULL, addrinfo, SOCKOPEN_SERVER, 1, errbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
- 	{
-@@ -3122,7 +3125,6 @@ int pcap_remoteact_close(const char *host, char *errbuf)
- {
- 	struct activehosts *temp, *prev;	/* temp var needed to scan the host list chain */
- 	struct addrinfo hints, *addrinfo, *ai_next;	/* temp var needed to translate between hostname to its address */
--	int retval;
- 
- 	temp = activeHosts;
- 	prev = NULL;
-@@ -3133,9 +3135,9 @@ int pcap_remoteact_close(const char *host, char *errbuf)
- 	hints.ai_family = PF_UNSPEC;
- 	hints.ai_socktype = SOCK_STREAM;
- 
--	retval = sock_initaddress(host, NULL, &hints, &addrinfo, errbuf,
-+	addrinfo = sock_initaddress(host, NULL, &hints, errbuf,
- 	    PCAP_ERRBUF_SIZE);
--	if (retval != 0)
-+	if (addrinfo == NULL)
- 	{
- 		return -1;
- 	}
-diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c
-index 8d620dd604..b04b29f107 100644
---- a/rpcapd/daemon.c
-+++ b/rpcapd/daemon.c
-@@ -2085,7 +2085,9 @@ daemon_msg_startcap_req(uint8 ver, struct daemon_slpars *pars, uint32 plen,
- 			goto error;
- 		}
- 
--		if (sock_initaddress(peerhost, portdata, &hints, &addrinfo, errmsgbuf, PCAP_ERRBUF_SIZE) == -1)
-+		addrinfo = sock_initaddress(peerhost, portdata, &hints,
-+		    errmsgbuf, PCAP_ERRBUF_SIZE);
-+		if (addrinfo == NULL)
- 			goto error;
- 
- 		if ((session->sockdata = sock_open(peerhost, addrinfo, SOCKOPEN_CLIENT, 0, errmsgbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
-@@ -2096,7 +2098,9 @@ daemon_msg_startcap_req(uint8 ver, struct daemon_slpars *pars, uint32 plen,
- 		hints.ai_flags = AI_PASSIVE;
- 
- 		// Make the server socket pick up a free network port for us
--		if (sock_initaddress(NULL, NULL, &hints, &addrinfo, errmsgbuf, PCAP_ERRBUF_SIZE) == -1)
-+		addrinfo = sock_initaddress(NULL, NULL, &hints, errmsgbuf,
-+		    PCAP_ERRBUF_SIZE);
-+		if (addrinfo == NULL)
- 			goto error;
- 
- 		if ((session->sockdata = sock_open(NULL, addrinfo, SOCKOPEN_SERVER, 1 /* max 1 connection in queue */, errmsgbuf, PCAP_ERRBUF_SIZE)) == INVALID_SOCKET)
-diff --git a/rpcapd/rpcapd.c b/rpcapd/rpcapd.c
-index e1f3f05299..d166522c9f 100644
---- a/rpcapd/rpcapd.c
-+++ b/rpcapd/rpcapd.c
-@@ -611,7 +611,9 @@ void main_startup(void)
- 		//
- 		// Get a list of sockets on which to listen.
- 		//
--		if (sock_initaddress((address[0]) ? address : NULL, port, &mainhints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
-+		addrinfo = sock_initaddress((address[0]) ? address : NULL,
-+		    port, &mainhints, errbuf, PCAP_ERRBUF_SIZE);
-+		if (addrinfo == NULL)
- 		{
- 			rpcapd_log(LOGPRIO_DEBUG, "%s", errbuf);
- 			return;
-@@ -1350,7 +1352,9 @@ main_active(void *ptr)
- 	memset(errbuf, 0, sizeof(errbuf));
- 
- 	// Do the work
--	if (sock_initaddress(activepars->address, activepars->port, &hints, &addrinfo, errbuf, PCAP_ERRBUF_SIZE) == -1)
-+	addrinfo = sock_initaddress(activepars->address, activepars->port,
-+	    &hints, errbuf, PCAP_ERRBUF_SIZE);
-+	if (addrinfo == NULL)
- 	{
- 		rpcapd_log(LOGPRIO_DEBUG, "%s", errbuf);
- 		return 0;
-diff --git a/sockutils.c b/sockutils.c
-index a1bfa1b5e2..823c2363e0 100644
---- a/sockutils.c
-+++ b/sockutils.c
-@@ -1069,20 +1069,21 @@ get_gai_errstring(char *errbuf, int errbuflen, const char *prefix, int err,
-  * \param errbuflen: length of the buffer that will contains the error. The error message cannot be
-  * larger than 'errbuflen - 1' because the last char is reserved for the string terminator.
-  *
-- * \return '0' if everything is fine, '-1' if some errors occurred. The error message is returned
-- * in the 'errbuf' variable. The addrinfo variable that has to be used in the following sockets calls is
-- * returned into the addrinfo parameter.
-+ * \return a pointer to the first element in a list of addrinfo structures
-+ * if everything is fine, NULL if some errors occurred. The error message
-+ * is returned in the 'errbuf' variable.
-  *
-- * \warning The 'addrinfo' variable has to be deleted by the programmer by calling freeaddrinfo() when
-- * it is no longer needed.
-+ * \warning The list of addrinfo structures returned has to be deleted by
-+ * the programmer by calling freeaddrinfo() when it is no longer needed.
-  *
-  * \warning This function requires the 'hints' variable as parameter. The semantic of this variable is the same
-  * of the one of the corresponding variable used into the standard getaddrinfo() socket function. We suggest
-  * the programmer to look at that function in order to set the 'hints' variable appropriately.
-  */
--int sock_initaddress(const char *host, const char *port,
--    struct addrinfo *hints, struct addrinfo **addrinfo, char *errbuf, int errbuflen)
-+struct addrinfo *sock_initaddress(const char *host, const char *port,
-+    struct addrinfo *hints, char *errbuf, int errbuflen)
- {
-+	struct addrinfo *addrinfo;
- 	int retval;
- 
- 	/*
-@@ -1094,9 +1095,13 @@ int sock_initaddress(const char *host, const char *port,
- 	 * as those messages won't talk about a problem with the port if
- 	 * no port was specified.
- 	 */
--	retval = getaddrinfo(host, port == NULL ? "0" : port, hints, addrinfo);
-+	retval = getaddrinfo(host, port == NULL ? "0" : port, hints, &addrinfo);
- 	if (retval != 0)
- 	{
-+		/*
-+		 * That call failed.
-+		 * Determine whether the problem is that the host is bad.
-+		 */
- 		if (errbuf)
- 		{
- 			if (host != NULL && port != NULL) {
-@@ -1108,7 +1113,7 @@ int sock_initaddress(const char *host, const char *port,
- 				int try_retval;
- 
- 				try_retval = getaddrinfo(host, NULL, hints,
--				    addrinfo);
-+				    &addrinfo);
- 				if (try_retval == 0) {
- 					/*
- 					 * Worked with just the host,
-@@ -1117,14 +1122,16 @@ int sock_initaddress(const char *host, const char *port,
- 					 *
- 					 * Free up the address info first.
- 					 */
--					freeaddrinfo(*addrinfo);
-+					freeaddrinfo(addrinfo);
- 					get_gai_errstring(errbuf, errbuflen,
- 					    "", retval, NULL, port);
- 				} else {
- 					/*
- 					 * Didn't work with just the host,
- 					 * so assume the problem is
--					 * with the host.
-+					 * with the host; we assume
-+					 * the original error indicates
-+					 * the underlying problem.
- 					 */
- 					get_gai_errstring(errbuf, errbuflen,
- 					    "", retval, host, NULL);
-@@ -1132,13 +1139,14 @@ int sock_initaddress(const char *host, const char *port,
- 			} else {
- 				/*
- 				 * Either the host or port was null, so
--				 * there's nothing to determine.
-+				 * there's nothing to determine; report
-+				 * the error from the original call.
- 				 */
- 				get_gai_errstring(errbuf, errbuflen, "",
- 				    retval, host, port);
- 			}
- 		}
--		return -1;
-+		return NULL;
- 	}
- 	/*
- 	 * \warning SOCKET: I should check all the accept() in order to bind to all addresses in case
-@@ -1153,30 +1161,28 @@ int sock_initaddress(const char *host, const char *port,
- 	 * ignore all addresses that are neither?  (What, no IPX
- 	 * support? :-))
- 	 */
--	if (((*addrinfo)->ai_family != PF_INET) &&
--	    ((*addrinfo)->ai_family != PF_INET6))
-+	if ((addrinfo->ai_family != PF_INET) &&
-+	    (addrinfo->ai_family != PF_INET6))
- 	{
- 		if (errbuf)
- 			snprintf(errbuf, errbuflen, "getaddrinfo(): socket type not supported");
--		freeaddrinfo(*addrinfo);
--		*addrinfo = NULL;
--		return -1;
-+		freeaddrinfo(addrinfo);
-+		return NULL;
- 	}
- 
- 	/*
- 	 * You can't do multicast (or broadcast) TCP.
- 	 */
--	if (((*addrinfo)->ai_socktype == SOCK_STREAM) &&
--	    (sock_ismcastaddr((*addrinfo)->ai_addr) == 0))
-+	if ((addrinfo->ai_socktype == SOCK_STREAM) &&
-+	    (sock_ismcastaddr(addrinfo->ai_addr) == 0))
- 	{
- 		if (errbuf)
- 			snprintf(errbuf, errbuflen, "getaddrinfo(): multicast addresses are not valid when using TCP streams");
--		freeaddrinfo(*addrinfo);
--		*addrinfo = NULL;
--		return -1;
-+		freeaddrinfo(addrinfo);
-+		return NULL;
- 	}
- 
--	return 0;
-+	return addrinfo;
- }
- 
- /*
-@@ -2089,7 +2095,9 @@ int sock_present2network(const char *address, struct sockaddr_storage *sockaddr,
- 
- 	hints.ai_family = addr_family;
- 
--	if (sock_initaddress(address, "22222" /* fake port */, &hints, &addrinfo, errbuf, errbuflen) == -1)
-+	addrinfo = sock_initaddress(address, "22222" /* fake port */, &hints,
-+	    errbuf, errbuflen);
-+	if (addrinfo == NULL)
- 		return 0;
- 
- 	if (addrinfo->ai_family == PF_INET)
-diff --git a/sockutils.h b/sockutils.h
-index a488d8fcb4..30b8cfe0b7 100644
---- a/sockutils.h
-+++ b/sockutils.h
-@@ -138,9 +138,8 @@ void sock_fmterrmsg(char *errbuf, size_t errbuflen, int errcode,
-     PCAP_FORMAT_STRING(const char *fmt), ...) PCAP_PRINTFLIKE(4, 5);
- void sock_geterrmsg(char *errbuf, size_t errbuflen,
-     PCAP_FORMAT_STRING(const char *fmt), ...)  PCAP_PRINTFLIKE(3, 4);
--int sock_initaddress(const char *address, const char *port,
--    struct addrinfo *hints, struct addrinfo **addrinfo,
--    char *errbuf, int errbuflen);
-+struct addrinfo *sock_initaddress(const char *address, const char *port,
-+    struct addrinfo *hints, char *errbuf, int errbuflen);
- int sock_recv(SOCKET sock, SSL *, void *buffer, size_t size, int receiveall,
-     char *errbuf, int errbuflen);
- int sock_recv_dgram(SOCKET sock, SSL *, void *buffer, size_t size,
-

backport-CVE-2024-8006.patch

@@ -1,43 +0,0 @@
-From 8a633ee5b9ecd9d38a587ac9b204e2380713b0d6 Mon Sep 17 00:00:00 2001
-From: Nicolas Badoux <n.badoux@hotmail.com>
-Date: Mon, 19 Aug 2024 12:31:53 +0200
-Subject: [PATCH] makes pcap_findalldevs_ex errors out if the directory does
- not exist
-
-(backported from commit 0f8a103469ce87d2b8d68c5130a46ddb7fb5eb29)
-
-Conflict:NA
-Reference:https://github.com/the-tcpdump-group/libpcap/commit/8a633ee5b9ecd9d38a587ac9b204e2380713b0d6
-
----
- pcap-new.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/pcap-new.c b/pcap-new.c
-index be91b3f8db..d449ee623c 100644
---- a/pcap-new.c
-+++ b/pcap-new.c
-@@ -230,6 +230,13 @@ int pcap_findalldevs_ex(const char *source, struct pcap_rmtauth *auth, pcap_if_t
- #else
- 		/* opening the folder */
- 		unixdir= opendir(path);
-+		if (unixdir == NULL) {
-+			DIAG_OFF_FORMAT_TRUNCATION
-+			snprintf(errbuf, PCAP_ERRBUF_SIZE,
-+			    "Error when listing files: does folder '%s' exist?", path);
-+			DIAG_ON_FORMAT_TRUNCATION
-+			return -1;
-+		}
- 
- 		/* get the first file into it */
- 		filedata= readdir(unixdir);
-@@ -237,7 +244,7 @@ int pcap_findalldevs_ex(const char *source, struct pcap_rmtauth *auth, pcap_if_t
- 		if (filedata == NULL)
- 		{
- 			DIAG_OFF_FORMAT_TRUNCATION
--			snprintf(errbuf, PCAP_ERRBUF_SIZE, "Error when listing files: does folder '%s' exist?", path);
-+			snprintf(errbuf, PCAP_ERRBUF_SIZE, "Error when listing files: does folder '%s' contain files?", path);
- 			DIAG_ON_FORMAT_TRUNCATION
- 			closedir(unixdir);
- 			return -1;
-

libpcap-Add-sw64-architecture.patch

@@ -1,25 +0,0 @@
-From 32ba1d898304149fe6c0291b14641f0a136743f6 Mon Sep 17 00:00:00 2001
-From: wzx <wuzx1226@qq.com>
-Date: Mon, 7 Nov 2022 09:41:41 +0800
-Subject: [PATCH] Add sw64 architecture
-
-Signed-off-by: wzx <wuzx1226@qq.com>
----
- extract.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extract.h b/extract.h
-index e776a9e..528b893 100644
---- a/extract.h
-+++ b/extract.h
-@@ -114,6 +114,7 @@ EXTRACT_BE_S_8(const void *p)
- }
- #elif PCAP_IS_AT_LEAST_GNUC_VERSION(2,0) && \
-     (defined(__alpha) || defined(__alpha__) || \
-+     defined(__sw_64) || defined(__sw_64__) || \
-      defined(__mips) || defined(__mips__))
- /*
-  * This is MIPS or Alpha, which don't natively handle unaligned loads,
--- 
-2.33.0
-

libpcap.spec

@@ -1,7 +1,7 @@
 Name:		libpcap
 Epoch:    	14
-Version:	1.10.4
+Version:	1.10.1
-Release:	2
+Release:	1
 Summary:	A system-independent interface for user-level packet capture
 License:	BSD
 URL:		http://www.tcpdump.org
@@ -9,16 +9,8 @@ Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 
 Patch0:         0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch
 Patch1:         pcap-config-mitigate-multilib-conflict.patch
-Patch2:         libpcap-Add-sw64-architecture.patch
-Patch3:         backport-0001-CVE-2023-7256.patch
-Patch4:         backport-0002-CVE-2023-7256.patch
-Patch5:         backport-CVE-2024-8006.patch
 
-BuildRequires:	make bison flex gcc glibc-kernheaders >= 2.2.0
+BuildRequires:	bison bluez-libs-devel flex gcc glibc-kernheaders >= 2.2.0
-
-%ifnarch i686
-BuildRequires: bluez-libs-devel
-%endif
 
 %description
 This is the official web site of tcpdump, a powerful command-line 
@@ -67,36 +59,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %{_mandir}/man*
 
 %changelog
-* Mon Sep 23 2024 xingwei14 <xingwei14@h-partners.com> - 14:1.10.4-2
-- Type:CVE
-- CVE:CVE-2023-7256 CVE-2024-8006
-- SUG:NA
-- DESC:fix CVE-2023-7256 and CVE-2024-8006
-
-* Tue Jan 31 2023 chenzixuan <chenzixuan@kylinos.cn> - 14:1.10.4-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC:update libpcap to 1.10.4
-
-* Tue Jan 31 2023 xinghe <xinghe2@h-partners.com> - 14:1.10.3-1
-- Type:requirements
-- ID:NA
-- SUG:NA
-- DESC:update libpcap to 1.10.3
-
-* Mon Nov 7 2022 wuzx<wuzx1226@qq.com> - 14:1.10.1-3
-- Type:feature
-- CVE:NA
-- SUG:NA
-- DESC:Add sw64 architecture
-
-* Fri Feb 18 2022 xihaochen <xihaochen@h-partners.com> - 14:1.10.1-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: delete the bluez-libs-devel in i686 arch
-
 * Thu Sep 16 2021 xinghe <xinghe2@huawei.com> - 14:1.10.1-1
 - DESC:upgrade to 1.10.1
 

pcap-config-mitigate-multilib-conflict.patch

@@ -15,7 +15,7 @@ path anyway.
  1 file changed, 8 insertions(+), 19 deletions(-)
 
 diff --git a/pcap-config.in b/pcap-config.in
-index 6039ef3..72297bf 100644
+index 54ca42f..830a6c7 100644
 --- a/pcap-config.in
 +++ b/pcap-config.in
 @@ -11,7 +11,6 @@
@@ -23,49 +23,67 @@ index 6039ef3..72297bf 100644
  exec_prefix="@exec_prefix@"
  includedir="@includedir@"
 -libdir="@libdir@"
+ V_RPATH_OPT="@V_RPATH_OPT@"
  LIBS="@LIBS@"
- LIBS_STATIC="@LIBS_STATIC@"
+ PACKAGE_NAME="@PACKAGE_NAME@"
- VERSION="@PACKAGE_VERSION@"
+@@ -41,16 +40,6 @@ do
-@@ -90,16 +89,16 @@ then
+ 	esac
+ 	shift
+ done
+-if [ "$V_RPATH_OPT" != "" ]
+-then
+-	#
+-	# If libdir isn't /usr/lib, add it to the run-time linker path.
+-	#
+-	if [ "$libdir" != "/usr/lib" ]
+-	then
+-		RPATH=$V_RPATH_OPT$libdir
+-	fi
+-fi
+ if [ "$static" = 1 ]
+ then
+ 	#
+@@ -59,16 +48,16 @@ then
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
--		echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS_STATIC"
+-		echo "-I$includedir -L$libdir -lpcap $LIBS"
-+		echo "-lpcap @LIBS@"
++                echo "-lpcap @LIBS@"
  	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
  	then
--		echo "-I$includedir $LPATH $LIBS_STATIC"
+-		echo "-I$includedir -L$libdir $LIBS"
-+		echo "@LIBS@"
++                echo "@LIBS@"
  	elif [ "$show_cflags" = 1 ]
  	then
 -		echo "-I$includedir"
-+		echo ""
++                echo ""
  	elif [ "$show_libs" = 1 ]
  	then
--		echo "$LPATH -l@PACKAGE_NAME@ $LIBS_STATIC"
+-		echo "-L$libdir -lpcap $LIBS"
-+		echo "-lpcap @LIBS@"
++                echo "-lpcap @LIBS@"
- 	elif [ "$show_additional_libs" = 1 ]
- 	then
- 		echo "$LIBS_STATIC"
-@@ -117,16 +116,16 @@ then
- 	#
- 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
- 	then
--		echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS"
-+		echo "-lpcap"
- 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
- 	then
--		echo "-I$includedir $LPATH $LIBS"
-+		echo ""
- 	elif [ "$show_cflags" = 1 ]
- 	then
--		echo "-I$includedir"
-+		echo ""
- 	elif [ "$show_libs" = 1 ]
- 	then
--		echo "$LPATH -l@PACKAGE_NAME@ $LIBS"
-+		echo "-lpcap"
  	elif [ "$show_additional_libs" = 1 ]
  	then
  		echo "$LIBS"
---
+@@ -80,15 +69,15 @@ else
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
++                echo "-lpcap"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir"
++                echo ""
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++                echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
++                echo "-lpcap"
+ 	fi
+ fi
+-- 
+1.8.3.1
+