CVS commit: pkgsrc/archivers/arj

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 21 16:15:46 UTC 2025

Modified Files:
        pkgsrc/archivers/arj: distinfo
        pkgsrc/archivers/arj/patches: patch-environ.c

Log Message:
arj: remove Interix support


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/archivers/arj/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/arj/patches/patch-environ.c

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

Modified files:

Index: pkgsrc/archivers/arj/distinfo
diff -u pkgsrc/archivers/arj/distinfo:1.26 pkgsrc/archivers/arj/distinfo:1.27
--- pkgsrc/archivers/arj/distinfo:1.26  Sat Jan  8 14:43:09 2022
+++ pkgsrc/archivers/arj/distinfo       Mon Apr 21 16:15:46 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2022/01/08 14:43:09 tnn Exp $
+$NetBSD: distinfo,v 1.27 2025/04/21 16:15:46 wiz Exp $
 
 BLAKE2s (arj-3.10.22.tar.gz) = 3693d1767527e7f1cdc813d838728389c4ec6fb7910ed272eb1aa1d9645f77eb
 SHA512 (arj-3.10.22.tar.gz) = 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
@@ -12,7 +12,7 @@ SHA1 (patch-arjdisp.c) = d843d4dd1006ea3
 SHA1 (patch-arjsfx.c) = c9e2314d0933cdc12f8e01ca16bc9222ac4e10b9
 SHA1 (patch-arjtypes.c) = 3f4f83472fa70c55908fe6d89fa0a3d009e68e8a
 SHA1 (patch-decode.c) = d6a2a4f60cb326aabb6bd25973d0aa7901c8595f
-SHA1 (patch-environ.c) = e306005a88825b2bfd5b3bb35b18710d26a4c885
+SHA1 (patch-environ.c) = 7925d9864cb326cc3847d23775521ea2a06654f3
 SHA1 (patch-exe__sear.c) = 6d8db5a2cdb8f2452b96cf4d09687ae9d45d3e17
 SHA1 (patch-fardata.c) = b76ac5a168b9a8e288a610dce093280d31520af6
 SHA1 (patch-gnu_config.h.in) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a

Index: pkgsrc/archivers/arj/patches/patch-environ.c
diff -u pkgsrc/archivers/arj/patches/patch-environ.c:1.2 pkgsrc/archivers/arj/patches/patch-environ.c:1.3
--- pkgsrc/archivers/arj/patches/patch-environ.c:1.2    Sun Apr 12 15:54:02 2015
+++ pkgsrc/archivers/arj/patches/patch-environ.c        Mon Apr 21 16:15:46 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-environ.c,v 1.2 2015/04/12 15:54:02 tnn Exp $
+$NetBSD: patch-environ.c,v 1.3 2025/04/21 16:15:46 wiz Exp $
 
 Add support for various OSes.
 Fix CVE-2015-0557. Via Debian security-traversal-dir.patch.
@@ -13,8 +13,7 @@ Fix CVE-2015-0557. Via Debian security-t
 + #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__OpenBSD__)
    #include <sys/param.h>
    #include <sys/mount.h>
-- #elif defined(__QNXNTO__)
-+ #elif defined(__QNXNTO__)||defined(__INTERIX)
+  #elif defined(__QNXNTO__)
    #include <sys/statvfs.h>
   #else
    #include <sys/statfs.h>
@@ -40,7 +39,7 @@ Fix CVE-2015-0557. Via Debian security-t
     return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu);
   #elif TARGET==UNIX
 -  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)
-+  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX)||(defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
++  #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||(defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
     struct statvfs vfs;
  
     if(statvfs(name, &vfs)==-1)
@@ -62,13 +61,3 @@ Fix CVE-2015-0557. Via Debian security-t
   #else
    dest[0]='\0';
   #endif
-@@ -3802,7 +3805,9 @@ int reset_drive(char *name)
-  #elif TARGET==WIN32
-   return(0);
-  #elif TARGET==UNIX
-+  #ifndef __INTERIX
-   sync();
-+  #endif
-   return(0);
-  #endif
- }