bugfix update to 0.67.0

patch committed upstream
This commit is contained in:
giovanni 2017-02-09 14:43:04 +00:00
parent b2477ea91a
commit c9da08050a
3 changed files with 4 additions and 36 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2016/09/23 09:16:56 sthen Exp $
# $OpenBSD: Makefile,v 1.60 2017/02/09 14:43:04 giovanni Exp $
COMMENT-main= authentication library for courier
COMMENT-ldap= ldap authentication module for courier-authLib
@ -6,15 +6,12 @@ COMMENT-mysql= mysql authentication module for courier-authLib
COMMENT-pgsql= pgsql authentication module for courier-authLib
COMMENT-userdb= userdb authentication module for courier-authLib
DISTNAME= courier-authlib-0.66.4
DISTNAME= courier-authlib-0.67.0
PKGNAME-main= ${DISTNAME}
PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
REVISION= 1
REVISION-userdb= 2
REVISION-main= 2
SHARED_LIBS += courierauth 1.0 # .0.0
SHARED_LIBS += courierauthsasl 1.0 # .0.0

View File

@ -1,2 +1,2 @@
SHA256 (courier-authlib-0.66.4.tar.bz2) = qHT6UOg9mxOF+XpHh5r3gaGqCfSc2qfXfn6j5Zg6SiY=
SIZE (courier-authlib-0.66.4.tar.bz2) = 2192331
SHA256 (courier-authlib-0.67.0.tar.bz2) = 1Ba5xX7Nmv5uItQLJsLm+aqHv3q76Mp9BHaMMGNVlKM=
SIZE (courier-authlib-0.67.0.tar.bz2) = 2194546

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-userdb_userdbpw_c,v 1.1 2016/09/04 11:40:25 giovanni Exp $
--- userdb/userdbpw.c.orig Sat Aug 27 16:11:25 2016
+++ userdb/userdbpw.c Sat Aug 27 17:55:57 2016
@@ -33,6 +33,7 @@
#include "libhmac/hmac.h"
#endif
+#include <pwd.h>
#include <string.h>
#include <stdio.h>
#include <signal.h>
@@ -102,6 +103,7 @@ int n=1;
int md5=0;
char buf[BUFSIZ];
char salt[9];
+char *cryptsalt;
#if HAVE_HMAC
struct hmac_hashinfo *hmac=0;
#endif
@@ -244,7 +246,8 @@ struct hmac_hashinfo *hmac=0;
#endif
#if HAVE_CRYPT
- printf("%s\n", crypt(buf, salt));
+ cryptsalt=bcrypt_gensalt(8);
+ printf("%s\n", crypt(buf, cryptsalt));
fflush(stdout);
#endif
return (0);