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

fix path to pem file, lost in previous commit

Browse Source
This commit is contained in:
sthen 2015-08-25 12:24:02 +00:00
parent 0176f4ec4e
commit ec06a655c0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/yubiserve/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2015/07/18 04:09:27 sthen Exp $ # $OpenBSD: Makefile,v 1.9 2015/08/25 12:24:02 sthen Exp $
COMMENT= standalone Yubikey and OATH/HOTP validation server COMMENT= standalone Yubikey and OATH/HOTP validation server
DISTNAME= yubico-yubiserve-3.1 DISTNAME= yubico-yubiserve-3.1
REVISION= 5 REVISION= 6
EXTRACT_SUFX= .zip EXTRACT_SUFX= .zip
UNZIP= unzip -a UNZIP= unzip -a
PKGNAME= ${DISTNAME:S/yubico-//} PKGNAME= ${DISTNAME:S/yubico-//}

14
security/yubiserve/patches/patch-yubiserve_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-yubiserve_py,v 1.5 2015/07/18 04:09:27 sthen Exp $ $OpenBSD: patch-yubiserve_py,v 1.6 2015/08/25 12:24:02 sthen Exp $
sqlite3 support from sqlite3 support from
http://code.google.com/p/yubico-yubiserve/source/list r39 http://code.google.com/p/yubico-yubiserve/source/list r39
@ -6,8 +6,8 @@ http://code.google.com/p/yubico-yubiserve/source/list r39
remove bogus timestamp checking code; that isn't what the timestamps are for, remove bogus timestamp checking code; that isn't what the timestamps are for,
and they wrap after between 0 and 24-and-a-bit days uptime causing failures. and they wrap after between 0 and 24-and-a-bit days uptime causing failures.
--- yubiserve.py.orig Fri Jul 17 22:07:56 2015 --- yubiserve.py.orig Tue Aug 25 13:20:55 2015
+++ yubiserve.py Fri Jul 17 22:07:56 2015 +++ yubiserve.py Tue Aug 25 13:21:29 2015
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/python -#!/usr/bin/python
+#!${MODPY_BIN} +#!${MODPY_BIN}
@ -172,8 +172,12 @@ and they wrap after between 0 and 24-and-a-bit days uptime causing failures.
api_key = cur.fetchone()[0] api_key = cur.fetchone()[0]
otp_hmac = hmac.new(api_key, msg=result, digestmod=hashlib.sha1).hexdigest().decode('hex').encode('base64').strip() otp_hmac = hmac.new(api_key, msg=result, digestmod=hashlib.sha1).hexdigest().decode('hex').encode('base64').strip()
except KeyError: except KeyError:
@@ -325,6 +335,7 @@ class SecureHTTPServer(BaseHTTPServer.HTTPServer): @@ -322,9 +332,10 @@ class SecureHTTPServer(BaseHTTPServer.HTTPServer):
fpem = os.path.dirname(os.path.realpath(__file__)) + '/yubiserve.pem' def __init__(self, server_address, HandlerClass):
BaseHTTPServer.HTTPServer.__init__(self, server_address, HandlerClass)
ctx = SSL.Context(SSL.SSLv23_METHOD)
- fpem = os.path.dirname(os.path.realpath(__file__)) + '/yubiserve.pem'
+ fpem = '${SYSCONFDIR}/yubiserve/yubiserve.pem'
ctx.use_privatekey_file (fpem) ctx.use_privatekey_file (fpem)
ctx.use_certificate_file(fpem) ctx.use_certificate_file(fpem)
+ ctx.use_certificate_chain_file(fpem) + ctx.use_certificate_chain_file(fpem)