From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3AC5B1582EF for ; Mon, 24 Feb 2025 22:17:05 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 24B783431D1 for ; Mon, 24 Feb 2025 22:17:05 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 219411102F2; Mon, 24 Feb 2025 22:17:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1C7521102F2 for ; Mon, 24 Feb 2025 22:17:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C31F234318D for ; Mon, 24 Feb 2025 22:17:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FDE3267D for ; Mon, 24 Feb 2025 22:17:02 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1740435269.8a5cceac58c0c8d623b6da6fa0cf7435666af29c.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/nzbget/files/, net-nntp/nzbget/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nntp/nzbget/Manifest net-nntp/nzbget/files/nzbget-24.6-build-with-par2-turbo-offline.patch net-nntp/nzbget/files/nzbget-24.6-fix-build-without-parcheck.patch net-nntp/nzbget/nzbget-24.6.ebuild X-VCS-Directories: net-nntp/nzbget/ net-nntp/nzbget/files/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 8a5cceac58c0c8d623b6da6fa0cf7435666af29c X-VCS-Branch: master Date: Mon, 24 Feb 2025 22:17:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3cbff63-6604-414f-92a7-2707ad358566 X-Archives-Hash: 7b26ec7aa4bf8d0764128e1139e6e48c commit: 8a5cceac58c0c8d623b6da6fa0cf7435666af29c Author: Louis Sautier gentoo org> AuthorDate: Mon Feb 24 22:07:03 2025 +0000 Commit: Louis Sautier gentoo org> CommitDate: Mon Feb 24 22:14:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5cceac net-nntp/nzbget: add 24.6, use ninja again This version can be built with ninja again so let's remove the "emake" override. Signed-off-by: Louis Sautier gentoo.org> net-nntp/nzbget/Manifest | 2 + ...nzbget-24.6-build-with-par2-turbo-offline.patch | 17 +++ .../nzbget-24.6-fix-build-without-parcheck.patch | 25 ++++ net-nntp/nzbget/nzbget-24.6.ebuild | 130 +++++++++++++++++++++ 4 files changed, 174 insertions(+) diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest index e2624db7a300..06626157ce16 100644 --- a/net-nntp/nzbget/Manifest +++ b/net-nntp/nzbget/Manifest @@ -2,4 +2,6 @@ DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b DIST nzbget-24.2.tar.gz 5512752 BLAKE2B ef4c6e562976030b790a93747d11d6b7059be7cb8bc9076068c037a0e8d25f09054ff280417b52f534af50aec0f11cd21959f995ae8252a21ea274aa7efdfc84 SHA512 ad280315f9a60bf206a134e3703337af2e2dfb8282dd5efc55af071f82f5f7e7857f819dd843f6ae70cd7fcea2c84de4db535d7658fb5255a380ffcf685a680f DIST nzbget-24.3.tar.gz 5533518 BLAKE2B 67614aecebb28b2664ab629beddeea6c492e1f32ba71854d1812c7c4e5b41219c1773c33d5952f6e2805bf5804d3fb1e410f9c6cdc0850a4d3036d4253f9c0ba SHA512 6a79f7fcc58c494af19179b6a98d5235423fc8d3a45c6ba969cf687948da25faaf9bcec074b7c9b8ccf2d3621e6bc2dc9c2ae67e877e89fa9a00b8f3ff4ca85a DIST nzbget-24.5.tar.gz 7283271 BLAKE2B eb03ac8136efe3650dfd3f5e53cf2b8e3d5ffdc783d81fb53b0afd530936ffe5e7053445ed1419f1b7d21f0d496a3bca6033f63a239180f7c0978435f991de92 SHA512 d077533b14934e36d0c0cdf6cead77f631754f381b3f11f5327eb42c6954f0979d18666bb7ee36733bc0f9f6350ec9a2751d367532ca13cf02060ea30e9f3848 +DIST nzbget-24.6.tar.gz 7299624 BLAKE2B 1a8c56f5418b6ef2db247e483dc41334e5e5dad1d08ddb64205713f64b8fd1658227d98de382ac78a5566ef4e2b71872d7076a5d582d6570c784166ee7471be0 SHA512 a316446bd566e5b8fff74077e0245efe71c982224c870103234498e1a28d8c4b5479b7ca96f9beb7cc8215d3ad39e5344d06a42e42baf23559911f5ea05a1645 DIST nzbgetcom-par2turbo-1.1.1-nzbget-20241128.tar.gz 3960077 BLAKE2B 461409c5f305029d5cd495441844de251a19e8c4b3eab184e765edef4ecbc723aa570d8daf0b282281da8577a2ab75876f3d90a02e92696e5b4fbf3768a2648a SHA512 9eea769b8d861afd30573d213d4341cb2bc201abcd2e3f68803d016d1b39b1edc92953169ceed5d626ee8ad7d655d02a0ebed92810e67bc538ceccef694599bf +DIST nzbgetcom-par2turbo-1.2.0-nzbget-20250213.tar.gz 3964785 BLAKE2B 049771c21a5febe453d2866eebca3a91c145f5b054f2dfa8226d0b5245753506c184f1ad7739bd76eaad0343e87bc0e7abc2830b3cedd6e459bef64f596e3853 SHA512 fdf639759361440fef6948a61391ad579070575a2d9a62a39b0e5ff87beb365d4baab2a56fffb672e78a2094748fbf0d17abc50144914e5fb5ffe432e9c02a9d diff --git a/net-nntp/nzbget/files/nzbget-24.6-build-with-par2-turbo-offline.patch b/net-nntp/nzbget/files/nzbget-24.6-build-with-par2-turbo-offline.patch new file mode 100644 index 000000000000..462e05aa96b2 --- /dev/null +++ b/net-nntp/nzbget/files/nzbget-24.6-build-with-par2-turbo-offline.patch @@ -0,0 +1,17 @@ +Patch the build system to support par2-turbo downloaded into the source +directory. +--- a/cmake/par2-turbo.cmake ++++ b/cmake/par2-turbo.cmake +@@ -42,11 +42,7 @@ endif() + ExternalProject_add( + par2-turbo + PREFIX par2-turbo +- GIT_REPOSITORY https://github.com/nzbgetcom/par2cmdline-turbo.git +- GIT_TAG v1.2.0-nzbget-20250213 +- TLS_VERIFY TRUE +- GIT_SHALLOW TRUE +- GIT_PROGRESS TRUE ++ URL par2-turbo + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + BUILD_BYPRODUCTS ${PAR2_LIBS} + CMAKE_ARGS ${CMAKE_ARGS} diff --git a/net-nntp/nzbget/files/nzbget-24.6-fix-build-without-parcheck.patch b/net-nntp/nzbget/files/nzbget-24.6-fix-build-without-parcheck.patch new file mode 100644 index 000000000000..267e9859ff75 --- /dev/null +++ b/net-nntp/nzbget/files/nzbget-24.6-fix-build-without-parcheck.patch @@ -0,0 +1,25 @@ +Otherwise, the build fails with "error: ‘setfill’ is not a member of +‘std’" when -DDISABLE_PARCHECK=yes is used. +--- a/daemon/nntp/ArticleWriter.cpp ++++ b/daemon/nntp/ArticleWriter.cpp +@@ -22,6 +22,7 @@ + #include "nzbget.h" + + #include ++#include + #include "ArticleWriter.h" + #include "DiskState.h" + #include "Options.h" +--- a/daemon/queue/DirectRenamer.cpp ++++ b/daemon/queue/DirectRenamer.cpp +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include "DirectRenamer.h" + #include "Options.h" + #include "FileSystem.h" +-- +2.48.1 + diff --git a/net-nntp/nzbget/nzbget-24.6.ebuild b/net-nntp/nzbget/nzbget-24.6.ebuild new file mode 100644 index 000000000000..1b9f3dae9499 --- /dev/null +++ b/net-nntp/nzbget/nzbget-24.6.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd + +PAR2_TURBO_VER="1.2.0-nzbget-20250213" +DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files" +HOMEPAGE="https://nzbget.com/" +SRC_URI=" + parcheck? ( + https://github.com/nzbgetcom/par2cmdline-turbo/archive/v${PAR2_TURBO_VER}.tar.gz + -> nzbgetcom-par2turbo-${PAR2_TURBO_VER}.tar.gz + ) + https://github.com/nzbgetcom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="gnutls ncurses +parcheck ssl test zlib" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/boost:= + dev-libs/libxml2:= + ncurses? ( sys-libs/ncurses:0= ) + ssl? ( + gnutls? ( + net-libs/gnutls:= + dev-libs/nettle:= + ) + !gnutls? ( dev-libs/openssl:0=[-bindist(-)] ) + ) + zlib? ( sys-libs/zlib:= )" +RDEPEND=" + ${DEPEND} + acct-user/nzbget + acct-group/nzbget +" +BDEPEND=" + test? ( + || ( + app-arch/rar + app-arch/unrar + ) + ) + virtual/pkgconfig +" + +DOCS=( ChangeLog.md README.md nzbget.conf ) + +PATCHES=( + # Required to use par2-turbo downloaded into the source directory + "${FILESDIR}/${P}-build-with-par2-turbo-offline.patch" + # https://github.com/nzbgetcom/nzbget/pull/514 + "${FILESDIR}/${P}-fix-build-without-parcheck.patch" +) + +src_prepare() { + if use parcheck; then + mv "${WORKDIR}/par2cmdline-turbo-${PAR2_TURBO_VER}" par2-turbo || die + fi + cmake_src_prepare + + # Update the main configuration file with the correct paths + sed -i nzbget.conf \ + -e "s:^WebDir=.*:WebDir=${EPREFIX}/usr/share/nzbget/webui:" \ + -e "s:^ConfigTemplate=.*:ConfigTemplate=${EPREFIX}/usr/share/nzbget/nzbget.conf:" \ + || die + # Update the daemon-specific configuration file (used by the OpenRC and + # systemd services) + sed nzbget.conf > nzbgetd.conf \ + -e "s:^MainDir=.*:MainDir=${EPREFIX}/var/lib/nzbget:" \ + -e "s:^LogFile=.*:LogFile=${EPREFIX}/var/log/nzbget/nzbget.log:" \ + -e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \ + || die +} + +src_configure() { + local mycmakeargs=( + -DDISABLE_CURSES=$(usex !ncurses) + -DDISABLE_PARCHECK=$(usex !parcheck) + -DDISABLE_TLS=$(usex !ssl) + -DDISABLE_GZIP=$(usex !zlib) + -DUSE_OPENSSL=$(usex !gnutls) + -DUSE_GNUTLS=$(usex gnutls) + -DENABLE_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc + doins nzbget.conf + doins nzbgetd.conf + + # The configuration file's "ConfigTemplate" option points to this, we must + # make sure it exists as the Web UI reads it. It is not installed by + # default, see the "install-conf" target in cmake/install.cmake. + insinto /usr/share/nzbget + doins nzbget.conf + + keepdir /var/log/nzbget + + newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget + newconfd "${FILESDIR}"/nzbget.confd nzbget + systemd_dounit "${FILESDIR}"/nzbget.service +} + +pkg_preinst() { + fowners nzbget:nzbget /var/log/nzbget + fperms 750 /var/log/nzbget + + fowners nzbget:nzbget /etc/nzbgetd.conf + fperms 640 /etc/nzbgetd.conf +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog + elog "Please add users that you want to be able to use the system-wide" + elog "nzbget daemon to the nzbget group. To access the daemon, run nzbget" + elog "with the --configfile /etc/nzbgetd.conf option." + elog + fi +}