cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest stable release.

Browse Source 
While there, add a rcscript, and fix cpu hogging in case the password for the transport is wrong.

OK jasper@
This commit is contained in:
sebastia 2011-01-10 18:34:31 +00:00
parent 1985c51c59
commit 27c2b74937
9 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/spectrum/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2011/01/06 13:41:26 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2011/01/10 18:34:31 sebastia Exp $
COMMENT= XMPP transport/gateway
DISTNAME= spectrum-1.4.3
REVISION= 0
DISTNAME= spectrum-1.4.6
CATEGORIES= net
HOMEPAGE= http://spectrum.im/
MASTER_SITES= ${HOMEPAGE}/attachments/download/26/
MASTER_SITES= ${HOMEPAGE}/attachments/download/34/
MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
# GPLv2
@ -23,7 +22,7 @@ LIB_DEPENDS= net/py-xmpppy \
net/gloox \
net/pidgin,-libpurple \
net/poco
RUN_DEPENDS= net/py-xmpppy
RUN_DEPENDS = net/py-xmpppy
SPVARDIR= /var/spectrum
# not using CONFIGURE_STYLE=cmake from cmake module, rolling own in

10
net/spectrum/distinfo
View File

@ -1,5 +1,5 @@
MD5 (spectrum-1.4.3.tar.gz) = gaxTBxOXcpWwwE2/BCqt7A==
RMD160 (spectrum-1.4.3.tar.gz) = t/I2v+qaTuC2nR7RLFw+TsxKte8=
SHA1 (spectrum-1.4.3.tar.gz) = zKEYQxmaTzcd/u+FTD/cIiwuh20=
SHA256 (spectrum-1.4.3.tar.gz) = NnZS0NsPYIeF6mXRQX4UXv2zTKqY/iqWZYNJMn5qiHs=
SIZE (spectrum-1.4.3.tar.gz) = 223917
MD5 (spectrum-1.4.6.tar.gz) = r1QmWeI/LrO2JwheRuDWuQ==
RMD160 (spectrum-1.4.6.tar.gz) = HjnneUUayec9WbWQdbCalkQZey0=
SHA1 (spectrum-1.4.6.tar.gz) = Z3s+Z7UmfxN567EZt7RO40Cj7OU=
SHA256 (spectrum-1.4.6.tar.gz) = Au11rW67bZcYkc/oAuBAysVawKTEqSY9S2m1GvzmpOw=
SIZE (spectrum-1.4.6.tar.gz) = 228874

14
net/spectrum/patches/patch-CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2011/01/10 18:34:31 sebastia Exp $
* do not install the man below share
* do not install configuration file in /etc directly
* install binaries to sbin
--- CMakeLists.txt.orig Wed Jul 21 16:49:17 2010
+++ CMakeLists.txt Sat Jul 31 13:23:43 2010
--- CMakeLists.txt.orig Thu Dec 30 15:13:04 2010
+++ CMakeLists.txt Thu Jan 6 17:12:20 2011
@@ -9,8 +9,7 @@ file(WRITE src/transport_config.h "\n")
set(CMAKE_MODULE_PATH "cmake_modules")
@ -16,7 +16,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
set(gloox_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
find_package(gloox REQUIRED)
set(purple_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
@@ -371,7 +370,7 @@ ADD_CUSTOM_TARGET (man ALL ${PYTHON_EXECUTABLE} ${CMAK
@@ -382,7 +381,7 @@ ADD_CUSTOM_TARGET (man ALL ${PYTHON_EXECUTABLE} ${CMAK
INSTALL(TARGETS spectrum
@ -25,7 +25,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
)
@@ -379,7 +378,8 @@ INSTALL(TARGETS spectrum
@@ -390,7 +389,8 @@ INSTALL(TARGETS spectrum
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/spectrum.cfg
RENAME spectrum.cfg.example
@ -35,7 +35,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
)
if (NOT WITHOUT_SPECTRUMCTL)
@@ -391,7 +391,7 @@ INSTALL(DIRECTORY
@@ -402,7 +402,7 @@ INSTALL(DIRECTORY
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/spectrumctl/spectrumctl.py
@ -44,7 +44,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
RENAME spectrumctl
PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
@@ -400,11 +400,11 @@ INSTALL(FILES
@@ -411,11 +411,11 @@ INSTALL(FILES
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8

10
net/spectrum/patches/patch-spectrum_cfg
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-spectrum_cfg,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
$OpenBSD: patch-spectrum_cfg,v 1.2 2011/01/10 18:34:31 sebastia Exp $
Fix paths in var for OpenBSD usage
--- spectrum.cfg.orig Sat Jul 31 13:41:41 2010
+++ spectrum.cfg Sat Jul 31 13:44:25 2010
--- spectrum.cfg.orig Tue Dec 28 17:58:40 2010
+++ spectrum.cfg Thu Jan 6 17:12:20 2011
@@ -30,7 +30,7 @@ password=secret
# component port
port=5347
@ -22,7 +22,7 @@ Fix paths in var for OpenBSD usage
# URL used to acces filestransfer_cache directory from the web.
filetransfer_web=http://example.com/files/
@@ -79,7 +79,7 @@ only_for_vip=0
@@ -83,7 +83,7 @@ only_for_vip=0
#vip_features = avatars;chatstate;filetransfer
# pid file
@ -31,7 +31,7 @@ Fix paths in var for OpenBSD usage
# require_tls to connect legacy network
#require_tls=false
@@ -136,11 +136,11 @@ type=sqlite
@@ -154,11 +154,11 @@ type=sqlite
#password=password
# sqlite: set path to database file here
# mysql: set to name of database

8
net/spectrum/patches/patch-spectrumctl_spectrum_env_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-spectrumctl_spectrum_env_py,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
$OpenBSD: patch-spectrumctl_spectrum_env_py,v 1.2 2011/01/10 18:34:31 sebastia Exp $
Use the default OpenBSD _spectrum user
--- spectrumctl/spectrum/env.py.orig Mon Jul 26 14:08:30 2010
+++ spectrumctl/spectrum/env.py Mon Jul 26 14:09:08 2010
@@ -25,7 +25,7 @@ def get_uid():
--- spectrumctl/spectrum/env.py.orig Fri Oct 8 09:15:22 2010
+++ spectrumctl/spectrum/env.py Thu Jan 6 17:12:20 2011
@@ -39,7 +39,7 @@ def get_uid():
username = os.environ['SPECTRUM_USER']
except KeyError:
# otherwise we default to spectrum:

12
net/spectrum/patches/patch-spectrumctl_spectrum_spectrum_py
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-spectrumctl_spectrum_spectrum_py,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
$OpenBSD: patch-spectrumctl_spectrum_spectrum_py,v 1.2 2011/01/10 18:34:31 sebastia Exp $
Import errno, to prevent error
--- spectrumctl/spectrum/spectrum.py.orig Mon Jul 26 15:15:45 2010
+++ spectrumctl/spectrum/spectrum.py Mon Jul 26 15:15:54 2010
--- spectrumctl/spectrum/spectrum.py.orig Tue Dec 28 17:58:40 2010
+++ spectrumctl/spectrum/spectrum.py Thu Jan 6 17:13:52 2011
@@ -19,7 +19,7 @@
Represents a single spectrum instance, see L{spectrum.spectrum}.
"""
-import os, sys, pwd, stat, time, signal, subprocess, resource
+import os, sys, pwd, stat, time, signal, subprocess, resource, errno
-import os, sys, pwd, stat, time, signal, resource
+import os, sys, pwd, stat, time, signal, resource, errno
from subprocess import call, Popen, PIPE, STDOUT
import spectrumconfigparser, config_interface, env
from ExistsError import ExistsError

17
net/spectrum/patches/patch-src_main_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_main_cpp,v 1.1 2011/01/10 18:34:31 sebastia Exp $
fix for bug: http://spectrum.im/issues/131
--- src/main.cpp.orig Tue Dec 28 17:58:40 2010
+++ src/main.cpp Fri Jan 7 23:45:26 2011
@@ -1866,6 +1866,10 @@ void GlooxMessageHandler::onDisconnect(ConnectionError
m_userManager->removeAllUsers();
Log("gloox", "trying to reconnect after 1 second");
+ if (m_socketId > 0) {
+ purple_input_remove(m_socketId);
+ m_socketId = 0;
+ }
purple_timeout_add_seconds(1, &transportReconnect, NULL);
// if (connectIO) {

6
net/spectrum/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/13 16:41:16 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.2 2011/01/10 18:34:31 sebastia Exp $
@newgroup _spectrum:654
@newuser _spectrum:654:_spectrum:daemon:Spectrum User:/var/spectrum:/sbin/nologin
lib/python${MODPY_VERSION}/site-packages/spectrum/
@ -54,3 +54,7 @@ share/locale/ru/LC_MESSAGES/spectrum.mo
@sample /var/log/spectrum/
@mode 0750
@sample /var/spectrum/
@owner
@group
@mode
@rcscript ${RCDIR}/spectrum

20
net/spectrum/pkg/spectrum.rc Normal file
View File

@ -0,0 +1,20 @@
#!/bin/sh
#
# $OpenBSD: spectrum.rc,v 1.1 2011/01/10 18:34:31 sebastia Exp $
. /etc/rc.d/rc.subr
daemon="${TRUEPREFIX}/sbin/spectrumctl"
SPECTRUM_PATH=${TRUEPREFIX}/sbin/spectrum
rc_start() {
${daemon} start
}
rc_stop() {
${daemon} stop
}
rc_reload() {
${daemon} reload
}
rc_cmd $1