From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Thu, 22 Dec 2022 12:05:51 +0000 (+0100)
Subject: libarchive: add missing CONFLICT
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b7c7fdb5bcfc9fdb0f6ab87a5a4f3303d6676983;p=feed%2Fpackages.git

libarchive: add missing CONFLICT

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
---

diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
index 9ccdedbd07..6ac6ff3b7f 100644
--- a/libs/libarchive/Makefile
+++ b/libs/libarchive/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libarchive
 PKG_VERSION:=3.5.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libarchive.org/downloads
@@ -36,6 +36,7 @@ endef
 define Package/libarchive
   $(call Package/libarchive/Default)
   DEPENDS += +libopenssl
+  CONFLICTS:=libarchive-noopenssl
 endef
 
 define Package/libarchive-noopenssl