From f9b478494e821804a3c5cee3912a1f970c2b7ca3 Mon Sep 17 00:00:00 2001 From: Michael Mason Date: Mon, 8 Jun 2009 15:00:56 +0000 Subject: unstable/prosody move to testing/prosody --- testing/prosody/APKBUILD | 46 +++++++++++++++ testing/prosody/Makefile-0.4.2.patch | 13 +++++ testing/prosody/prosody.cfg.lua | 107 ++++++++++++++++++++++++++++++++++ testing/prosody/prosody.initd | 43 ++++++++++++++ testing/prosody/prosody.post-install | 6 ++ testing/prosody/prosody.pre-install | 9 +++ unstable/prosody/APKBUILD | 46 --------------- unstable/prosody/Makefile-0.4.2.patch | 13 ----- unstable/prosody/prosody.cfg.lua | 107 ---------------------------------- unstable/prosody/prosody.initd | 43 -------------- unstable/prosody/prosody.post-install | 6 -- unstable/prosody/prosody.pre-install | 9 --- 12 files changed, 224 insertions(+), 224 deletions(-) create mode 100644 testing/prosody/APKBUILD create mode 100644 testing/prosody/Makefile-0.4.2.patch create mode 100644 testing/prosody/prosody.cfg.lua create mode 100644 testing/prosody/prosody.initd create mode 100644 testing/prosody/prosody.post-install create mode 100644 testing/prosody/prosody.pre-install delete mode 100644 unstable/prosody/APKBUILD delete mode 100644 unstable/prosody/Makefile-0.4.2.patch delete mode 100644 unstable/prosody/prosody.cfg.lua delete mode 100644 unstable/prosody/prosody.initd delete mode 100644 unstable/prosody/prosody.post-install delete mode 100644 unstable/prosody/prosody.pre-install diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD new file mode 100644 index 00000000..60ad4e9c --- /dev/null +++ b/testing/prosody/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Mika Havela +# Maintainer: Mika Havela +pkgname=prosody +pkgver=0.4.2 +pkgrel=0 +pkgdesc="Lua based Jabber/XMPP server" +url="http://prosody.im/" +license="MIT" +depends="uclibc lua libidn openssl luasocket luaexpat" +makedepends="lua-dev libidn-dev openssl-dev" +install="prosody.pre-install prosody.post-install" +subpackages="" +source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz + $pkgname.cfg.lua + $pkgname.initd + $install + Makefile-0.4.2.patch + " + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch Makefile "$startdir/Makefile-0.4.2.patch" || return 1 + + ./configure --prefix=/usr \ + --sysconfdir=/etc/prosody \ + --with-lua=/usr/bin \ + --with-lua-lib=/usr/lib \ + --with-lua-include=/usr/include + + make || return 1 + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/var/log/prosody" || return 1 + install -d "$pkgdir/var/run/prosody" || return 1 + install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" + + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +md5sums="2669478311b3a67522669acdf03cf85c prosody-0.4.2.tar.gz +f42039e5a342fe62cd7e491546338aaa prosody.cfg.lua +c161a875295b45241229eb6db65211e8 prosody.initd +08484f183ba39233337d3fbc92cffadc prosody.pre-install +8202a40bf6de7cbacbaf76f2985aa220 prosody.post-install +684d033dac42399a245c061c9a374e1b Makefile-0.4.2.patch" diff --git a/testing/prosody/Makefile-0.4.2.patch b/testing/prosody/Makefile-0.4.2.patch new file mode 100644 index 00000000..facfa2f9 --- /dev/null +++ b/testing/prosody/Makefile-0.4.2.patch @@ -0,0 +1,13 @@ +--- src/prosody-0.4.2/Makefile.org Thu Jun 4 13:44:20 2009 ++++ src/prosody-0.4.2/Makefile Thu Jun 4 13:44:11 2009 +@@ -19,8 +19,8 @@ + install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA) + install -d $(CONFIG)/certs + install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util +- install ./prosody.install $(BIN)/prosody +- install ./prosodyctl.install $(BIN)/prosodyctl ++ install -m755 ./prosody.install $(BIN)/prosody ++ install -m755 ./prosodyctl.install $(BIN)/prosodyctl + install -m644 core/* $(SOURCE)/core + install -m644 net/* $(SOURCE)/net + install -m644 util/* $(SOURCE)/util diff --git a/testing/prosody/prosody.cfg.lua b/testing/prosody/prosody.cfg.lua new file mode 100644 index 00000000..99df66ad --- /dev/null +++ b/testing/prosody/prosody.cfg.lua @@ -0,0 +1,107 @@ +-- Prosody Configuration File +-- +-- If it wasn't already obvious, -- starts a comment, and all text after it on +-- a line is ignored by Prosody. +-- +-- The config is split into sections, a global section, and one for each +-- defined host that we serve. You can add as many host sections as you like. +-- +-- Lists are written { "like", "this", "one" } +-- Lists can also be of { 1, 2, 3 } numbers, etc. +-- Either commas, or semi-colons; may be used as seperators. +-- +-- A table is a list of values, except each value has a name. An example would +-- be: +-- +-- logging = { type = "html", directory = "/var/logs", rotate = "daily" } +-- +-- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so +-- can +-- be placed anywhere +-- that you deem fitting. +-- +-- Tip: You can check that the syntax of this file is correct when you have +-- finished by running: luac -p prosody.cfg.lua +-- If there are any errors, it will let you know what and where they are, +-- otherwise it will keep quiet. +-- +-- Good luck, and happy Jabbering! + +-- Global settings go in this section +Host "*" + -- This is the list of modules Prosody will load on startup. + -- It looks for mod_modulename.lua in the plugins folder, so make sure that + -- exists too. + modules_enabled = { + -- Generally required + "roster"; -- Allow users to have a roster. Recommended ;) + "saslauth"; -- Authentication for clients and servers. Recommended + -- if you want to log in. + "tls"; -- Add support for secure TLS on c2s/s2s connections + "dialback"; -- s2s dialback support + "disco"; -- Service discovery + + -- Not essential, but recommended + "private"; -- Private XML storage (for room bookmarks, etc.) + "vcard"; -- Allow users to set vCards + + -- Nice to have + "legacyauth"; -- Legacy authentication. Only used by some old + -- clients and bots. + "version"; -- Replies to server version requests + "uptime"; -- Report how long server has been running + "time"; -- Let others know the time here on this server + "ping"; -- Replies to XMPP pings with pongs + + -- Required for daemonizing and logging + "posix"; -- POSIX functionality, sends server to background, + -- enables syslog, etc. + + -- Other specific functionality + "register"; -- Allow users to register on this server using a + -- client + --"console"; -- telnet to port 5582 (needs console_enabled = true) + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"httpserver"; -- Serve static files from a directory over HTTP + } + + -- These are the SSL/TLS-related settings. If you don't want to use + -- SSL/TLS, you may comment or remove this + --ssl = { + -- key = "/etc/prosody/certs/localhost.key"; + -- certificate = "/etc/prosody/certs/localhost.cert"; + --} + + log = { + -- Log all error messages to prosody.err + { levels = { min = "error" }, to = "file", timestamps = true, + filename = "/var/log/prosody/prosody.err" }; + -- Log everything of level "info" and higher (that is, all except + -- "debug" messages) to prosody.log + { levels = { min = "info" }, to = "file", timestamps = true, + filename = "/var/log/prosody/prosody.log" }; + } + + -- Required for proper daemonization support + pidfile = "/var/run/prosody/prosody.pid" + +-- This allows clients to connect to localhost. No harm in it. +Host "localhost" + +-- Section for example.com +-- (replace example.com with your domain name) +Host "example.com" + -- Assign this host a certificate for TLS, otherwise it would use the one + -- set in the global section (if any). + -- Note that old-style SSL on port 5223 only supports one certificate, and + -- will always use the global one. + --ssl = { + -- key = "/etc/prosody/certs/example.com.key"; + -- certificate = "/etc/prosody/certs/example.com.crt"; + --} + + enabled = false -- This will disable the host, preserving the config, but + -- denying connections + +-- Set up a MUC (multi-user chat) room server on conference.localhost: +Component "conference.localhost" "muc" diff --git a/testing/prosody/prosody.initd b/testing/prosody/prosody.initd new file mode 100644 index 00000000..1c88672b --- /dev/null +++ b/testing/prosody/prosody.initd @@ -0,0 +1,43 @@ +#!/sbin/runscript + +# Sample init.d file for alpine linux. + +NAME=prosody +DAEMON=/usr/bin/$NAME + +depend() { + need net +} + +start() { + ebegin "Starting ${NAME}" + /usr/bin/prosodyctl start +# start-stop-daemon --start --quiet --background \ +# --make-pidfile --pidfile /var/run/${NAME}/${NAME}.pid \ +# --chuid ${USER}:${GROUP} \ +# --exec ${DAEMON} -- ${OPTS} + eend $? +} + +stop() { + ebegin "Stopping ${NAME}" + /usr/bin/prosodyctl stop +# start-stop-daemon --stop --quiet \ +# --exec ${DAEMON} \ +# --pidfile /var/run/${NAME}/${NAME}.pid \ + eend $? +} + +reload() { + ebegin "Reloading ${NAME}" + if ! service_started "${NAME}" ; then + eend 1 "${NAME} is not started" + return 1 + fi + /usr/bin/prosodyctl stop + /usr/bin/prosodyctl start +# start-stop-daemon --stop --oknodo --signal HUP \ +# --exec ${DAEMON} --pidfile /var/run/${NAME}/${NAME}.pid + eend $? +} + diff --git a/testing/prosody/prosody.post-install b/testing/prosody/prosody.post-install new file mode 100644 index 00000000..2f8f69cd --- /dev/null +++ b/testing/prosody/prosody.post-install @@ -0,0 +1,6 @@ +#!/bin/sh + +chown prosody:prosody var/lib/prosody +chown prosody:prosody var/log/prosody +chown prosody:prosody var/run/prosody + diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install new file mode 100644 index 00000000..db63efa1 --- /dev/null +++ b/testing/prosody/prosody.pre-install @@ -0,0 +1,9 @@ +#!/bin/sh + +user=prosody +home=/var/lib/prosody +adduser -h $home -s /bin/false -D $user 2>/dev/null +mkdir -p $home +chown $user:$user $home +exit 0 + diff --git a/unstable/prosody/APKBUILD b/unstable/prosody/APKBUILD deleted file mode 100644 index 60ad4e9c..00000000 --- a/unstable/prosody/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor: Mika Havela -# Maintainer: Mika Havela -pkgname=prosody -pkgver=0.4.2 -pkgrel=0 -pkgdesc="Lua based Jabber/XMPP server" -url="http://prosody.im/" -license="MIT" -depends="uclibc lua libidn openssl luasocket luaexpat" -makedepends="lua-dev libidn-dev openssl-dev" -install="prosody.pre-install prosody.post-install" -subpackages="" -source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz - $pkgname.cfg.lua - $pkgname.initd - $install - Makefile-0.4.2.patch - " - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch Makefile "$startdir/Makefile-0.4.2.patch" || return 1 - - ./configure --prefix=/usr \ - --sysconfdir=/etc/prosody \ - --with-lua=/usr/bin \ - --with-lua-lib=/usr/lib \ - --with-lua-include=/usr/include - - make || return 1 - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/var/log/prosody" || return 1 - install -d "$pkgdir/var/run/prosody" || return 1 - install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" - - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} - -md5sums="2669478311b3a67522669acdf03cf85c prosody-0.4.2.tar.gz -f42039e5a342fe62cd7e491546338aaa prosody.cfg.lua -c161a875295b45241229eb6db65211e8 prosody.initd -08484f183ba39233337d3fbc92cffadc prosody.pre-install -8202a40bf6de7cbacbaf76f2985aa220 prosody.post-install -684d033dac42399a245c061c9a374e1b Makefile-0.4.2.patch" diff --git a/unstable/prosody/Makefile-0.4.2.patch b/unstable/prosody/Makefile-0.4.2.patch deleted file mode 100644 index facfa2f9..00000000 --- a/unstable/prosody/Makefile-0.4.2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/prosody-0.4.2/Makefile.org Thu Jun 4 13:44:20 2009 -+++ src/prosody-0.4.2/Makefile Thu Jun 4 13:44:11 2009 -@@ -19,8 +19,8 @@ - install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA) - install -d $(CONFIG)/certs - install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util -- install ./prosody.install $(BIN)/prosody -- install ./prosodyctl.install $(BIN)/prosodyctl -+ install -m755 ./prosody.install $(BIN)/prosody -+ install -m755 ./prosodyctl.install $(BIN)/prosodyctl - install -m644 core/* $(SOURCE)/core - install -m644 net/* $(SOURCE)/net - install -m644 util/* $(SOURCE)/util diff --git a/unstable/prosody/prosody.cfg.lua b/unstable/prosody/prosody.cfg.lua deleted file mode 100644 index 99df66ad..00000000 --- a/unstable/prosody/prosody.cfg.lua +++ /dev/null @@ -1,107 +0,0 @@ --- Prosody Configuration File --- --- If it wasn't already obvious, -- starts a comment, and all text after it on --- a line is ignored by Prosody. --- --- The config is split into sections, a global section, and one for each --- defined host that we serve. You can add as many host sections as you like. --- --- Lists are written { "like", "this", "one" } --- Lists can also be of { 1, 2, 3 } numbers, etc. --- Either commas, or semi-colons; may be used as seperators. --- --- A table is a list of values, except each value has a name. An example would --- be: --- --- logging = { type = "html", directory = "/var/logs", rotate = "daily" } --- --- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so --- can --- be placed anywhere --- that you deem fitting. --- --- Tip: You can check that the syntax of this file is correct when you have --- finished by running: luac -p prosody.cfg.lua --- If there are any errors, it will let you know what and where they are, --- otherwise it will keep quiet. --- --- Good luck, and happy Jabbering! - --- Global settings go in this section -Host "*" - -- This is the list of modules Prosody will load on startup. - -- It looks for mod_modulename.lua in the plugins folder, so make sure that - -- exists too. - modules_enabled = { - -- Generally required - "roster"; -- Allow users to have a roster. Recommended ;) - "saslauth"; -- Authentication for clients and servers. Recommended - -- if you want to log in. - "tls"; -- Add support for secure TLS on c2s/s2s connections - "dialback"; -- s2s dialback support - "disco"; -- Service discovery - - -- Not essential, but recommended - "private"; -- Private XML storage (for room bookmarks, etc.) - "vcard"; -- Allow users to set vCards - - -- Nice to have - "legacyauth"; -- Legacy authentication. Only used by some old - -- clients and bots. - "version"; -- Replies to server version requests - "uptime"; -- Report how long server has been running - "time"; -- Let others know the time here on this server - "ping"; -- Replies to XMPP pings with pongs - - -- Required for daemonizing and logging - "posix"; -- POSIX functionality, sends server to background, - -- enables syslog, etc. - - -- Other specific functionality - "register"; -- Allow users to register on this server using a - -- client - --"console"; -- telnet to port 5582 (needs console_enabled = true) - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"httpserver"; -- Serve static files from a directory over HTTP - } - - -- These are the SSL/TLS-related settings. If you don't want to use - -- SSL/TLS, you may comment or remove this - --ssl = { - -- key = "/etc/prosody/certs/localhost.key"; - -- certificate = "/etc/prosody/certs/localhost.cert"; - --} - - log = { - -- Log all error messages to prosody.err - { levels = { min = "error" }, to = "file", timestamps = true, - filename = "/var/log/prosody/prosody.err" }; - -- Log everything of level "info" and higher (that is, all except - -- "debug" messages) to prosody.log - { levels = { min = "info" }, to = "file", timestamps = true, - filename = "/var/log/prosody/prosody.log" }; - } - - -- Required for proper daemonization support - pidfile = "/var/run/prosody/prosody.pid" - --- This allows clients to connect to localhost. No harm in it. -Host "localhost" - --- Section for example.com --- (replace example.com with your domain name) -Host "example.com" - -- Assign this host a certificate for TLS, otherwise it would use the one - -- set in the global section (if any). - -- Note that old-style SSL on port 5223 only supports one certificate, and - -- will always use the global one. - --ssl = { - -- key = "/etc/prosody/certs/example.com.key"; - -- certificate = "/etc/prosody/certs/example.com.crt"; - --} - - enabled = false -- This will disable the host, preserving the config, but - -- denying connections - --- Set up a MUC (multi-user chat) room server on conference.localhost: -Component "conference.localhost" "muc" diff --git a/unstable/prosody/prosody.initd b/unstable/prosody/prosody.initd deleted file mode 100644 index 1c88672b..00000000 --- a/unstable/prosody/prosody.initd +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/runscript - -# Sample init.d file for alpine linux. - -NAME=prosody -DAEMON=/usr/bin/$NAME - -depend() { - need net -} - -start() { - ebegin "Starting ${NAME}" - /usr/bin/prosodyctl start -# start-stop-daemon --start --quiet --background \ -# --make-pidfile --pidfile /var/run/${NAME}/${NAME}.pid \ -# --chuid ${USER}:${GROUP} \ -# --exec ${DAEMON} -- ${OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${NAME}" - /usr/bin/prosodyctl stop -# start-stop-daemon --stop --quiet \ -# --exec ${DAEMON} \ -# --pidfile /var/run/${NAME}/${NAME}.pid \ - eend $? -} - -reload() { - ebegin "Reloading ${NAME}" - if ! service_started "${NAME}" ; then - eend 1 "${NAME} is not started" - return 1 - fi - /usr/bin/prosodyctl stop - /usr/bin/prosodyctl start -# start-stop-daemon --stop --oknodo --signal HUP \ -# --exec ${DAEMON} --pidfile /var/run/${NAME}/${NAME}.pid - eend $? -} - diff --git a/unstable/prosody/prosody.post-install b/unstable/prosody/prosody.post-install deleted file mode 100644 index 2f8f69cd..00000000 --- a/unstable/prosody/prosody.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -chown prosody:prosody var/lib/prosody -chown prosody:prosody var/log/prosody -chown prosody:prosody var/run/prosody - diff --git a/unstable/prosody/prosody.pre-install b/unstable/prosody/prosody.pre-install deleted file mode 100644 index db63efa1..00000000 --- a/unstable/prosody/prosody.pre-install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -user=prosody -home=/var/lib/prosody -adduser -h $home -s /bin/false -D $user 2>/dev/null -mkdir -p $home -chown $user:$user $home -exit 0 - -- cgit v1.2.3