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

- Use the more common '.crt' extension for certificates and fix

Browse Source 
an inconsistency along the way.

      ok MAINTAINER
This commit is contained in:
jasper 2012-10-05 14:38:09 +00:00
parent 1fb5ab4805
commit dc5ce6f2bc
4 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/prosody/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2012/09/14 21:51:19 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2012/10/05 14:38:09 jasper Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= communications server for Jabber/XMPP written in Lua
DISTNAME= prosody-0.8.2
CATEGORIES= net
MASTER_SITES= http://prosody.im/downloads/source/
REVISION= 7
REVISION= 8
HOMEPAGE= http://prosody.im/

27
net/prosody/patches/patch-certs_Makefile Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-certs_Makefile,v 1.1 2012/10/05 14:38:09 jasper Exp $
--- certs/Makefile.orig Fri Oct 5 16:17:36 2012
+++ certs/Makefile Fri Oct 5 16:17:56 2012
@@ -1,4 +1,4 @@
-.DEFAULT: localhost.cert
+.DEFAULT: localhost.crt
keysize=2048
# How to:
@@ -8,7 +8,7 @@ keysize=2048
# Then `make yourhost.key` to create your private key, you can
# include keysize=number to change the size of the key.
# Then you can either `make yourhost.csr` to generate a certificate
-# signing request that you can submit to a CA, or `make yourhost.cert`
+# signing request that you can submit to a CA, or `make yourhost.crt`
# to generate a self signed certificate.
.PRECIOUS: %.cnf %.key
@@ -18,7 +18,7 @@ keysize=2048
openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword $^)
# Self signed
-%.cert: %.cnf %.key
+%.crt: %.cnf %.key
openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \
-sha1 -out $@ -utf8 -config $(firstword $^)

15
net/prosody/patches/patch-prosody_cfg_lua_dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-prosody_cfg_lua_dist,v 1.3 2012/01/26 10:27:15 sthen Exp $
--- prosody.cfg.lua.dist.orig Tue May 3 19:18:54 2011
+++ prosody.cfg.lua.dist Tue May 3 19:23:01 2011
$OpenBSD: patch-prosody_cfg_lua_dist,v 1.4 2012/10/05 14:38:09 jasper Exp $
--- prosody.cfg.lua.dist.orig Sun Jun 12 23:21:40 2011
+++ prosody.cfg.lua.dist Fri Oct 5 16:17:16 2012
@@ -22,6 +22,14 @@
-- Example: admins = { "user1@example.com", "user2@example.net" }
admins = { }
@ -25,6 +25,15 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1.3 2012/01/26 10:27:15 sthen Exp $
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"httpserver"; -- Serve static files from a directory over HTTP
--"groups"; -- Shared roster support
@@ -87,7 +95,7 @@ allow_registration = false;
-- to use SSL/TLS, you may comment or remove this
ssl = {
key = "certs/localhost.key";
- certificate = "certs/localhost.cert";
+ certificate = "certs/localhost.crt";
}
-- Only allow encrypted streams? Encryption is already used when
@@ -123,8 +131,8 @@ authentication = "internal_plain"
-- Logging configuration
-- For advanced logging see http://prosody.im/doc/logging

4
net/prosody/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2012/01/26 16:28:48 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2012/10/05 14:38:09 jasper Exp $
@newgroup _prosody:638
@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin
%%SHARED%%
@ -127,7 +127,7 @@ share/examples/prosody/certs/
share/examples/prosody/certs/Makefile
@sample ${SYSCONFDIR}/prosody/certs/Makefile
share/examples/prosody/certs/localhost.cert
@sample ${SYSCONFDIR}/prosody/certs/localhost.cert
@sample ${SYSCONFDIR}/prosody/certs/localhost.crt
share/examples/prosody/certs/localhost.key
@sample ${SYSCONFDIR}/prosody/certs/localhost.key
share/examples/prosody/certs/openssl.cnf