Update to netatalk-2.2.6.

net/netatalk/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.65 2018/01/14 14:42:18 rpe Exp $
+# $OpenBSD: Makefile,v 1.66 2018/04/27 17:22:27 ajacoutot Exp $
 
 PORTROACH=	limit:^2
 
 COMMENT=	AFP file and print services for IP networks
 
-DISTNAME=	netatalk-2.2.5
-REVISION=	11
+DISTNAME=	netatalk-2.2.6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2

net/netatalk/distinfo

@@ -1,2 +1,2 @@
-SHA256 (netatalk-2.2.5.tar.bz2) = dlivx5OrNvHNp99XGVmKy/Nm4hPie+HLvC2TYxw2iGk=
-SIZE (netatalk-2.2.5.tar.bz2) = 1290761
+SHA256 (netatalk-2.2.6.tar.bz2) = wf3aH2eROqGAmj2ogxNb4VGT2mXoWQK8WahnCbWhe8I=
+SIZE (netatalk-2.2.6.tar.bz2) = 1301887

net/netatalk/patches/patch-bin_afppasswd_afppasswd_c

@@ -1,30 +0,0 @@
-$OpenBSD: patch-bin_afppasswd_afppasswd_c,v 1.4 2014/04/15 16:12:21 naddy Exp $
---- bin/afppasswd/afppasswd.c.orig	Tue Jul 23 11:10:55 2013
-+++ bin/afppasswd/afppasswd.c	Tue Apr 15 16:24:33 2014
-@@ -70,7 +70,7 @@ static char buf[MAXPATHLEN + 1];
- 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 @@ static void convert_passwd(char *buf, char *newpwd, co
-       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));      
-   }

net/netatalk/patches/patch-configure

@@ -1,7 +1,9 @@
-$OpenBSD: patch-configure,v 1.4 2012/08/27 06:19:48 ajacoutot Exp $
---- configure.orig	Thu Apr 26 10:27:12 2012
-+++ configure	Thu Aug 16 18:00:15 2012
-@@ -15761,7 +15761,7 @@ fi
+$OpenBSD: patch-configure,v 1.5 2018/04/27 17:22:27 ajacoutot Exp $
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -16362,7 +16362,7 @@ fi
  	for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

net/netatalk/patches/patch-etc_uams_Makefile_in

@@ -1,7 +1,9 @@
-$OpenBSD: patch-etc_uams_Makefile_in,v 1.1 2012/06/15 10:34:46 ajacoutot Exp $
---- etc/uams/Makefile.in.orig	Mon May 28 03:04:55 2012
-+++ etc/uams/Makefile.in	Mon May 28 03:05:16 2012
-@@ -893,7 +893,7 @@ install-data: install-data-recursive
+$OpenBSD: patch-etc_uams_Makefile_in,v 1.2 2018/04/27 17:22:27 ajacoutot Exp $
+
+Index: etc/uams/Makefile.in
+--- etc/uams/Makefile.in.orig
++++ etc/uams/Makefile.in
+@@ -963,7 +963,7 @@ install-data: install-data-recursive
  uninstall: uninstall-recursive
  
  install-am: all-am

net/netatalk/patches/patch-etc_uams_uams_randnum_c

@@ -1,4 +1,5 @@
-$OpenBSD: patch-etc_uams_uams_randnum_c,v 1.1 2014/04/15 16:12:21 naddy Exp $
+$OpenBSD: patch-etc_uams_uams_randnum_c,v 1.2 2018/04/27 17:22:27 ajacoutot Exp $
+
 --- etc/uams/uams_randnum.c.orig	Tue Jul 23 11:10:55 2013
 +++ etc/uams/uams_randnum.c	Tue Apr 15 16:38:15 2014
 @@ -55,8 +55,8 @@ char *strchr (), *strrchr ();

net/netatalk/patches/patch-include_atalk_acl_h

@@ -1,12 +0,0 @@
-$OpenBSD: patch-include_atalk_acl_h,v 1.1 2013/10/06 21:49:32 brad Exp $
---- include/atalk/acl.h.orig	Fri Aug 23 10:35:30 2013
-+++ include/atalk/acl.h	Fri Aug 23 10:36:11 2013
-@@ -53,7 +53,7 @@ extern int remove_acl_vfs(const char *name);
- 
- #else /* HAVE_ACLS=no */
- 
--#define O_NETATALK_ACL
-+#define O_NETATALK_ACL 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */