Index: head/net/gq/Makefile =================================================================== --- head/net/gq/Makefile (revision 417926) +++ head/net/gq/Makefile (revision 417927) @@ -1,43 +1,42 @@ # Created by: Roman Shterenzon # $FreeBSD$ PORTNAME= gq PORTVERSION= 1.3.4 PORTREVISION= 13 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GTK-based LDAP client LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring OPTIONS_DEFINE= DND CACHE OPTIONS_DEFAULT= DND CACHE DND_DESC= Enable Drag and drop support in browse mode CACHE_DESC= Support the OpenLDAP experimental client cache USE_GNOME= intltool libglade2 gnomedocutils -USE_OPENSSL= yes USE_OPENLDAP= yes -USES= gettext gmake pkgconfig shared-mime-info desktop-file-utils +USES= desktop-file-utils gettext pkgconfig gmake shared-mime-info ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ldap-prefix=${LOCALBASE} --disable-update-mimedb DND_CONFIGURE_ENABLE= browser-dns CACHE_CONFIGURE_ENABLE= cache INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -Wno-return-type LIBS+= -L${LOCALBASE}/lib -lcrypto post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/src/syntax.h \ ${WRKSRC}/src/glib-helpers.[ch] \ ${WRKSRC}/src/gq-hash.h \ ${WRKSRC}/src/gq-main-loop.h \ ${WRKSRC}/src/gq-stack.[ch] \ ${WRKSRC}/src/gq-tab.h .include Index: head/net/gq/files/patch-src_gq-hash-openssl.c =================================================================== --- head/net/gq/files/patch-src_gq-hash-openssl.c (nonexistent) +++ head/net/gq/files/patch-src_gq-hash-openssl.c (revision 417927) @@ -0,0 +1,60 @@ +--- src/gq-hash-openssl.c.orig 2008-01-09 14:55:46 UTC ++++ src/gq-hash-openssl.c +@@ -60,7 +60,7 @@ gq_hash_crypt(gchar const *data, gsize l + salt->str[2] = 0; + + g_byte_array_append(gb, (guchar*)"{CRYPT}", 7); +- des_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf); ++ DES_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf); + + g_byte_array_append(gb, cryptbuf, strlen((gchar*)cryptbuf)); + +@@ -242,7 +242,7 @@ static const char *lmhash_key = "KGS!@#$ + /* FIXME: silently assumes US-ASCII (or a single-byte encoding to be + handled by toupper) */ + +-static void lm_make_key(const char *pw, des_cblock *key) ++static void lm_make_key(const char *pw, DES_cblock *key) + { + int i; + char *k = (char *) key; +@@ -253,7 +253,7 @@ static void lm_make_key(const char *pw, + k[i+1] = (pw[i] << (7 - i)) & 0xff; + } + +- des_set_odd_parity(key); ++ DES_set_odd_parity(key); + } + + GByteArray* +@@ -262,10 +262,10 @@ gq_hash_lmhash(gchar const* data, gsize + unsigned int i; + char hex[2]; + char plain[15]; +- des_key_schedule schedule; ++ DES_key_schedule schedule; + GByteArray *gb = NULL; +- des_cblock ckey1, ckey2; +- des_cblock bin1, bin2; ++ DES_cblock ckey1, ckey2; ++ DES_cblock bin1, bin2; + + memset(plain, 0, sizeof(plain)); + +@@ -274,12 +274,12 @@ gq_hash_lmhash(gchar const* data, gsize + } + + lm_make_key(plain, &ckey1); +- des_set_key_unchecked(&ckey1, schedule); +- des_ecb_encrypt((des_cblock*)lmhash_key, &bin1, schedule, DES_ENCRYPT); ++ DES_set_key_unchecked(&ckey1, &schedule); ++ DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin1, &schedule, DES_ENCRYPT); + + lm_make_key(plain + 7, &ckey2); +- des_set_key_unchecked(&ckey2, schedule); +- des_ecb_encrypt((des_cblock*)lmhash_key, &bin2, schedule, DES_ENCRYPT); ++ DES_set_key_unchecked(&ckey2, &schedule); ++ DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin2, &schedule, DES_ENCRYPT); + + gb = g_byte_array_new(); + Property changes on: head/net/gq/files/patch-src_gq-hash-openssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property