From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2FFF51581C1 for ; Wed, 17 Jul 2024 01:09:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32877E2A5D; Wed, 17 Jul 2024 01:09:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 15679E2A5D for ; Wed, 17 Jul 2024 01:09:32 +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 06D7333BF60 for ; Wed, 17 Jul 2024 01:09:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 607281B89 for ; Wed, 17 Jul 2024 01:09:29 +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: <1721178487.54e661770fa7c07f2e661accd98b71c4e73ad4fd.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.1-fix-allocah.patch net-nntp/nzbget/metadata.xml net-nntp/nzbget/nzbget-24.1.ebuild X-VCS-Directories: net-nntp/nzbget/files/ net-nntp/nzbget/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 54e661770fa7c07f2e661accd98b71c4e73ad4fd X-VCS-Branch: master Date: Wed, 17 Jul 2024 01:09:29 +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: 73b6e924-3ebe-44ec-a310-39825993a38b X-Archives-Hash: d8082586dfd7593b47fd6f6f73177484 commit: 54e661770fa7c07f2e661accd98b71c4e73ad4fd Author: Louis Sautier gentoo org> AuthorDate: Sun Jul 14 14:33:45 2024 +0000 Commit: Louis Sautier gentoo org> CommitDate: Wed Jul 17 01:08:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e66177 net-nntp/nzbget: add 24.1 from new nzbget.com fork, #911617 https://github.com/nzbget/nzbget has been archived since 2022. We initially thought of switching to https://github.com/nzbget-ng/nzbget but https://github.com/nzbgetcom/nzbget seems more active. Closes: https://bugs.gentoo.org/911617 Signed-off-by: Louis Sautier gentoo.org> net-nntp/nzbget/Manifest | 1 + .../nzbget/files/nzbget-24.1-fix-allocah.patch | 39 ++++++++ net-nntp/nzbget/metadata.xml | 5 +- net-nntp/nzbget/nzbget-24.1.ebuild | 110 +++++++++++++++++++++ 4 files changed, 152 insertions(+), 3 deletions(-) diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest index c4912cd5ee43..059d1d38d04c 100644 --- a/net-nntp/nzbget/Manifest +++ b/net-nntp/nzbget/Manifest @@ -1 +1,2 @@ DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b46500925de478bf11cab8e66fb36dee9458533a4194d82123765b29e37914463d72fd206e218b4875861001a SHA512 d8dc1ad324f675c5505e623049a14c022475267aa03dcd5d8fd6cf9ed3b776cc2776077b61d035e252937ea4b6bf8f90bd33e715cfd842d2e012615df3ffeafb +DIST nzbget-24.1.tar.gz 5365282 BLAKE2B 4fe260c361888d99eaf457a520b39560320b86d181cd12891b35962c9d4c6d773aeb389bf2254029fc58643bb5b04eb24917db9319f1a1068014feed08521dde SHA512 eb4a60cb3a529e2fb8242615e57758ceed615a573fabbe7170490e7af8c228edc90a096860ab7cf49ee85fc834cb8db30aa866c4f149679396139e54c166cf5c diff --git a/net-nntp/nzbget/files/nzbget-24.1-fix-allocah.patch b/net-nntp/nzbget/files/nzbget-24.1-fix-allocah.patch new file mode 100644 index 000000000000..335800118e31 --- /dev/null +++ b/net-nntp/nzbget/files/nzbget-24.1-fix-allocah.patch @@ -0,0 +1,39 @@ +https://github.com/nzbgetcom/nzbget/commit/412d9e5b732c1cf39aac266dcf97bf097f85bc58 + +From 412d9e5b732c1cf39aac266dcf97bf097f85bc58 Mon Sep 17 00:00:00 2001 +From: Louis Sautier +Date: Tue, 16 Jul 2024 05:41:47 +0200 +Subject: [PATCH] Fix: add missing HAVE_ALLOCA_H definition for regex (#308) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without this, the build fails with: +``` +/var/tmp/portage/net-nntp/nzbget-24.1/work/nzbget-24.1/lib/regex/regex.c: In function ‘set_regs’: +/var/tmp/portage/net-nntp/nzbget-24.1/work/nzbget-24.1/lib/regex/regex.c:7701:39: error: implicit declaration of function ‘alloca’; did you mean ‘calloc’? [-Wimplicit-function-declaration] 7701 | prev_idx_match = (regmatch_t*)alloca(nmatch * sizeof(regmatch_t)); + | ^~~~~~ + | calloc +``` +--- a/cmake/config.h.in ++++ b/cmake/config.h.in +@@ -134,6 +134,9 @@ + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ + ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_ALLOCA_H @HAVE_ALLOCA_H@ ++ + /* Define to 1 if variadic macros are supported */ + #cmakedefine HAVE_VARIADIC_MACROS @HAVE_VARIADIC_MACROS@ + +--- a/cmake/posix.cmake ++++ b/cmake/posix.cmake +@@ -120,6 +120,7 @@ check_include_file(strings.h HAVE_STRINGS_H) + check_include_file(string.h HAVE_STRING_H) + check_include_file(sys/stat.h HAVE_SYS_STAT_H) + check_include_file(unistd.h HAVE_UNISTD_H) ++check_include_file(alloca.h HAVE_ALLOCA_H) + + check_library_exists(pthread pthread_create "" HAVE_PTHREAD_CREATE) + check_library_exists(socket socket "" HAVE_SOCKET) diff --git a/net-nntp/nzbget/metadata.xml b/net-nntp/nzbget/metadata.xml index 0a4610de225c..800bfff4a254 100644 --- a/net-nntp/nzbget/metadata.xml +++ b/net-nntp/nzbget/metadata.xml @@ -13,8 +13,7 @@ Enable support for checking PAR archives - nzbget/nzbget - https://github.com/nzbget/nzbget/issues - nzbget + nzbgetcom/nzbget + https://github.com/nzbgetcom/nzbget/issues diff --git a/net-nntp/nzbget/nzbget-24.1.ebuild b/net-nntp/nzbget/nzbget-24.1.ebuild new file mode 100644 index 000000000000..a2fbf9d1ad90 --- /dev/null +++ b/net-nntp/nzbget/nzbget-24.1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd + +DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files" +HOMEPAGE="https://nzbget.com/" +SRC_URI="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=( + "${FILESDIR}/${P}-fix-allocah.patch" +) + +src_prepare() { + # Do not install a configuration file in /usr/etc + sed -i '\:install(FILES ${CMAKE_BINARY_DIR}/nzbget.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc):d' cmake/install.cmake || die + cmake_src_prepare + + sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die + + sed \ + -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \ + -e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \ + -e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \ + -e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \ + -e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \ + nzbget.conf > nzbgetd.conf || 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 + + 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 +}