Merge branch 'master' of https://gitlab.com/salfter/portage
This commit is contained in:
layman
@@ -1,5 +0,0 @@
|
||||
AUX 50openscad-gentoo.el 167 SHA256 45ed16a3c90a663d3ad95cef44dfd5c653deb5a3e60d978c03d63c2875c6141b SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e WHIRLPOOL 0840035c763c131962132c894ba0b32102e815eb0810ee98c8541fef5e09d673313f491399d3196eb3dd089079ab3fd2154c4703c7bb1cf0c4247e80fc16e0e5
|
||||
AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 SHA256 fb2f9838968e438881249c7c10e17f12924670a71e0077a4e2f8a6af2e4ca2bc SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c WHIRLPOOL 12abcc3014958fdced6ece64063420a2e29ef70a37b1b9b2fe09dbd4a1428cd8cd3c47eb307a3b8e015e8181ea3bd532e343d4e92bf77d131549fc0779bffbff
|
||||
DIST openscad-2019.05.tar.gz 14604881 SHA256 0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 WHIRLPOOL 4d74161d0a1f4ead1852b920ca07ed17c039dac41648b194663525442a5a058bec5a7a6015033cf5cd52c07479e6ba9c160d98871e277be835a7568cd511c5c8
|
||||
EBUILD openscad-2019.05-r2.ebuild 1610 SHA256 e9b03b9a5b902b7dfb066191e60691dc5f7c53f5c3df1b9970aac08b6fce2041 SHA512 f9e6388e78309e138fe8b8afcba0b852d029c67549205eb092de1c7a89c302396cea07caa7c945e4dc9a6e9e2313e1478e202236210a8b6bdb54d417f10882a4 WHIRLPOOL 8fb86133d57863e23b59b5b675eaa9d468a44472a0dfb528307b4d6f34a0f5511bc30a363daaea72df53b5295fcdc98f7e2724ba4cf623e33b3eb6bc03608243
|
||||
MISC metadata.xml 1025 SHA256 591b5ce6812e9d3cceff1870e28fcab15119b5c212ede4b6e373577eda5753f7 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be WHIRLPOOL 31c15e7a3a23dc9d8641fda8ade09c1f1cf4aa3e92a5c9dae347ef2bb37ba32103799cad87891731d07171e5df440109f0f25cd091e6b43f47500a81559c364e
|
||||
@@ -1,3 +0,0 @@
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
(autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
|
||||
(add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
|
||||
@@ -1,27 +0,0 @@
|
||||
From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Beich <jbeich@FreeBSD.org>
|
||||
Date: Fri, 25 Oct 2019 15:10:26 +0000
|
||||
Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
|
||||
|
||||
src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
|
||||
std::stack<LocalScope *> scope_stack;
|
||||
~~~~~^
|
||||
---
|
||||
src/parser.y | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/parser.y b/src/parser.y
|
||||
index 7f4fd56c..4c77c989 100644
|
||||
--- a/src/parser.y
|
||||
+++ b/src/parser.y
|
||||
@@ -46,6 +46,7 @@
|
||||
#include "printutils.h"
|
||||
#include "memory.h"
|
||||
#include <sstream>
|
||||
+#include <stack>
|
||||
#include <boost/filesystem.hpp>
|
||||
#include "boost-utils.h"
|
||||
#include "feature.h"
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>waebbl@gmail.com</email>
|
||||
<name>Bernd Waibel</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<longdescription>
|
||||
OpenSCAD is a software for creating solid 3D CAD objects. Unlike
|
||||
most free software for creating 3D models (such as the famous
|
||||
application Blender) it does not focus on the artistic aspects of 3D
|
||||
modelling but instead on the CAD aspects. Thus it might be the
|
||||
application you are looking for when you are planning to create 3D
|
||||
models of machine parts but pretty sure is not what you are looking
|
||||
for when you are more interested in creating computer-animated movies.
|
||||
OpenSCAD is free software and available for Linux/UNIX, MS Windows and
|
||||
Mac OS X.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">openscad/openscad</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit elisp-common qmake-utils xdg
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
DESCRIPTION="The Programmers Solid 3D CAD Modeller"
|
||||
HOMEPAGE="https://www.openscad.org/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="emacs"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2019.05_fix-boost-1.72.0-build.patch"
|
||||
)
|
||||
|
||||
# FIXME: add optional lib3mf
|
||||
RDEPEND="
|
||||
dev-cpp/eigen:3
|
||||
dev-libs/boost:=
|
||||
dev-libs/double-conversion:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/gmp:0=
|
||||
dev-libs/hidapi
|
||||
dev-libs/libspnav
|
||||
dev-libs/libzip:=
|
||||
dev-libs/mpfr:0=
|
||||
dev-qt/qtconcurrent:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtgui:5[-gles2-only]
|
||||
dev-qt/qtmultimedia:5
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtopengl:5
|
||||
dev-qt/qtwidgets:5
|
||||
media-gfx/opencsg
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
>=media-libs/glew-2.0.0:0=
|
||||
media-libs/harfbuzz:=
|
||||
sci-mathematics/cgal:=
|
||||
>=x11-libs/qscintilla-2.10.3:=
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
media-libs/lib3mf
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# fix path prefix
|
||||
sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5 "${PN}.pro"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/*.el
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install INSTALL_ROOT="${D}"
|
||||
|
||||
if use emacs; then
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
elisp-install ${PN} contrib/*.el contrib/*.elc
|
||||
fi
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
AUX hashcash.conf 117 SHA256 a01b4973cebe85b309121c22b44da2eabe76c49fbb408a923e13d2904b6f9182 SHA512 1c780eb1fb06e37dc1289db9d539f8afccde284526f60df9b8083d04b9f8289ff2310d5f3d2eb1a5cc645683309c271ebdad4697bdc9836507d8fb1dbf229c61 WHIRLPOOL 2266ba0b58accac0f1a19715869e7b3b6723f9f6f63a21290ae60de3f603960fe04782a87e2410772839c20cff7537a38c34be0f19162cb41436641309052c56
|
||||
AUX hashcash.init 2270 SHA256 1c5d4624027bbdf18b255a0d3a205cf85ed42978bc7479e8d6203cff89ca6b35 SHA512 3f7da9f48aa94837626537d8624c44f0256250d047fe2627d1637575dc982033ebf9fa59ddcc3e2b92ee2ec46c1b02ba824b9440fa35b844abdfefd0380592c9 WHIRLPOOL 8739c79e642c16139fbda15f84018718faa897a3c0c6153dddcb0c422b773ac6dcf8cc57c47c3928418dae6d4f550beec428013e8491b786e996d482b149a265
|
||||
DIST hashcash-1.22.tgz 195193 SHA256 0192f12d41ce4848e60384398c5ff83579b55710601c7bffe6c88bc56b547896 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2 WHIRLPOOL 2f353375e5462ad30a3feb549a02ee05e4003833c4c7f8175bb3f6c220fb80e70ed9a698f301e0e7e34cfe7106c8f0b63aff581a5326a880d613e54490bdfeb6
|
||||
EBUILD hashcash-1.22-r1.ebuild 688 SHA256 1eaa973110d2f442a609fbe63c1b0c379ca581da83de9cf9ba0faea93b2913c5 SHA512 6da848573499c828de3f5e34176ced2644f7ad0d5f7cb8a74d06118dfb5114efd7af02d5c76eae34d6cd023092c5ba3c65f88c85e7d5e5f710854cce3d341c3b WHIRLPOOL 8afcd55c6869cdb240a1ae541839d0a2366cec6e9b7df29bfb3767028f55efa3b4853bfc6f91f3a6897cb67ad5f353aaa737955bb45854bf77cd109e3dbfcc22
|
||||
EBUILD hashcash-1.22-r2.ebuild 788 SHA256 18d69893ed0aac4aa7b40f3a2cfd0ff1261b4f47c68a381417b3f95aed334bcb SHA512 5ebb8eccc8ea14a70d682350fd5e94d1bf234913bfa39cff30cd936b4c04015754cc51c70779d9e0a5c53cbfafa6cd8ebafeea125eb47cca3fc0edc63ab93245 WHIRLPOOL 9811347acbb41f3c6c2f0fd799335a629c7ca563a57c3ba00ba7b537914abc0a02aa5c28cde01ab5895817c2c3a8d8eaaf07d13aabbff7f0dbe927240430e722
|
||||
MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
|
||||
|
||||
2
net-misc/hashcash/files/hashcash.conf
Normal file
2
net-misc/hashcash/files/hashcash.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
SOCKETSPEC="inet:8029@localhost"
|
||||
HASHCASH_MILTER_OPTS="-p $SOCKETSPEC -u milter -P /var/run/sid-filter.pid -a -m 20"
|
||||
89
net-misc/hashcash/files/hashcash.init
Executable file
89
net-misc/hashcash/files/hashcash.init
Executable file
@@ -0,0 +1,89 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
depend() {
|
||||
use logger net
|
||||
}
|
||||
|
||||
parse_opts() {
|
||||
local milter_opt milter_flag=
|
||||
for milter_opt in ${HASHCASH_MILTER_OPTS}; do
|
||||
case "${milter_flag}" in
|
||||
-u) milter_user=${milter_opt}
|
||||
;;
|
||||
-P) milter_pid=${milter_opt}
|
||||
;;
|
||||
esac
|
||||
[ -n "${milter_user}" -a -n "${milter_pid}" ] && break
|
||||
milter_flag=${milter_opt}
|
||||
done
|
||||
|
||||
if [ -z "${milter_user}" ]; then
|
||||
milter_user=milter
|
||||
HASHCASH_MILTER_OPTS="${HASHCASH_MILTER_OPTS} -u ${milter_user}"
|
||||
fi
|
||||
if [ -z "${milter_pid}" ]; then
|
||||
milter_pid="/var/run/hashcash-milter.pid"
|
||||
HASHCASH_MILTER_OPTS="${HASHCASH_MILTER_OPTS} -P ${milter_pid}"
|
||||
fi
|
||||
}
|
||||
|
||||
clean_socket() {
|
||||
local socket_file= svc_pid=
|
||||
|
||||
socket_file="$(echo ${HASHCASH_MILTER_OPTS} | sed -e 's/.*local:\(.*\) .*/\1/' | awk '{print $1}')"
|
||||
svc_pid="$(ps -C hashcash-milter -o pid=)"
|
||||
if [ -z "${svc_pid}" ] && [ ! -z "${socket_file}" ] && [ -S "${socket_file}" ]; then
|
||||
ewarn "Strange, the socket file already exist in \"${socket_file}\""
|
||||
ewarn "it will be removed now and re-created by the hashcash-milter server"
|
||||
ewarn "BUT please make your checks."
|
||||
rm -f "${socket_file}"
|
||||
fi
|
||||
}
|
||||
|
||||
check_socketdir() {
|
||||
local socket_dir
|
||||
case "${SOCKETSPEC}" in
|
||||
local:*) socket_dir="$(echo ${SOCKETSPEC} | sed -e 's~^local:\(.*\)/.*$~\1~')"
|
||||
if [ ! -d ${socket_dir} ]; then
|
||||
checkpath -q -d -o ${milter_user}:${milter_user} -m 0755 ${socket_dir} || return 1
|
||||
fi ;;
|
||||
inet:*) ;;
|
||||
inet6:*) ;;
|
||||
*) eerror "Unknown socket spec. Please check your /etc/conf.d/hashcash-milter file."
|
||||
return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
start() {
|
||||
local milter_user= milter_pid=
|
||||
|
||||
clean_socket
|
||||
parse_opts
|
||||
check_socketdir || return 1
|
||||
if ! (touch ${milter_pid} && chown ${milter_user} ${milter_pid}) ; then
|
||||
eerror "Failed to create pidfile"
|
||||
return 1
|
||||
fi
|
||||
|
||||
ebegin "Starting Hashcash Milter"
|
||||
start-stop-daemon --start --exec /usr/bin/hashcash-milter -- ${HASHCASH_MILTER_OPTS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
local milter_user= milter_pid=
|
||||
|
||||
parse_opts
|
||||
|
||||
ebegin "Stopping Hashcash Milter"
|
||||
start-stop-daemon --stop --quiet --name hashcash-milter --pidfile ${milter_pid}
|
||||
eend $?
|
||||
|
||||
if [ $? = 0 -a -f "${milter_pid}" ]; then
|
||||
rm ${milter_pid}
|
||||
fi
|
||||
}
|
||||
@@ -28,6 +28,8 @@ src_install() {
|
||||
dobin hashcash
|
||||
doman hashcash.1
|
||||
dodoc CHANGELOG
|
||||
newinitd $FILESDIR/hashcash.init hashcash-milter
|
||||
newconfd $FILESDIR/hashcash.conf hashcash-milter
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins contrib/hashcash-{request,sendmail{,.txt}} \
|
||||
contrib/hashfork.{c,py,txt}
|
||||
@@ -1,10 +0,0 @@
|
||||
AUX patches/0001-use-system-configobj.patch 784 SHA256 64475b8a839421ac30cb02b8e8ac229e757701cedc640e19c0888b5daaeb4c2e SHA512 3d657a62da5f53eb26bbffe47ddf8c36026f1f6536bfae6c8278ec84f27e1672e058a87bc77e65e1ab40deb8b7c3ee7a72dbcc9035d62af71d7e0642dd7f6542 WHIRLPOOL 99fe7dd77fa2c75b54c6e87829ee96b22cac14c8502b866e208dee14e416c386047a3757d63ce0dc1bbf0967e4efbe04e7738ffee1b885de4eb520bed608456f
|
||||
AUX patches/0002-use-system-feedparser.patch 929 SHA256 a9db847f81a391e84a3e1880a638e91fe60812811e7859187d0e522a788b3215 SHA512 2a58fc9c21e81c0b18f30bf94ba75777724ec8d0a9d54fddc591f1517c7f92f5b2d3d6726c90ee545f94242fef48020b81ce6291c15f9e8eecc7095f388701db WHIRLPOOL 8a018fc8ce654cfdf2ab610adb35ca7ffc827fe20f0315f7bfde89692c68d19a6757731d4c87bc3960cea2535f19a0813563c8e44fc862df1267565ce2a7768f
|
||||
AUX patches/0003-cfg-disable-NtfOSD-by-default.patch 962 SHA256 6e6fe1b58e3740f62e8b4713e83df674e5d7e8bc547f4b2da19788e88d53115e SHA512 48f157d0c31465424e7951f933bb2f4089c1abce185df8146cb5292a0be636b9e31c2f761aced09666bf12c907a7a33cea2fa4e5ac0853f55f0de9a0e2751fbf WHIRLPOOL 5b2228fd46dac29bd534aba02fffdd966634fb5be692e612d7e7b339147e0c81e6f1aa9def9c3dcb22b373979671d1bcf9e7d9013f92d8ddb2115baaa21b1726
|
||||
AUX sabnzbd.confd 156 SHA256 1200b1e7a6b58f63e34c0526a0cbd981a142484074cf2e2e6b52afb7990018dd SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468 WHIRLPOOL b25c71e8c210185f45df59af3d6cfc5f059c99b8d2db9e96891f6d790c68666cb5210723fa7d65d9799b59a859be2e8c22d69f35cd52dc2aedae991dc7cb533d
|
||||
AUX sabnzbd.ini 347 SHA256 3275fae0b32d4d3c09225f4bed11a495acb88d51470807187f0e7d9f3f853d3d SHA512 14df57a0594a671a275e6e5b4f6a704ce2be01507c518f46162d096870da7b04fb636c4e8aedfdb07d3290934941707eda94180e290bdf7eef561b5641497df4 WHIRLPOOL 067fd44e1870567bbad3dfbba4262160c581212bb0c86bb4abd010daa5094bd64c3d1caa558b3e5ad6aa548b47da73e948883d8fabfc11c74f551fb9db07c914
|
||||
AUX sabnzbd.initd 1395 SHA256 d6b773de2e2e43c6bf1bfa455aebcdf1e04dd27dd3dd05554b76e1d4d84bbbee SHA512 0510dc7386ae57493bf614d9b74614f0c2b160981c0f7e5f784a9a336167de7918112ff1a173e3535edd654567ca806b156ee6db819e139dcfea3990bc8252d8 WHIRLPOOL 7f3f6dacd65a1c0ad38ff8e88eb912d8308f351e49f622efe794b38c92257d4d89cfcdfaba867a330ede41f72ae173579e3b01535394876725559ddcdcb30095
|
||||
AUX sabnzbd_at.service 185 SHA256 b61b2b1b1e3f593e754ca67c48904d9a8af448cf8c75ca332acade3a3054b2b2 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34 WHIRLPOOL dc53b1e1433fb27d06e4d9073f340281c29b842737887e4b3e420ed956f61909cf4aafcb7dc180471fc04b722d251b6d046d1cdb8d7d5f423efb32dfce93b430
|
||||
DIST SABnzbd-2.3.9-src.tar.gz 2738773 SHA256 f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c SHA512 10a39db9ad7f6d441166da97194b7a281aacd1900f7687bca72c6c2b555114bc2bbdaaba51cb9fcec57aa1b782f20609a07528484ad911ffd9f9eabb54a324fa WHIRLPOOL 4d1729a846821ca5a9b66d0ddb7188d926999e838837a9d41ce15e8e9762a7ad028c49632d1c840d1d02a20342f88b16e118de1d6d631e4f5ef982831a0051dd
|
||||
EBUILD sabnzbd-2.3.9.ebuild 4185 SHA256 d6b7202060c2e6add9a6bb2e826e7363626dbb34132df9de75930876f79ca348 SHA512 500f7b9bf57b93346d36489efa24c9907a6acd6c5299279063bb7e73187317d80ae651a23bd104d0b6e2decab5e1d7cdc8b9514a032b8795091f149377fcda62 WHIRLPOOL 629ee6e5c1563775c9534189c8cd369ce4d62ac3c23285d29c99d3c544ca032ff742aef09dd05ac650f53d1e7e4bf9f224f01d20c242a71bc08f5b3b1f6e9038
|
||||
MISC metadata.xml 506 SHA256 b8b4b016fa9e3279822d6281a3f3ed7b46798dce79c6b92667f940e1e19e9685 SHA512 13c60fc2a77328dd1d8ae3d2036a84b72dc98a88093aad9a326fd904b41c795dcce84aec5dc528bc81daabba0341f10a7dda2d01788f70310bbaf801da831f53 WHIRLPOOL 4732c40ef33029ed913f78b87fb64b6fec6271f3d0d2917b2db6cf5a51f09497f5fd46b89ba104ea2863b2e875af6ff21e56179f7ce7c8da8adeb97b0e804a34
|
||||
@@ -1,28 +0,0 @@
|
||||
From db9a217dd5a02b5be72d47b7618f877f39cb31bc Mon Sep 17 00:00:00 2001
|
||||
From: Justin Bronder <jsbronder@gmail.com>
|
||||
Date: Mon, 13 Feb 2017 18:20:39 -0500
|
||||
Subject: [PATCH 1/3] use system configobj
|
||||
|
||||
---
|
||||
sabnzbd/config.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sabnzbd/config.py b/sabnzbd/config.py
|
||||
index 2f58ffd..04bfaab 100644
|
||||
--- a/sabnzbd/config.py
|
||||
+++ b/sabnzbd/config.py
|
||||
@@ -30,9 +30,10 @@ from hashlib import md5
|
||||
from urlparse import urlparse
|
||||
import sabnzbd.misc
|
||||
from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
|
||||
-from sabnzbd.utils import configobj
|
||||
from sabnzbd.decorators import synchronized
|
||||
|
||||
+import configobj
|
||||
+
|
||||
CONFIG_LOCK = threading.Lock()
|
||||
SAVE_CONFIG_LOCK = threading.Lock()
|
||||
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From b8540c4c71e917623290f3ca8d4091228fab8903 Mon Sep 17 00:00:00 2001
|
||||
From: Justin Bronder <jsbronder@gmail.com>
|
||||
Date: Mon, 13 Feb 2017 18:21:28 -0500
|
||||
Subject: [PATCH 2/3] use system feedparser
|
||||
|
||||
---
|
||||
sabnzbd/rss.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
|
||||
index 0315fca..18ac828 100644
|
||||
--- a/sabnzbd/rss.py
|
||||
+++ b/sabnzbd/rss.py
|
||||
@@ -25,6 +25,8 @@ import time
|
||||
import datetime
|
||||
import threading
|
||||
|
||||
+import feedparser
|
||||
+
|
||||
import sabnzbd
|
||||
from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY
|
||||
from sabnzbd.decorators import synchronized
|
||||
@@ -35,8 +37,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \
|
||||
import sabnzbd.emailer as emailer
|
||||
from sabnzbd.encoding import unicoder, xml_name
|
||||
|
||||
-import sabnzbd.utils.feedparser as feedparser
|
||||
-
|
||||
__RSS = None # Global pointer to RSS-scanner instance
|
||||
|
||||
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 459111cb4f6937d58de480cf06743474f5c1dd3d Mon Sep 17 00:00:00 2001
|
||||
From: Justin Bronder <jsbronder@gmail.com>
|
||||
Date: Sat, 5 Aug 2017 17:38:03 -0400
|
||||
Subject: [PATCH 3/3] cfg: disable NtfOSD by default
|
||||
|
||||
---
|
||||
sabnzbd/cfg.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
|
||||
index d8867db..59a341c 100644
|
||||
--- a/sabnzbd/cfg.py
|
||||
+++ b/sabnzbd/cfg.py
|
||||
@@ -322,7 +322,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
|
||||
acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
|
||||
|
||||
# [ntfosd]
|
||||
-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
|
||||
+ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False)
|
||||
ntfosd_cats = OptionList('ntfosd', 'ntfosd_cats', ['*'])
|
||||
ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True)
|
||||
ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False)
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
SABNZBD_CONFIGFILE="/etc/sabnzbd/sabnzbd.ini"
|
||||
SABNZBD_USER="sabnzbd"
|
||||
SABNZBD_GROUP="sabnzbd"
|
||||
|
||||
# 0 - error/warnings, 1 - info, 2 - debug
|
||||
SABNZBD_LOGGING="1"
|
||||
@@ -1,14 +0,0 @@
|
||||
__version__ = 19
|
||||
[misc]
|
||||
log_dir = /var/log/sabnzbd
|
||||
admin_dir = /var/lib/sabnzbd/admin
|
||||
cache_dir = /var/lib/sabnzbd/cache
|
||||
complete_dir = /var/lib/sabnzbd/complete
|
||||
download_dir = /var/lib/sabnzbd/download
|
||||
dirscan_dir = /var/lib/sabnzbd/dirscan
|
||||
nzb_backup_dir = /var/lib/sabnzbd/backup
|
||||
auto_browser = 0
|
||||
host = ::
|
||||
port = 8080
|
||||
[growl]
|
||||
growl_enable = 0
|
||||
@@ -1,71 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
PIDFILE="/run/sabnzbd/sabnzbd.pid"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
get_var() {
|
||||
grep -P -o -m 1 "(?<=^${1} = ).*" "${SABNZBD_CONFIGFILE}" || echo 0
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting SABnzbd"
|
||||
|
||||
checkpath -q -d -o ${SABNZBD_USER}:${SABNZBD_GROUP} -m 0770 "$(dirname "${PIDFILE}")"
|
||||
|
||||
start-stop-daemon \
|
||||
--quiet \
|
||||
--start \
|
||||
--user ${SABNZBD_USER} \
|
||||
--group ${SABNZBD_GROUP} \
|
||||
--pidfile "${PIDFILE}" \
|
||||
--wait 1000 \
|
||||
--exec /usr/share/sabnzbd/SABnzbd.py \
|
||||
-- \
|
||||
--config-file "${SABNZBD_CONFIGFILE}" \
|
||||
--logging "${SABNZBD_LOGGING}" \
|
||||
--daemon \
|
||||
--pidfile "${PIDFILE}"
|
||||
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
local protocol="http"
|
||||
local host="$(get_var "host")"
|
||||
local port="$(get_var "port")"
|
||||
|
||||
if [ $(get_var "enable_https") -eq 1 ]; then
|
||||
protocol="https"
|
||||
port="$(get_var "https_port")"
|
||||
fi
|
||||
|
||||
case "${host}" in
|
||||
*:*) host="[${host}]" ;;
|
||||
esac
|
||||
|
||||
local url="${protocol}://${host}:${port}/sabnzbd/api?mode=shutdown"
|
||||
|
||||
if [ $(get_var "disable_api_key") -eq 0 ]; then
|
||||
url="${url}&apikey=$(get_var "api_key")"
|
||||
fi
|
||||
|
||||
local signals="TERM/1/KILL/1"
|
||||
|
||||
ebegin "Stopping SABnzbd"
|
||||
|
||||
if [ "$(wget -o /dev/null -t 1 -O - -T 10 "${url}")" = "ok" ]; then
|
||||
signals="NULL/5/${signals}"
|
||||
fi
|
||||
|
||||
start-stop-daemon \
|
||||
--stop \
|
||||
--pidfile "${PIDFILE}" \
|
||||
--retry "${signals}"
|
||||
|
||||
eend $?
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=SABnzbd binary newsreader
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/share/sabnzbd/SABnzbd.py --logging 1 --browser 0
|
||||
User=sabnzbd
|
||||
Group=sabnzbd
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>jsbronder@gentoo.org</email>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="7za">Add support for extracting 7za files</flag>
|
||||
<flag name="rar">Add support for extracting rar files</flag>
|
||||
<flag name="unzip">Add support for extracting zip files</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">sabnzbd/sabnzbd</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,146 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
# Require python-2 with sqlite USE flag
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit python-single-r1 user systemd versionator
|
||||
|
||||
MY_P="${P/sab/SAB}"
|
||||
|
||||
DESCRIPTION="Binary newsgrabber with web-interface"
|
||||
HOMEPAGE="https://sabnzbd.org/"
|
||||
SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz"
|
||||
|
||||
# Sabnzbd is GPL-2 but bundles software with the following licenses.
|
||||
LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+7za +rar unzip"
|
||||
|
||||
# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
|
||||
# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging
|
||||
|
||||
# TODO: still bundled but not in portage:
|
||||
# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
|
||||
# pynewsleecher
|
||||
#
|
||||
# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
|
||||
# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
|
||||
#
|
||||
# Also note that cherrypy is still bundled. It's near impossible to find
|
||||
# out where the bundled and heavily patched version came from (pulled from
|
||||
# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
|
||||
# further. Upstream is planning on making this easier with 0.8.0.
|
||||
# https://github.com/sabnzbd/sabnzbd/issues/47
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=app-arch/par2cmdline-0.4
|
||||
>=dev-python/cheetah-2.0.1[${PYTHON_USEDEP}]
|
||||
dev-python/configobj[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/feedparser[${PYTHON_USEDEP}]
|
||||
dev-python/gntp[${PYTHON_USEDEP}]
|
||||
dev-python/pythonutils[${PYTHON_USEDEP}]
|
||||
>=dev-python/sabyenc-3.3.1[${PYTHON_USEDEP}]
|
||||
net-misc/wget
|
||||
7za? ( app-arch/p7zip )
|
||||
rar? ( || ( app-arch/unrar app-arch/rar ) )
|
||||
unzip? ( >=app-arch/unzip-5.5.2 )
|
||||
"
|
||||
DEPEND="${PYTHON_DEPS}"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
HOMEDIR="/var/lib/${PN}"
|
||||
python-single-r1_pkg_setup
|
||||
|
||||
# Create sabnzbd group
|
||||
enewgroup "${PN}"
|
||||
# Create sabnzbd user, put in sabnzbd group
|
||||
enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/patches
|
||||
|
||||
# remove bundled modules
|
||||
rm -r sabnzbd/utils/{feedparser,configobj}.py || die
|
||||
rm -r gntp || die
|
||||
rm licenses/License-{feedparser,configobj,gntp}.txt || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local d
|
||||
|
||||
for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
|
||||
insinto "/usr/share/${PN}/${d}"
|
||||
doins -r ${d}/*
|
||||
done
|
||||
|
||||
exeinto "/usr/share/${PN}"
|
||||
doexe SABnzbd.py
|
||||
|
||||
python_fix_shebang "${ED%/}/usr/share/${PN}"
|
||||
python_optimize "${ED%/}/usr/share/${PN}"
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
|
||||
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
|
||||
|
||||
diropts -o "${PN}" -g "${PN}"
|
||||
dodir "/etc/${PN}"
|
||||
dodir "/var/log/${PN}"
|
||||
|
||||
insinto "/etc/${PN}"
|
||||
insopts -m 0600 -o "${PN}" -g "${PN}"
|
||||
doins "${FILESDIR}/${PN}.ini"
|
||||
|
||||
dodoc {ABOUT,ISSUES,README}.txt licenses/*
|
||||
|
||||
systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Default directory: ${HOMEDIR}"
|
||||
einfo
|
||||
einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
|
||||
einfo
|
||||
einfo " gpasswd -a <user> sabnzbd"
|
||||
einfo
|
||||
einfo "By default, SABnzbd+ will listen on TCP port 8080."
|
||||
einfo
|
||||
einfo "As Growl is not the default notification system on Gentoo, we disable it."
|
||||
|
||||
local replacing
|
||||
local major
|
||||
local minor
|
||||
for replacing in ${REPLACING_VERSIONS}; do
|
||||
major=$(get_major_version ${replacing})
|
||||
minor=$(get_version_component_range 2 ${replacing})
|
||||
|
||||
if [ "${major}" == "1" ]; then
|
||||
ewarn
|
||||
ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
|
||||
ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
|
||||
ewarn
|
||||
break
|
||||
elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then
|
||||
ewarn
|
||||
ewarn "Due to changes in this release, the queue will be converted when ${PN}"
|
||||
ewarn "is started for the first time. Job order, settings and data will be"
|
||||
ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
|
||||
ewarn "fetching before the upgrade will be lost!"
|
||||
ewarn
|
||||
break
|
||||
fi
|
||||
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user