diff --git a/net/netatalk22/Makefile b/net/netatalk22/Makefile index 81873ebce6d0..f7b2c5028e1f 100644 --- a/net/netatalk22/Makefile +++ b/net/netatalk22/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.51 2023/02/07 23:00:40 hauke Exp $ +# $NetBSD: Makefile,v 1.52 2023/02/28 15:33:59 hauke Exp $ -DISTNAME= netatalk-2.2.7 -PKGREVISION= 1 +DISTNAME= netatalk-2.2.8 PKGNAME= ${DISTNAME:C/-/22-/} CATEGORIES= net print -MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/netatalk-2-2-7/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:C/\./-/g}/ #PATCHFILES= patch-adv1tov2.c PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \ http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/ @@ -50,6 +49,9 @@ CONFIGURE_ARGS+= --with-bdb=${BDBBASE} CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +# See +#CFLAGS+= -DOPENSSL_API_COMPAT=0x10000000L + MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg SUBST_CLASSES+= paths diff --git a/net/netatalk22/PLIST b/net/netatalk22/PLIST index 2bac39066091..6c239ef1ab05 100644 --- a/net/netatalk22/PLIST +++ b/net/netatalk22/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2017/07/12 13:56:00 hauke Exp $ -${PLIST.ea}bin/ad +@comment $NetBSD: PLIST,v 1.3 2023/02/28 15:33:59 hauke Exp $ +bin/ad bin/add_netatalk_printer bin/adv1tov2 bin/aecho @@ -72,6 +72,7 @@ include/netatalk/ddp_var.h include/netatalk/endian.h include/netatalk/phase2.h lib/libatalk.la +libexec/netatalk/a2boot libexec/netatalk/afpd libexec/netatalk/atalkd libexec/netatalk/cnid_dbd @@ -104,13 +105,12 @@ libexec/netatalk/timelord libexec/netatalk/uams/uams_clrtxt.so libexec/netatalk/uams/uams_dhx.so libexec/netatalk/uams/uams_dhx2.so -${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la +libexec/netatalk/uams/uams_dhx2_pam.la libexec/netatalk/uams/uams_dhx2_passwd.la -${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la +libexec/netatalk/uams/uams_dhx_pam.la libexec/netatalk/uams/uams_dhx_passwd.la -${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la libexec/netatalk/uams/uams_guest.la -${PLIST.pam}libexec/netatalk/uams/uams_pam.la +libexec/netatalk/uams/uams_pam.la libexec/netatalk/uams/uams_passwd.la libexec/netatalk/uams/uams_randnum.la man/man1/ad.1 @@ -162,11 +162,11 @@ man/man8/timelord.8 share/aclocal/netatalk.m4 share/examples/netatalk/AppleVolumes.default share/examples/netatalk/AppleVolumes.system -${PLIST.ldap}share/examples/netatalk/afp_ldap.conf +share/examples/netatalk/afp_ldap.conf share/examples/netatalk/afpd.conf share/examples/netatalk/atalkd.conf share/examples/netatalk/netatalk.conf -${PLIST.pam}share/examples/netatalk/netatalk.pam +share/examples/netatalk/netatalk.pam share/examples/netatalk/papd.conf share/netatalk/pagecount.ps @pkgdir libexec/psffilters diff --git a/net/netatalk22/distinfo b/net/netatalk22/distinfo index 08b5135a2413..8001094d8d61 100644 --- a/net/netatalk22/distinfo +++ b/net/netatalk22/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.15 2023/02/07 23:00:40 hauke Exp $ +$NetBSD: distinfo,v 1.16 2023/02/28 15:33:59 hauke Exp $ -BLAKE2s (netatalk-2.2.7.tar.gz) = a828870c06fcec3aaf1ec4fd6c06411ecc0e687b73f4d29257743de0667798df -SHA512 (netatalk-2.2.7.tar.gz) = fb6664b2ea700f1a8307eaf452954e2f0c3bb7d082f2df211f17a79d1fc7f3ca4dff0b805beb7b8d10fb23d749fd1990a6b07c029d89d09299677a41b8161220 -Size (netatalk-2.2.7.tar.gz) = 1849800 bytes +BLAKE2s (netatalk-2.2.8.tar.gz) = d1639506069a81bcd1476818b16e5569a2e8eaf8c15a2620709bd198ecdb1367 +SHA512 (netatalk-2.2.8.tar.gz) = d39416f8559c445cd5920c628c1ee4292172ce0757137c1c05f26bd277e572a51430b2633da07ed7f08a151d0142968676976e86d06e8044310710d09217beae +Size (netatalk-2.2.8.tar.gz) = 1865660 bytes SHA1 (patch-config_Makefile.in) = 37ed88693c64b5e34396da26f9d7105102ed479b SHA1 (patch-configure) = 6b9d73ac0c8ba4913834402a587b734d342c3830 -SHA1 (patch-etc_afpd_volume.c) = f4aaa91daf26f16df48cb6f39340748e4b4b6ab5 -SHA1 (patch-etc_uams_uams__dhx__passwd.c) = a4eb368ae6f1698d906fe1ba2f1600b7a0b20539 diff --git a/net/netatalk22/patches/patch-etc_afpd_volume.c b/net/netatalk22/patches/patch-etc_afpd_volume.c deleted file mode 100644 index 62eb6d050eb6..000000000000 --- a/net/netatalk22/patches/patch-etc_afpd_volume.c +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-etc_afpd_volume.c,v 1.1 2023/02/07 23:00:40 hauke Exp $ - -Unlink temp file after using it to check for EA support. -Fixes GitHub issue #188 - -Patch from upstream - ---- etc/afpd/volume.c.orig 2022-07-12 04:08:24.000000000 +0000 -+++ etc/afpd/volume.c -@@ -2217,6 +2217,7 @@ static void check_ea_sys_support(struct - uid_t process_uid = 0; - char eaname[] = {"org.netatalk.supports-eas.XXXXXX"}; - const char *eacontent = "yes"; -+ int fd; - - if (vol->v_vfs_ea == AFPVOL_EA_AUTO) { - -@@ -2226,7 +2227,6 @@ static void check_ea_sys_support(struct - return; - } - -- int fd; - fd = mkstemp(eaname); - close(fd); - -@@ -2234,6 +2234,7 @@ static void check_ea_sys_support(struct - if (process_uid) - if (seteuid(0) == -1) { - LOG(log_error, logtype_afpd, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); -+ unlink(eaname); - exit(EXITERR_SYS); - } - -@@ -2249,9 +2250,12 @@ static void check_ea_sys_support(struct - if (process_uid) { - if (seteuid(process_uid) == -1) { - LOG(log_error, logtype_afpd, "can't seteuid back %s", strerror(errno)); -+ unlink(eaname); - exit(EXITERR_SYS); - } - } -+ -+ unlink(eaname); - } - } - diff --git a/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c b/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c deleted file mode 100644 index 8e9ab13d296e..000000000000 --- a/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.3 2023/01/10 22:07:33 hauke Exp $ - -Don't include headers that are not shipped - ---- etc/uams/uams_dhx_passwd.c.orig 2022-07-12 04:08:24.000000000 +0000 -+++ etc/uams/uams_dhx_passwd.c -@@ -37,7 +37,6 @@ - #include - #include - #include --#include "openssl_compat.h" - #else /* OPENSSL_DHX */ - #include - #include