From ade9448c01e15fb3e27a84bf5bed8395bddf8918 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Fri, 20 Dec 2024 14:37:16 +0100
Subject: [PATCH 1/2] fix(sockutls): Fix potential macro colission including
 standard headers

---
 components/sock_utils/include/netdb_macros.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/components/sock_utils/include/netdb_macros.h b/components/sock_utils/include/netdb_macros.h
index 6c518c9bbe..91987dc91f 100644
--- a/components/sock_utils/include/netdb_macros.h
+++ b/components/sock_utils/include/netdb_macros.h
@@ -5,6 +5,17 @@
  */
 #pragma once
 
+#include "sdkconfig.h"
+#ifndef CONFIG_IDF_TARGET_LINUX
+#include <netinet/in.h>   // For network-related definitions
+#include <sys/socket.h>   // For socket-related definitions
+#include <net/if.h>       // For interface flags (e.g., IFF_UP)
+#include <netdb.h>        // For NI_NUMERICHOST, NI_NUMERICSERV, etc.
+#include <errno.h>        // For EAI_BADFLAGS
+#include <sys/un.h>       // For AF_UNIX
+#include <sys/types.h>    // For PF_LOCAL
+#endif
+
 #ifndef NI_NUMERICHOST
 #define NI_NUMERICHOST  0x1
 #endif

From 0499ed93df7725d689c31d1d8ff62fcfbf01661c Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Fri, 20 Dec 2024 15:41:10 +0100
Subject: [PATCH 2/2] bump(sockutls): 0.2.0 -> 0.2.1

0.2.1
Bug Fixes
- Fix potential macro colission including standard headers (ade9448c)
---
 components/sock_utils/.cz.yaml          | 2 +-
 components/sock_utils/CHANGELOG.md      | 6 ++++++
 components/sock_utils/idf_component.yml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/sock_utils/.cz.yaml b/components/sock_utils/.cz.yaml
index c58b02998e..ed20caec5f 100644
--- a/components/sock_utils/.cz.yaml
+++ b/components/sock_utils/.cz.yaml
@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(sockutls): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py sock_utils
   tag_format: sock_utils-v$version
-  version: 0.2.0
+  version: 0.2.1
   version_files:
   - idf_component.yml
diff --git a/components/sock_utils/CHANGELOG.md b/components/sock_utils/CHANGELOG.md
index 7034928b30..fcaa12cf31 100644
--- a/components/sock_utils/CHANGELOG.md
+++ b/components/sock_utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.2.1](https://github.com/espressif/esp-protocols/commits/sock_utils-v0.2.1)
+
+### Bug Fixes
+
+- Fix potential macro colission including standard headers ([ade9448c](https://github.com/espressif/esp-protocols/commit/ade9448c))
+
 ## [0.2.0](https://github.com/espressif/esp-protocols/commits/sock_utils-v0.2.0)
 
 ### Features
diff --git a/components/sock_utils/idf_component.yml b/components/sock_utils/idf_component.yml
index 081c2b9842..171a8c8b32 100644
--- a/components/sock_utils/idf_component.yml
+++ b/components/sock_utils/idf_component.yml
@@ -1,4 +1,4 @@
-version: 0.2.0
+version: 0.2.1
 description: The component provides helper implementation of common system/socket utilities
 url: https://github.com/espressif/esp-protocols/tree/master/components/sock_utils
 dependencies: