[gentoo-commits] gentoo-x86 commit in net-nntp/sabnzbd/files: sabnzbd.initd use-system-configobj-and-feedparser.patch sabnzbd.confd sabnzbd

[gentoo-commits] gentoo-x86 commit in net-nntp/sabnzbd/files: sabnzbd.initd use-system-configobj-and-feedparser.patch sabnzbd.confd sabnzbd

[Justin Bronder (jsbronder)]

jsbronder    13/01/03 20:02:32

  Added:                sabnzbd.initd
                        use-system-configobj-and-feedparser.patch
                        sabnzbd.confd sabnzbd
  Log:
  add net-nntp/sabnzbd
  
  (Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)

Revision  Changes    Path
1.1                  net-nntp/sabnzbd/files/sabnzbd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd?rev=1.1&content-type=text/plain

Index: sabnzbd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd,v 1.1 2013/01/03 20:02:32 jsbronder Exp $


depend() {
    need net
}

start() {
    ebegin "Starting SABnzbd"

    start-stop-daemon \
        --quiet \
        --start \
        --user ${SABNZBD_USER} \
        --group ${SABNZBD_GROUP} \
        --name sabnzbd \
        --exec /usr/bin/sabnzbd \
        -- \
        --server ${SABNZBD_SERVER}:${SABNZBD_PORT} \
        --config-file ${SABNZBD_CONFIGFILE} \
        --daemon
    eend $?
}

stop() {
    local api_key=$(awk '/^api_key =/{print $3}' ${SABNZBD_CONFIGFILE})
    local hostname=${SABNZBD_SERVER}
    
    ebegin "Stopping SABnzbd"

    if [ -z "${hostname}" -o "${hostname}" == "0.0.0.0" ]; then
        hostname="localhost"
    fi
	/usr/bin/wget -q --delete-after \
        "http://${SABNZBD_SERVER}:${SABNZBD_PORT}/sabnzbd/api?mode=shutdown&apikey=${api_key}"
    eend $?
}




1.1                  net-nntp/sabnzbd/files/use-system-configobj-and-feedparser.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/use-system-configobj-and-feedparser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/use-system-configobj-and-feedparser.patch?rev=1.1&content-type=text/plain

Index: use-system-configobj-and-feedparser.patch
===================================================================
From 89cb8b86fb087bc4706478ce4ec3ad5fd19602e6 Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gmail.com>
Date: Thu, 3 Jan 2013 04:10:37 -0500
Subject: [PATCH] use system configobj and feedparser

---
 sabnzbd/config.py |    4 +++-
 sabnzbd/rss.py    |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sabnzbd/config.py b/sabnzbd/config.py
index c3fc54c..cce2b14 100644
--- a/sabnzbd/config.py
+++ b/sabnzbd/config.py
@@ -23,10 +23,12 @@ import os
 import logging
 import threading
 import shutil
+
+import configobj
+
 import sabnzbd.misc
 from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY
 from sabnzbd.utils import listquote
-from sabnzbd.utils import configobj
 from sabnzbd.decorators import synchronized
 
 CONFIG_LOCK = threading.Lock()
diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
index 6fe6f5b..19a5d0f 100644
--- a/sabnzbd/rss.py
+++ b/sabnzbd/rss.py
@@ -35,7 +35,7 @@ from sabnzbd.misc import cat_convert, sanitize_foldername, wildcard_to_re, cat_t
 import sabnzbd.emailer as emailer
 from sabnzbd.encoding import latin1, unicoder, xml_name
 
-import sabnzbd.utils.feedparser as feedparser
+import feedparser
 
 __RSS = None  # Global pointer to RSS-scanner instance
 
-- 
1.7.3.4




1.1                  net-nntp/sabnzbd/files/sabnzbd.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.confd?rev=1.1&content-type=text/plain

Index: sabnzbd.confd
===================================================================
SABNZBD_SERVER=0.0.0.0
SABNZBD_PORT=8080
SABNZBD_CONFIGFILE=/etc/sabnzbd/sabnzbd.ini
SABNZBD_USER=sabnzbd
SABNZBD_GROUP=sabnzbd

# 0 - error/warnings, 1 - info, 2 - debug
SABNZBD_LOGGING=1



1.1                  net-nntp/sabnzbd/files/sabnzbd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd?rev=1.1&content-type=text/plain

Index: sabnzbd
===================================================================
#!/bin/sh

cd /usr/share/sabnzbd && python SABnzbd.py $*