CVS commit: pkgsrc/net/netatalk22

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Feb  7 23:00:40 UTC 2023

Modified Files:
        pkgsrc/net/netatalk22: Makefile distinfo
Added Files:
        pkgsrc/net/netatalk22/patches: patch-etc_afpd_volume.c

Log Message:
Unlink temp file after using it to check for EA support.
Fixes GitHub issue #188

Patch from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/netatalk22/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/netatalk22/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/netatalk22/patches/patch-etc_afpd_volume.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk22/Makefile
diff -u pkgsrc/net/netatalk22/Makefile:1.50 pkgsrc/net/netatalk22/Makefile:1.51
--- pkgsrc/net/netatalk22/Makefile:1.50 Tue Jan 10 22:07:33 2023
+++ pkgsrc/net/netatalk22/Makefile      Tue Feb  7 23:00:40 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2023/01/10 22:07:33 hauke Exp $
+# $NetBSD: Makefile,v 1.51 2023/02/07 23:00:40 hauke Exp $
 
 DISTNAME=      netatalk-2.2.7
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:C/-/22-/}
 CATEGORIES=    net print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/netatalk-2-2-7/

Index: pkgsrc/net/netatalk22/distinfo
diff -u pkgsrc/net/netatalk22/distinfo:1.14 pkgsrc/net/netatalk22/distinfo:1.15
--- pkgsrc/net/netatalk22/distinfo:1.14 Tue Jan 10 22:07:33 2023
+++ pkgsrc/net/netatalk22/distinfo      Tue Feb  7 23:00:40 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2023/01/10 22:07:33 hauke Exp $
+$NetBSD: distinfo,v 1.15 2023/02/07 23:00:40 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
 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

Added files:

Index: pkgsrc/net/netatalk22/patches/patch-etc_afpd_volume.c
diff -u /dev/null pkgsrc/net/netatalk22/patches/patch-etc_afpd_volume.c:1.1
--- /dev/null   Tue Feb  7 23:00:40 2023
+++ pkgsrc/net/netatalk22/patches/patch-etc_afpd_volume.c       Tue Feb  7 23:00:40 2023
@@ -0,0 +1,46 @@
+$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);
+     }
+ }
+