From patchwork Thu Jun 6 16:48:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7847 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Vw9Jn4BTMz3wxV for ; Thu, 6 Jun 2024 16:48:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Vw9Jj1Y1Rz15h; Thu, 6 Jun 2024 16:48:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Vw9Jh5mTRz337t; Thu, 6 Jun 2024 16:48:52 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Vw9Jf2Ln2z336F for ; Thu, 6 Jun 2024 16:48:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Vw9Jd2vklzcx; Thu, 6 Jun 2024 16:48:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1717692529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9esz+hdCM2i7AHTnDjAtzGzZ64Xwb4sl44p0A8ZAN2M=; b=7Jlby5HLkOziSysW5dY5NBtdASJYHomaA8xsImUgtxdJSbthPuFllx8rRPwGIXwzEABVOp GqpaczZdcmhURqAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1717692529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9esz+hdCM2i7AHTnDjAtzGzZ64Xwb4sl44p0A8ZAN2M=; b=enuJW6co10rLb9oR8vq5FEIJqMb+MeZr/JsHd6d4ZCeB6Y+jlNCFWU2/TYcpYFb1L30AOO 44IBIuhEcIk/AjgGhsMUqH/7RObt+VZDkhxrpNYhpDOfKcdgzhW/tgV3yST/UtkWHGiAMT Gru9aLpQnwX7CI5Ca3MaqL6dJimK/pPQ3jnq9j9b8O9ot24S3ga3Or6647Fu0hRSQP8eKW 3HZ+ABfKwZQTyS8Dw5Hlhz5boSDCLM2kJfT2Dw6RHtpk97rVMp/+WrpCEhK+QT6tKU8Nes 7qkYR4cOVd80vIQx2muixzlc7bCRTOKytwDsqC/tpMEFNDBCagNlDOEQ3ntf6Q== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/3] libid3tag: Update to version 0.16.3 Date: Thu, 6 Jun 2024 18:48:41 +0200 Message-ID: <20240606164843.90198-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 3ZYJWI2VT4KACQXUFZYIGFPOMI3NWFR2 X-Message-ID-Hash: 3ZYJWI2VT4KACQXUFZYIGFPOMI3NWFR2 X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 0.15.1b to 0.16.3 - Update of rootfile - A new fork has been made of the libid3tag. This is now being managed by Tenacity. The latest version has a library change so that any package using the old version will work with the new one. - Changelog 0.16.3 This release fixes backwards compatibility issues with libid3tag 0.15.1b. #8 - Define a separate library soversion, which is set to 0 to preserve ABI compatibility. Note: no functionality was changed in this release. This and the previous release are identical in terms of functionality. Compatibility With the changes listed above, libid3tag is both source compatible and binary (ABI) compatible with programs linked against libid3tag 0.15.1b. We will continue to guarantee this compatibility for as long as we can. Existing libid3tag 0.15.1b packages can be easily switched to this version without breakage. Reporting Issues or Contributing Patches Our version of libid3tag contains all kinds of integrated packages plus our own tweaks. However, if you have a patch or two that haven't been integrated into our fork yet, please feel free to open a pull request. Just like Tenacity, we aim to have libid3tag packaged and working on as many platforms as we can without patches. 0.16.2 Fix null pointer dereference in id3_ucs4_length (CVE-2017-11550) 0.16.1 Fix exported CMake config file Fix pkgconfig file name to match Linux distro packages (id3tag instead of libid3tag). 0.16.0 Add CMake build system Remove autotools build system Install pkgconfig and CMake config files Apply patches from Debian, Fedora, Arch, and Gentoo Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- config/rootfiles/packages/libid3tag | 9 ++++++--- lfs/libid3tag | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/packages/libid3tag b/config/rootfiles/packages/libid3tag index 575804c01..c3aa25ed3 100644 --- a/config/rootfiles/packages/libid3tag +++ b/config/rootfiles/packages/libid3tag @@ -1,7 +1,10 @@ #usr/include/id3tag.h -#usr/lib/libid3tag.a -#usr/lib/libid3tag.la +#usr/lib/cmake/id3tag +#usr/lib/cmake/id3tag/id3tagConfig.cmake +#usr/lib/cmake/id3tag/id3tagConfigVersion.cmake +#usr/lib/cmake/id3tag/id3tagTargets-noconfig.cmake +#usr/lib/cmake/id3tag/id3tagTargets.cmake #usr/lib/libid3tag.so usr/lib/libid3tag.so.0 -usr/lib/libid3tag.so.0.3.0 +usr/lib/libid3tag.so.0.16.3 #usr/lib/pkgconfig/id3tag.pc diff --git a/lfs/libid3tag b/lfs/libid3tag index 5ce682662..b7f1ff19d 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,15 +26,15 @@ include Config SUMMARY = ID3 Tag Manipulation Library -VER = 0.15.1b +VER = 0.16.3 THISAPP = libid3tag-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/$(PROG) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libid3tag -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 +$(DL_FILE)_BLAKE2 = 58a4ce211aebef4b2f1f0e1a7214e2804e71d2cea805d3c275812978fb702148c5b435c289f9e83fd81fa1970bf83b7b8e772ed24843bcae7519fff455b50c15 install : $(TARGET) @@ -82,11 +82,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - # install id3tag pkgconfig file - install -v -m 644 ${DIR_SRC}/config/libid3tag/id3tag.pc \ - /usr/lib/pkgconfig/id3tag.pc - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) @$(POSTBUILD)