head	1.2;
access;
symbols
	pkgsrc-2017Q2:1.1.0.26
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.24
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.22
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.20
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.18
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.16
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.14
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.12
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.10
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.8
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.6
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.4
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.2
	pkgsrc-2014Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2017.07.12.13.56.00;	author hauke;	state dead;
branches;
next	1.1;
commitid	Fzb5HXdFgY5EAWYz;

1.1
date	2014.06.11.11.03.56;	author hauke;	state Exp;
branches;
next	;
commitid	2Q8IGfQDXWRnT5Ex;


desc
@@


1.2
log
@Update netatalk22 to patch release 2.2.6.

For changes see
<https://github.com/Netatalk/Netatalk/commits/branch-netatalk-2-2>
- the upstream release branch does not have a changelog.

Upstream took a lot of our patches - thanks, guys!

Package changes include untangling ldap support, so that the package
builds with it. There has been confusion between acl and ldap support
upstream as well as in the package - see
patch-include_atalk_ldapconfig.h and
<https://github.com/Netatalk/Netatalk/commits/branch-netatalk-2-2/include/atalk/ldapconfig.h>.
@
text
@$NetBSD: patch-am,v 1.1 2014/06/11 11:03:56 hauke Exp $

--- bin/afppasswd/afppasswd.c.orig	2011-09-02 07:54:44.000000000 -0400
+++ bin/afppasswd/afppasswd.c	2011-09-21 11:21:42.000000000 -0400
@@@@ -40,7 +40,7 @@@@
 
 #include <netatalk/endian.h>
 
-#include <des.h>
+#include <openssl/des.h>
 
 #ifdef USE_CRACKLIB
 #include <crack.h>
@@@@ -70,7 +70,7 @@@@
 static void convert_passwd(char *buf, char *newpwd, const int keyfd)
 {
   u_int8_t key[HEXPASSWDLEN];
-  Key_schedule schedule;
+  DES_key_schedule schedule;
   unsigned int i, j;
 
   if (!newpwd) {
@@@@ -89,14 +89,14 @@@@
       key[j] = (unhex(key[i]) << 4) | unhex(key[i + 1]);
     if (j <= DES_KEY_SZ)
       memset(key + j, 0, sizeof(key) - j);
-    key_sched((C_Block *) key, schedule);
+    DES_key_sched((DES_cblock *) key, &schedule);
     memset(key, 0, sizeof(key));   
     if (newpwd) {
-	ecb_encrypt((C_Block *) newpwd, (C_Block *) newpwd, schedule,
+	DES_ecb_encrypt((DES_cblock *) newpwd, (DES_cblock *) newpwd, &schedule,
 		    DES_ENCRYPT);
     } else {
       /* decrypt the password */
-      ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
+      DES_ecb_encrypt((DES_cblock *) buf, (DES_cblock *) buf, &schedule, DES_DECRYPT);
     }
     memset(&schedule, 0, sizeof(schedule));      
   }
@


1.1
log
@Rename net/netatalk to net/netatalk22. This is the last version to
support the AppleTalk ddp protocol, and here to stay while NetBSD
ships with AppleTalk support.

Add Netatalk 3.0.8 wip package as net/netatalk30.

"Netatalk 3 is a freely-available implementation of the Apple
Filesharing Protocol Suite (AFP) over TCP/IP.

Using Netatalk's AFP 3.1 compliant file-server leads to significantly
higher transmissions speeds compared with Macs accessing a server via
SMB or NFS, while providing clients with the best user experience (full
support for Macintosh metadata, flawlessly supporting mixed
environments of classic MacOS and MacOS X clients)."
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.5 2011/09/22 01:20:21 christos Exp $
@