From patchwork Tue Aug 9 10:35:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5852 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M28cR6Ll9z3x1v for ; Tue, 9 Aug 2022 10:36:07 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M28cQ19SDz1Lv; Tue, 9 Aug 2022 10:36:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M28cP6n0yz303Y; Tue, 9 Aug 2022 10:36:05 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M28cP0Q64z2yPS for ; Tue, 9 Aug 2022 10:36:05 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M28cN34Btzr1; Tue, 9 Aug 2022 10:36:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660041364; 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=a2R5GM5aVlG9a1OCANAXjhrgaF10PXePDk3jr3l7TpA=; b=B83qZrFOEDwQCheevvtLhtGt4XvSJqBNMe7J/znVQXVc9yodMEUGQFvkCy+BK7rQblp3WW hghDTyQ3EBFBhSAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660041364; 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=a2R5GM5aVlG9a1OCANAXjhrgaF10PXePDk3jr3l7TpA=; b=wlXJvkoxaa61tkBGh2Vs/nvOYGEDhnNpLYNq38vxByBvZpeirQ0x7KyU+efAIvFh6javcw pI/3+hwQRyGLInRvS4KkhTZNqYYkDBmC5BrCaokxMqBoGFDOezKQINXZ2lZLGAz3BFqppx 386azusiOv1l5XyyY3gKiyZdklJATHnOGJybothtiyKjw0vuTHSPfPjJLquxHpbKTtnnxZ n4WMF+Kn2JorUKtjVI5H6hnZ5V810ichAG0yK2IYSHJW0Boj6siqCRX9YVrGlCydSNsuwR md1YN1UpORZWigB+aAUtEsrJRV7vWHTUIQeZKpedRCle6HVUxLxQDkiEUaVWNg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/4] libplist: New package Date: Tue, 9 Aug 2022 10:35:54 +0000 Message-Id: <20220809103557.1612824-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" A library to handle Apple Property List format in binary or XML. Signed-off-by: Michael Tremer --- config/rootfiles/packages/libplist | 31 ++++++++++ lfs/libplist | 91 ++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 123 insertions(+) create mode 100644 config/rootfiles/packages/libplist create mode 100644 lfs/libplist diff --git a/config/rootfiles/packages/libplist b/config/rootfiles/packages/libplist new file mode 100644 index 000000000..3f3f8e5a7 --- /dev/null +++ b/config/rootfiles/packages/libplist @@ -0,0 +1,31 @@ +#usr/bin/plistutil +#usr/include/plist +#usr/include/plist/Array.h +#usr/include/plist/Boolean.h +#usr/include/plist/Data.h +#usr/include/plist/Date.h +#usr/include/plist/Dictionary.h +#usr/include/plist/Integer.h +#usr/include/plist/Key.h +#usr/include/plist/Node.h +#usr/include/plist/Real.h +#usr/include/plist/String.h +#usr/include/plist/Structure.h +#usr/include/plist/Uid.h +#usr/include/plist/cython +#usr/include/plist/cython/plist.pxd +#usr/include/plist/plist++.h +#usr/include/plist/plist.h +#usr/lib/libplist++-2.0.la +#usr/lib/libplist++-2.0.so +usr/lib/libplist++-2.0.so.3 +usr/lib/libplist++-2.0.so.3.3.0 +#usr/lib/libplist-2.0.la +#usr/lib/libplist-2.0.so +usr/lib/libplist-2.0.so.3 +usr/lib/libplist-2.0.so.3.3.0 +#usr/lib/pkgconfig/libplist++-2.0.pc +#usr/lib/pkgconfig/libplist-2.0.pc +#usr/lib/python3.10/site-packages/plist.la +usr/lib/python3.10/site-packages/plist.so +#usr/share/man/man1/plistutil.1 diff --git a/lfs/libplist b/lfs/libplist new file mode 100644 index 000000000..eb53366f9 --- /dev/null +++ b/lfs/libplist @@ -0,0 +1,91 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = A library to handle Apple Property List format in binary or XML + +VER = 2.2.0 + +THISAPP = libplist-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libplist +PAK_VER = 1 + +DEPS = + +SERVICES = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = d161fc2963d58235a41a9aafcac56f428000a5e95f627163ec73639a5b291d4ba33073f048b5e402107723e7e15c1f7efac7cf9941258caa60eb496ec3696dbb + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 85f386bce..33adf0b75 100755 --- a/make.sh +++ b/make.sh @@ -1704,6 +1704,7 @@ buildipfire() { lfsmake2 i2c-tools lfsmake2 nss-myhostname lfsmake2 dehydrated + lfsmake2 libplist lfsmake2 shairport-sync lfsmake2 borgbackup lfsmake2 lmdb From patchwork Tue Aug 9 10:35:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5854 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M28cV015Qz40V5 for ; Tue, 9 Aug 2022 10:36:10 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M28cQ40Nlz5Rd; Tue, 9 Aug 2022 10:36:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M28cQ0HRJz30H6; Tue, 9 Aug 2022 10:36:06 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M28cP0nStz2ySt for ; Tue, 9 Aug 2022 10:36:05 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M28cN73fsz1NH; Tue, 9 Aug 2022 10:36:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660041365; 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: in-reply-to:in-reply-to:references:references; bh=rgOfkCtSBUJXw2Ojvm9ua6Hx421atMjSGhoawSB759g=; b=jNQCkC0RBsm34H+uMsCc+EBpCMjEbsqvAMN//KplrgZebB0EznF8WlibDlj2OJ/jYmoKBZ Za45lX5IDkkgQDCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660041365; 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: in-reply-to:in-reply-to:references:references; bh=rgOfkCtSBUJXw2Ojvm9ua6Hx421atMjSGhoawSB759g=; b=kfsqMqPDEg7U1Zc/2Gpwe+LXQC+YLqHBFnB6yLpbED6I65X79KQUIziKfEObYNEk3KRLUE i3qdqMhBrWlcrBJ5sa/pPm1+g6ND0Q1arxHhAa/92sndN2znfGMztgFEeO66lo4m39Nz9e 8ToO01gJ2cxcv2PllAXHxva+GtCD8U6iXcOms6sflzlFBAT2C0Fe0qKxn3g0tjFDb81KBJ JOsRmXDGs3rWaNq9IXG2r10FdRmsQne9wQQEh+nUEqCsZRyHdqpXG6H6o6TBsO8Bn54xNH G9z/4n0JvoABnoHdV96leZFVA+NGKj9HJEwbjOpv0vHrhMelSfy8yY0mxSzQEg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/4] libsodium: New package Date: Tue, 9 Aug 2022 10:35:55 +0000 Message-Id: <20220809103557.1612824-2-michael.tremer@ipfire.org> In-Reply-To: <20220809103557.1612824-1-michael.tremer@ipfire.org> References: <20220809103557.1612824-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Sodium is a new, easy-to-use software library for encryption, decryption, signatures, password hashing and more. Signed-off-by: Michael Tremer --- config/rootfiles/common/libsodium | 69 ++++++++++++++++++++++++++ lfs/libsodium | 80 +++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 150 insertions(+) create mode 100644 config/rootfiles/common/libsodium create mode 100644 lfs/libsodium diff --git a/config/rootfiles/common/libsodium b/config/rootfiles/common/libsodium new file mode 100644 index 000000000..741f99405 --- /dev/null +++ b/config/rootfiles/common/libsodium @@ -0,0 +1,69 @@ +#usr/include/sodium +#usr/include/sodium.h +#usr/include/sodium/core.h +#usr/include/sodium/crypto_aead_aes256gcm.h +#usr/include/sodium/crypto_aead_chacha20poly1305.h +#usr/include/sodium/crypto_aead_xchacha20poly1305.h +#usr/include/sodium/crypto_auth.h +#usr/include/sodium/crypto_auth_hmacsha256.h +#usr/include/sodium/crypto_auth_hmacsha512.h +#usr/include/sodium/crypto_auth_hmacsha512256.h +#usr/include/sodium/crypto_box.h +#usr/include/sodium/crypto_box_curve25519xchacha20poly1305.h +#usr/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +#usr/include/sodium/crypto_core_ed25519.h +#usr/include/sodium/crypto_core_hchacha20.h +#usr/include/sodium/crypto_core_hsalsa20.h +#usr/include/sodium/crypto_core_ristretto255.h +#usr/include/sodium/crypto_core_salsa20.h +#usr/include/sodium/crypto_core_salsa2012.h +#usr/include/sodium/crypto_core_salsa208.h +#usr/include/sodium/crypto_generichash.h +#usr/include/sodium/crypto_generichash_blake2b.h +#usr/include/sodium/crypto_hash.h +#usr/include/sodium/crypto_hash_sha256.h +#usr/include/sodium/crypto_hash_sha512.h +#usr/include/sodium/crypto_kdf.h +#usr/include/sodium/crypto_kdf_blake2b.h +#usr/include/sodium/crypto_kx.h +#usr/include/sodium/crypto_onetimeauth.h +#usr/include/sodium/crypto_onetimeauth_poly1305.h +#usr/include/sodium/crypto_pwhash.h +#usr/include/sodium/crypto_pwhash_argon2i.h +#usr/include/sodium/crypto_pwhash_argon2id.h +#usr/include/sodium/crypto_pwhash_scryptsalsa208sha256.h +#usr/include/sodium/crypto_scalarmult.h +#usr/include/sodium/crypto_scalarmult_curve25519.h +#usr/include/sodium/crypto_scalarmult_ed25519.h +#usr/include/sodium/crypto_scalarmult_ristretto255.h +#usr/include/sodium/crypto_secretbox.h +#usr/include/sodium/crypto_secretbox_xchacha20poly1305.h +#usr/include/sodium/crypto_secretbox_xsalsa20poly1305.h +#usr/include/sodium/crypto_secretstream_xchacha20poly1305.h +#usr/include/sodium/crypto_shorthash.h +#usr/include/sodium/crypto_shorthash_siphash24.h +#usr/include/sodium/crypto_sign.h +#usr/include/sodium/crypto_sign_ed25519.h +#usr/include/sodium/crypto_sign_edwards25519sha512batch.h +#usr/include/sodium/crypto_stream.h +#usr/include/sodium/crypto_stream_chacha20.h +#usr/include/sodium/crypto_stream_salsa20.h +#usr/include/sodium/crypto_stream_salsa2012.h +#usr/include/sodium/crypto_stream_salsa208.h +#usr/include/sodium/crypto_stream_xchacha20.h +#usr/include/sodium/crypto_stream_xsalsa20.h +#usr/include/sodium/crypto_verify_16.h +#usr/include/sodium/crypto_verify_32.h +#usr/include/sodium/crypto_verify_64.h +#usr/include/sodium/export.h +#usr/include/sodium/randombytes.h +#usr/include/sodium/randombytes_internal_random.h +#usr/include/sodium/randombytes_sysrandom.h +#usr/include/sodium/runtime.h +#usr/include/sodium/utils.h +#usr/include/sodium/version.h +#usr/lib/libsodium.la +#usr/lib/libsodium.so +usr/lib/libsodium.so.23 +usr/lib/libsodium.so.23.3.0 +#usr/lib/pkgconfig/libsodium.pc diff --git a/lfs/libsodium b/lfs/libsodium new file mode 100644 index 000000000..75c3aaf63 --- /dev/null +++ b/lfs/libsodium @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.18 + +THISAPP = libsodium-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 33adf0b75..f577578a1 100755 --- a/make.sh +++ b/make.sh @@ -1180,6 +1180,7 @@ buildipfire() { lfsmake2 libgcrypt lfsmake2 libassuan lfsmake2 nettle + lfsmake2 libsodium lfsmake2 json-c lfsmake2 libconfig lfsmake2 libevent2 From patchwork Tue Aug 9 10:35:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5853 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M28cT4w3Qz3x1v for ; Tue, 9 Aug 2022 10:36:09 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M28cQ4F5Cz5Tn; Tue, 9 Aug 2022 10:36:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M28cQ0Zzrz330C; Tue, 9 Aug 2022 10:36:06 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M28cP1963z2yZf for ; Tue, 9 Aug 2022 10:36:05 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M28cP0fqjz1YK; Tue, 9 Aug 2022 10:36:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660041365; 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: in-reply-to:in-reply-to:references:references; bh=ilxE57fADE1FGVjO4uOfGMcI9PipCq1CMcLNXzwpsJU=; b=J7KrP7LDFcLxnaO295ClHHnXFYAhJKunXq8ii7QXSykOy32+L+fhSEvTNtakK1GNn1+zZc lV0snznaiwKMNoBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660041365; 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: in-reply-to:in-reply-to:references:references; bh=ilxE57fADE1FGVjO4uOfGMcI9PipCq1CMcLNXzwpsJU=; b=dOYhAnTQPbbWGpM1o0kouczTXbPS6mO1/1PlidB4mCs+nHm2mqhQBOqOwjzIRqc6KQqiEh zL839NIzFwsvfu5elhuP954x2YqDS4ef9Z9lLrFa0j3j/XuiuGKNdDshR4KRIrt+0IAwEk 4LYDUJZyEm4Kj7WsnJksHb2z5YkAQkohjGpajNVbVJgLsJ1mDVpSB6fZVqLCNVFHbqX/0i QiX+qVZldfsCv9vqVSX4UrRV4epEJljpHTyHU/TyrB9hfpYQUWG7btRI7wv/eoxGAg2Qd3 Sk2ZcGmIVBVhzo/6NEl4U5fs89pktJSSAQLe5Se2P+ZbyxFU52OvhxXeA/7FHQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/4] shairport-sync: Add support for Airplay v2 Date: Tue, 9 Aug 2022 10:35:56 +0000 Message-Id: <20220809103557.1612824-3-michael.tremer@ipfire.org> In-Reply-To: <20220809103557.1612824-1-michael.tremer@ipfire.org> References: <20220809103557.1612824-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a current snapshot of the development branch which adds support for Airplay v2. Signed-off-by: Michael Tremer --- lfs/shairport-sync | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lfs/shairport-sync b/lfs/shairport-sync index aec88c5b9..5321c0ecd 100644 --- a/lfs/shairport-sync +++ b/lfs/shairport-sync @@ -26,7 +26,7 @@ include Config SUMMARY = An AirPlay audio player -VER = 3.3.8 +VER = 3cc1ec6 THISAPP = shairport-sync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = shairport-sync -PAK_VER = 6 +PAK_VER = 7 -DEPS = alac alsa avahi libdaemon soxr +DEPS = alac alsa avahi ffmpeg libdaemon libplist soxr SERVICES = shairport-sync @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = adaaef3a65d3ffccda2ba3ed324312fe5e95db00f2ae2c67afd49a43e6e5c8517d7eeb751f0b663a1e75a470f1cfcd9547e26bd11fa095565ba048d98465dcd8 +$(DL_FILE)_BLAKE2 = 746bd603bded210608f934952a7d1100214960781f8bacf7c95905fbd1ceab91378bc532b007bdec1f170c4aa905fcc0f41f16287116026fbad111ba8177fb8f install : $(TARGET) @@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --with-airplay-2 \ --with-alsa \ --with-apple-alac \ --with-avahi \ From patchwork Tue Aug 9 10:35:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5855 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M28cV3RPtz40Wm for ; Tue, 9 Aug 2022 10:36:10 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M28cR1sS2z5Tx; Tue, 9 Aug 2022 10:36:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M28cQ0vgzz330J; Tue, 9 Aug 2022 10:36:06 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M28cP1zZ9z2yjw for ; Tue, 9 Aug 2022 10:36:05 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M28cP1CYJz1Lv; Tue, 9 Aug 2022 10:36:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660041365; 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: in-reply-to:in-reply-to:references:references; bh=Uj9fhPS7V/Qg6s4GP0Wvcq0qdXDchp8CQwA7xXlXLq0=; b=h7XYl7oGOE8GSsXTr50VT9l4IKYap0Aq85D8Jx+GW3OaYTkZw6EaLK+K4DJ/u2FeYxBNN3 fr+25RdS/dSZt8CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660041365; 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: in-reply-to:in-reply-to:references:references; bh=Uj9fhPS7V/Qg6s4GP0Wvcq0qdXDchp8CQwA7xXlXLq0=; b=ZQ5BIEXn3Uf/bDrg3EyLTxcBxLNnabud9Ugslfu555BSe77GuNCA7Kp3KU9ZqVeeGcX3xR 2ub3IOA8TyF/euEVooLBI51iKiKAdfaFdHlvyctGABjnfSUI28lNVxRc5Rls7jnfcw6F2f 80SaGTUTngolD6WYFsKc/iH+oTL3PRN0corSgS34iscoH1CHk6uw27nEqHxQuWdR1Nm/Ny NiIe5ivQTa3EWcggMDaUImqLESSscXoMtte3/7NhSUH9PAztMXngoJBi48nGtV6LsihX0p kOJzpp9tWDNH2m1uBPFaH4Fuhb+GjzOO6OPstCrsDpv0CeCMFyUPuqDouinq9A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/4] nqptp: New package Date: Tue, 9 Aug 2022 10:35:57 +0000 Message-Id: <20220809103557.1612824-4-michael.tremer@ipfire.org> In-Reply-To: <20220809103557.1612824-1-michael.tremer@ipfire.org> References: <20220809103557.1612824-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a PTP clock synchronisation daemon. Signed-off-by: Michael Tremer --- config/rootfiles/packages/nqptp | 2 + lfs/nqptp | 94 +++++++++++++++++++++++++++++++++ lfs/shairport-sync | 2 +- make.sh | 1 + src/initscripts/packages/nqptp | 51 ++++++++++++++++++ 5 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/packages/nqptp create mode 100644 lfs/nqptp create mode 100755 src/initscripts/packages/nqptp diff --git a/config/rootfiles/packages/nqptp b/config/rootfiles/packages/nqptp new file mode 100644 index 000000000..6145d7f8d --- /dev/null +++ b/config/rootfiles/packages/nqptp @@ -0,0 +1,2 @@ +etc/rc.d/init.d/nqptp +usr/bin/nqptp diff --git a/lfs/nqptp b/lfs/nqptp new file mode 100644 index 000000000..3f523d00d --- /dev/null +++ b/lfs/nqptp @@ -0,0 +1,94 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = nqptp is a daemon that monitors timing data from any PTP clocks + +VER = d900567 + +THISAPP = nqptp-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = nqptp +PAK_VER = 1 + +SERVICES = nqptp + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 83db62518577bda0198e989a1274c46b0f0c658cf281fd282b4b1e51544339c00a3e6da43a472e8de50bcd3926c113ca7cd29e8e562de8b1260763d64baa069b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && autoreconf -vfi + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --without-systemd-startup + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Initscript + $(call INSTALL_INITSCRIPTS,$(SERVICES)) + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/shairport-sync b/lfs/shairport-sync index 5321c0ecd..95499f7ee 100644 --- a/lfs/shairport-sync +++ b/lfs/shairport-sync @@ -36,7 +36,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = shairport-sync PAK_VER = 7 -DEPS = alac alsa avahi ffmpeg libdaemon libplist soxr +DEPS = alac alsa avahi ffmpeg libdaemon libplist nqptp soxr SERVICES = shairport-sync diff --git a/make.sh b/make.sh index f577578a1..e5cb873b0 100755 --- a/make.sh +++ b/make.sh @@ -1706,6 +1706,7 @@ buildipfire() { lfsmake2 nss-myhostname lfsmake2 dehydrated lfsmake2 libplist + lfsmake2 nqptp lfsmake2 shairport-sync lfsmake2 borgbackup lfsmake2 lmdb diff --git a/src/initscripts/packages/nqptp b/src/initscripts/packages/nqptp new file mode 100755 index 000000000..a1bf1a73a --- /dev/null +++ b/src/initscripts/packages/nqptp @@ -0,0 +1,51 @@ +#!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting Not Quite PTP..." + /usr/bin/nqptp & + evaluate_retval + ;; + + stop) + boot_mesg "Stopping Not Quite PTP..." + killproc /usr/bin/nqptp + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/nqptp + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac