robert pushed to prosody (el6). "0.9.0beta1, lua 5.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 14:27:28 UTC 2015
>From a27991a48dfb3abe922e20f7482eebe531361fcb Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 15 May 2013 11:19:10 -0400
Subject: 0.9.0beta1, lua 5.2
diff --git a/.gitignore b/.gitignore
index 91f5cd1..2afc049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/prosody-0.8.2.tar.gz
+/prosody-0.9.0beta1.tar.gz
diff --git a/prosody.config.patch b/prosody.config.patch
index 9eaa215..3df90d7 100644
--- a/prosody.config.patch
+++ b/prosody.config.patch
@@ -1,27 +1,27 @@
-diff -up prosody-0.8.0/prosody.cfg.lua.dist.patch prosody-0.8.0/prosody.cfg.lua.dist
---- prosody-0.8.0/prosody.cfg.lua.dist.patch 2011-04-08 14:20:24.508974815 +0200
-+++ prosody-0.8.0/prosody.cfg.lua.dist 2011-04-08 14:25:56.159877253 +0200
-@@ -59,7 +59,7 @@ modules_enabled = {
- --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+diff -up prosody-0.9.0beta1/prosody.cfg.lua.dist.orig prosody-0.9.0beta1/prosody.cfg.lua.dist
+--- prosody-0.9.0beta1/prosody.cfg.lua.dist.orig 2013-05-11 09:03:08.000000000 -0400
++++ prosody-0.9.0beta1/prosody.cfg.lua.dist 2013-05-15 11:15:28.049315751 -0400
+@@ -63,7 +63,7 @@ modules_enabled = {
+ --"http_files"; -- Serve static files from a directory over HTTP
-- Other specific functionality
- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- --"httpserver"; -- Serve static files from a directory over HTTP
--"groups"; -- Shared roster support
-@@ -86,8 +86,8 @@ allow_registration = false;
+ --"announce"; -- Send announcement to all online users
+ --"welcome"; -- Welcome users who register accounts
+@@ -87,8 +87,8 @@ allow_registration = false;
-- These are the SSL/TLS-related settings. If you don't want
-- to use SSL/TLS, you may comment or remove this
ssl = {
- key = "certs/localhost.key";
-- certificate = "certs/localhost.cert";
+- certificate = "certs/localhost.crt";
+ key = "/etc/pki/tls/private/prosody.key";
+ certificate = "/etc/pki/tls/certs/prosody.crt";
}
- -- Only allow encrypted streams? Encryption is already used when
-@@ -123,11 +123,12 @@ authentication = "internal_plain"
+ -- Force clients to use encrypted connections? This option will
+@@ -139,11 +139,12 @@ authentication = "internal_plain"
-- Logging configuration
-- For advanced logging see http://prosody.im/doc/logging
log = {
diff --git a/prosody.spec b/prosody.spec
index f76b8f6..26109cc 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -6,17 +6,18 @@
%global sslcert %{_sysconfdir}/pki/tls/certs/prosody.crt
%global sslkey %{_sysconfdir}/pki/tls/private/prosody.key
-%global luaver 5.1
+%global luaver 5.2
+%global pretag beta1
Name: prosody
-Version: 0.8.2
-Release: 9%{?dist}
+Version: 0.9.0
+Release: 0.1.%{pretag}%{?dist}
Summary: Flexible communications server for Jabber/XMPP
Group: System Environment/Daemons
License: MIT
URL: http://prosody.im/
-Source0: http://prosody.im/downloads/source/%{name}-%{version}.tar.gz
+Source0: http://prosody.im/downloads/source/%{name}-%{version}%{?pretag}.tar.gz
Source1: %{name}.init
Source2: %{name}.tmpfiles
Source3: %{name}.service
@@ -53,7 +54,7 @@ develop added functionality, or prototype new protocols.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?pretag}
%patch0 -p1
# remove default ssl certificates
%patch1 -p1
@@ -185,6 +186,9 @@ fi
%changelog
+* Wed May 15 2013 Tom Callaway <spot at fedoraproject.org> - 0.9.0-0.1.beta1
+- update to 0.9.0beta1, rebuild for lua 5.2
+
* Sat Apr 27 2013 Robert Scheck <robert at fedoraproject.org> - 0.8.2-9
- Apply wise permissions to %%{_sysconfdir}/%%{name} (#955384)
- Apply wise permissions to default SSL certificates (#955380)
diff --git a/prosody.sslcerts.patch b/prosody.sslcerts.patch
index c1c4faf..97ea212 100644
--- a/prosody.sslcerts.patch
+++ b/prosody.sslcerts.patch
@@ -1,7 +1,7 @@
-diff -up prosody-0.8.2/Makefile.patch prosody-0.8.2/Makefile
---- prosody-0.8.2/Makefile.patch 2013-04-27 23:21:21.703446153 +0200
-+++ prosody-0.8.2/Makefile 2013-04-27 23:22:19.525442335 +0200
-@@ -20,7 +20,6 @@ install: prosody.install prosodyctl.inst
+diff -up prosody-0.9.0beta1/Makefile.orig prosody-0.9.0beta1/Makefile
+--- prosody-0.9.0beta1/Makefile.orig 2013-05-11 09:03:07.000000000 -0400
++++ prosody-0.9.0beta1/Makefile 2013-05-15 11:17:11.675317306 -0400
+@@ -22,7 +22,6 @@ install: prosody.install prosodyctl.inst
install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
install -m750 -d $(DATA)
install -d $(MAN)/man1
@@ -9,17 +9,15 @@ diff -up prosody-0.8.2/Makefile.patch prosody-0.8.2/Makefile
install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
install -m755 ./prosody.install $(BIN)/prosody
install -m755 ./prosodyctl.install $(BIN)/prosodyctl
-@@ -33,18 +32,16 @@ install: prosody.install prosodyctl.inst
- install -m644 plugins/*.lua $(MODULES)
- install -d $(MODULES)/muc
- install -m644 plugins/muc/* $(MODULES)/muc
+@@ -35,16 +34,14 @@ install: prosody.install prosodyctl.inst
+ install -d $(SOURCE)/util/sasl
+ install -m644 util/sasl/* $(SOURCE)/util/sasl
+ umask 0022 && cp -r plugins/* $(MODULES)
- install -m644 certs/* $(CONFIG)/certs
- install -d $(MODULES)/adhoc
- install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
- test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+ test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.dist $(CONFIG)/prosody.cfg.lua
- test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
+ test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
$(MAKE) install -C util-src
clean:
diff --git a/sources b/sources
index 29da2f1..a5f6ab2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e907bf0d0acf24f1011083020ba6ffb prosody-0.8.2.tar.gz
+0de28f2b5fda73453c29c3e138a80c82 prosody-0.9.0beta1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/prosody.git/commit/?h=el6&id=a27991a48dfb3abe922e20f7482eebe531361fcb
More information about the scm-commits
mailing list