View | Details | Raw Unified | Return to bug 198333
Collapse All | Expand All

(-)ftp/pavuk/Makefile (-1 / +1 lines)
Lines 44-50 Link Here
44
		 s|-pthread|${PTHREAD_LIBS}|g ; \
44
		 s|-pthread|${PTHREAD_LIBS}|g ; \
45
		 s|-lpthreads|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
45
		 s|-lpthreads|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
46
	@${FIND}  ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
46
	@${FIND}  ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
47
		's|$$(datadir)/icons|$$(pkgdatadir)/icons|g'
47
		's|$${datadir}/icons|$${pkgdatadir}/icons|g'
48
48
49
post-install:
49
post-install:
50
	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${STAGEDIR}${PREFIX}/etc
50
	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${STAGEDIR}${PREFIX}/etc
(-)ftp/pavuk/files/patch-src__ntlm_auth.c (+35 lines)
Line 0 Link Here
1
--- src/ntlm_auth.c.orig	2005-10-27 16:06:37.000000000 +0200
2
+++ src/ntlm_auth.c	2015-02-28 12:38:57.150120721 +0100
3
@@ -249,14 +249,14 @@
4
 static void ntlm_des_enc(unsigned char *key, unsigned char *plaintext,
5
   unsigned char *result)
6
 {
7
-  des_key_schedule ks;
8
+  DES_key_schedule ks;
9
 #ifdef OPENSSL
10
-  const_des_cblock _plaintext;
11
+  const_DES_cblock _plaintext;
12
 #else
13
   const des_cblock _plaintext;
14
 #endif
15
-  des_cblock _result;
16
-  des_cblock key64;
17
+  DES_cblock _result;
18
+  DES_cblock key64;
19
   unsigned char skey[8];
20
 
21
   memcpy(&_plaintext, plaintext, sizeof(_plaintext));
22
@@ -265,10 +265,10 @@
23
   memcpy(key64, skey, 8);
24
 
25
 #ifdef OPENSSL
26
-  des_set_odd_parity(&key64);
27
-  des_set_key(&key64, ks);
28
+  DES_set_odd_parity(&key64);
29
+  DES_set_key(&key64, &ks);
30
 
31
-  des_ecb_encrypt(&_plaintext, &_result, ks, DES_ENCRYPT);
32
+  DES_ecb_encrypt(&_plaintext, &_result, &ks, DES_ENCRYPT);
33
 #else
34
   des_set_odd_parity(key64);
35
   des_set_key(key64, ks);

Return to bug 198333