Attachment 153864 Details for Bug 198333 – svn diff for ftp/pavuk

[patch] svn diff for ftp/pavuk

patch-ftp_pavuk (text/plain), 2.09 KB, created by Bernard Spil on 2015-03-05 20:55:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-03-05 20:55:08 UTC

Size: 2.09 KB

patch

obsolete

>Index: ftp/pavuk/Makefile
>===================================================================
>--- ftp/pavuk/Makefile	(revision 380134)
>+++ ftp/pavuk/Makefile	(working copy)
>@@ -44,7 +44,7 @@
> 		 s|-pthread|${PTHREAD_LIBS}|g ; \
> 		 s|-lpthreads|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
> 	@${FIND}  ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|$$(datadir)/icons|$$(pkgdatadir)/icons|g'
>+		's|$${datadir}/icons|$${pkgdatadir}/icons|g'
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${STAGEDIR}${PREFIX}/etc
>Index: ftp/pavuk/files/patch-src__ntlm_auth.c
>===================================================================
>--- ftp/pavuk/files/patch-src__ntlm_auth.c	(revision 0)
>+++ ftp/pavuk/files/patch-src__ntlm_auth.c	(working copy)
>@@ -0,0 +1,35 @@
>+--- src/ntlm_auth.c.orig	2005-10-27 16:06:37.000000000 +0200
>++++ src/ntlm_auth.c	2015-02-28 12:38:57.150120721 +0100
>+@@ -249,14 +249,14 @@
>+ static void ntlm_des_enc(unsigned char *key, unsigned char *plaintext,
>+   unsigned char *result)
>+ {
>+-  des_key_schedule ks;
>++  DES_key_schedule ks;
>+ #ifdef OPENSSL
>+-  const_des_cblock _plaintext;
>++  const_DES_cblock _plaintext;
>+ #else
>+   const des_cblock _plaintext;
>+ #endif
>+-  des_cblock _result;
>+-  des_cblock key64;
>++  DES_cblock _result;
>++  DES_cblock key64;
>+   unsigned char skey[8];
>+ 
>+   memcpy(&_plaintext, plaintext, sizeof(_plaintext));
>+@@ -265,10 +265,10 @@
>+   memcpy(key64, skey, 8);
>+ 
>+ #ifdef OPENSSL
>+-  des_set_odd_parity(&key64);
>+-  des_set_key(&key64, ks);
>++  DES_set_odd_parity(&key64);
>++  DES_set_key(&key64, &ks);
>+ 
>+-  des_ecb_encrypt(&_plaintext, &_result, ks, DES_ENCRYPT);
>++  DES_ecb_encrypt(&_plaintext, &_result, &ks, DES_ENCRYPT);
>+ #else
>+   des_set_odd_parity(key64);
>+   des_set_key(key64, ks);
>
>Property changes on: ftp/pavuk/files/patch-src__ntlm_auth.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

Actions: View | Diff

Attachments on bug 198333: 153864 | 153865