CVS commit: pkgsrc/security/chkrootkit

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Oct 16 20:55:52 UTC 2023

Modified Files:
        pkgsrc/security/chkrootkit: Makefile distinfo
        pkgsrc/security/chkrootkit/patches: patch-aa patch-ab patch-ac patch-ad

Log Message:
chkrootkit: Fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/chkrootkit/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/chkrootkit/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/chkrootkit/patches/patch-aa \
    pkgsrc/security/chkrootkit/patches/patch-ac
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/chkrootkit/patches/patch-ab \
    pkgsrc/security/chkrootkit/patches/patch-ad

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

Modified files:

Index: pkgsrc/security/chkrootkit/Makefile
diff -u pkgsrc/security/chkrootkit/Makefile:1.25 pkgsrc/security/chkrootkit/Makefile:1.26
--- pkgsrc/security/chkrootkit/Makefile:1.25    Wed Jul  4 13:40:33 2018
+++ pkgsrc/security/chkrootkit/Makefile Mon Oct 16 20:55:52 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2023/10/16 20:55:52 triaxx Exp $
 #
 
 DISTNAME=              chkrootkit-0.50
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.pangeia.com.br/pub/seg/pac/
 
@@ -19,7 +19,7 @@ PROGRAMS=     chkdirs chklastlog chkproc chk
 DOCDIR=                ${PREFIX}/share/doc/chkrootkit
 
 SUBST_CLASSES+=                helper
-SUBST_STAGE.helper=    pre-configure
+SUBST_STAGE.helper=    pre-build
 SUBST_FILES.helper=    chkrootkit
 SUBST_SED.helper=      -e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"
 SUBST_SED.helper+=     -e "s|./chkproc|${PREFIX}/bin/chkproc|g"
@@ -30,6 +30,12 @@ SUBST_SED.helper+=   -e "s|./strings-stati
 SUBST_SED.helper+=     -e "s|./chkdirs|${PREFIX}/bin/chkdirs|g"
 SUBST_SED.helper+=     -e "s|/bin/sh|${SH}|g"
 
+SUBST_CLASSES+=                var
+SUBST_STAGE.var=       pre-build
+SUBST_MESSAGE.var=     Fixing hard-coded VARBASE.
+SUBST_FILES.var=       chklastlog.c
+SUBST_VARS.var=                VARBASE
+
 .include "../../mk/compiler.mk"
 
 PLIST_VARS+=   wtmpx
@@ -38,6 +44,8 @@ PROGRAMS+=    check_wtmpx
 PLIST.wtmpx=   yes
 CFLAGS+=       -DSOLARIS2
 LDFLAGS+=      -lsocket
+.elif ${OPSYS} == "Darwin"
+MAKE_ENV+=     STATIC=
 .else
 MAKE_ENV+=     STATIC="-static"
 .endif

Index: pkgsrc/security/chkrootkit/distinfo
diff -u pkgsrc/security/chkrootkit/distinfo:1.15 pkgsrc/security/chkrootkit/distinfo:1.16
--- pkgsrc/security/chkrootkit/distinfo:1.15    Tue Oct 26 11:17:01 2021
+++ pkgsrc/security/chkrootkit/distinfo Mon Oct 16 20:55:52 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 11:17:01 nia Exp $
+$NetBSD: distinfo,v 1.16 2023/10/16 20:55:52 triaxx Exp $
 
 BLAKE2s (chkrootkit-0.50.tar.gz) = 01c0819ecea8e2e8b8513048e548fe231342b622ae7165a9ce3be578cab0cab3
 SHA512 (chkrootkit-0.50.tar.gz) = 9f26fd34e85b58b13dedc5f38a889ae258bb2c0f1ff40e99c149e23f93890e956f94204b1bb2241584454e99168c53b583f52777083454237f3ba343424dba1c
 Size (chkrootkit-0.50.tar.gz) = 38616 bytes
-SHA1 (patch-aa) = e047b8f102125c8bf3452943b90a72164ce6b1e1
-SHA1 (patch-ab) = 248f8bdd9dae2a8f81574346da32971600d8f4e4
-SHA1 (patch-ac) = fb0561e916d8b61e19636e301554c221adf115da
-SHA1 (patch-ad) = a24ebbbc726856cc1f6594d0e4c68afac6b77fc1
+SHA1 (patch-aa) = 7c33ce6296d280d8c970c0846cc36033179a0832
+SHA1 (patch-ab) = 189f68673366c55112f83c44f9c8769211301ea6
+SHA1 (patch-ac) = 724fe1ed2134fd5af70eef84cbe120cbf3573f6e
+SHA1 (patch-ad) = b27a601493e150ce20078f70ba003e9aa4934f66

Index: pkgsrc/security/chkrootkit/patches/patch-aa
diff -u pkgsrc/security/chkrootkit/patches/patch-aa:1.4 pkgsrc/security/chkrootkit/patches/patch-aa:1.5
--- pkgsrc/security/chkrootkit/patches/patch-aa:1.4     Mon Dec  8 14:04:57 2014
+++ pkgsrc/security/chkrootkit/patches/patch-aa Mon Oct 16 20:55:52 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2014/12/08 14:04:57 mef Exp $
+$NetBSD: patch-aa,v 1.5 2023/10/16 20:55:52 triaxx Exp $
+
+Disable system independent variables.
 
 --- Makefile.orig      2014-05-06 18:56:43.000000000 +0900
 +++ Makefile   2014-12-08 22:30:07.000000000 +0900
Index: pkgsrc/security/chkrootkit/patches/patch-ac
diff -u pkgsrc/security/chkrootkit/patches/patch-ac:1.4 pkgsrc/security/chkrootkit/patches/patch-ac:1.5
--- pkgsrc/security/chkrootkit/patches/patch-ac:1.4     Mon Dec  8 14:04:57 2014
+++ pkgsrc/security/chkrootkit/patches/patch-ac Mon Oct 16 20:55:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2014/12/08 14:04:57 mef Exp $
+$NetBSD: patch-ac,v 1.5 2023/10/16 20:55:52 triaxx Exp $
 
 limits.h is ISO C, unconditionally include it. Keep conditional for
 sys/syslimits.h though.
@@ -6,7 +6,7 @@ sys/syslimits.h though.
 
 --- chkdirs.c.orig     2006-01-19 23:40:21.000000000 +0000
 +++ chkdirs.c
-@@ -25,9 +25,8 @@
+@@ -27,9 +27,8 @@
  
  */
  

Index: pkgsrc/security/chkrootkit/patches/patch-ab
diff -u pkgsrc/security/chkrootkit/patches/patch-ab:1.3 pkgsrc/security/chkrootkit/patches/patch-ab:1.4
--- pkgsrc/security/chkrootkit/patches/patch-ab:1.3     Wed Apr 29 15:55:47 2015
+++ pkgsrc/security/chkrootkit/patches/patch-ab Mon Oct 16 20:55:52 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2015/04/29 15:55:47 christos Exp $
+$NetBSD: patch-ab,v 1.4 2023/10/16 20:55:52 triaxx Exp $
 
 Add NetBSD Path, and include stdlib.h for everyone (malloc)
 
---- chklastlog.c.orig  2014-05-06 06:12:14.000000000 -0400
-+++ chklastlog.c       2015-04-29 10:23:02.000000000 -0400
+--- chklastlog.c.orig  2014-05-06 10:12:14.000000000 +0000
++++ chklastlog.c
 @@ -37,9 +37,7 @@
  int main () { return 0; }
  #else
@@ -14,14 +14,33 @@ Add NetBSD Path, and include stdlib.h fo
  #include <sys/stat.h>
  #include <unistd.h>
  #include <string.h>
-@@ -59,6 +57,10 @@
- #define WTMP_FILENAME "/var/log/wtmp"
- #define LASTLOG_FILENAME "/var/log/lastlog"
+@@ -56,19 +54,23 @@ int main () { return 0; }
  #endif
-+#ifdef __NetBSD__
-+#define WTMP_FILENAME "/var/log/wtmp"
-+#define LASTLOG_FILENAME "/var/log/lastlog"
+ 
+ #ifdef __FreeBSD__ 
+-#define WTMP_FILENAME "/var/log/wtmp"
+-#define LASTLOG_FILENAME "/var/log/lastlog"
++#define WTMP_FILENAME "@VARBASE@/log/wtmp"
++#define LASTLOG_FILENAME "@VARBASE@/log/lastlog"
 +#endif
++#ifdef __NetBSD__
++#define WTMP_FILENAME "@VARBASE@/log/wtmp"
++#define LASTLOG_FILENAME "@VARBASE@/log/lastlog"
+ #endif
  #ifdef __OpenBSD__
  #include <stdlib.h> 
- #define WTMP_FILENAME "/var/log/wtmp"
+-#define WTMP_FILENAME "/var/log/wtmp"
+-#define LASTLOG_FILENAME "/var/log/lastlog"
++#define WTMP_FILENAME "@VARBASE@/log/wtmp"
++#define LASTLOG_FILENAME "@VARBASE@/log/lastlog"
+ #endif
+ #ifndef WTMP_FILENAME
+-#define WTMP_FILENAME "/var/adm/wtmp"
++#define WTMP_FILENAME "@VARBASE@/adm/wtmp"
+ #endif
+ #ifndef LASTLOG_FILENAME
+-#define LASTLOG_FILENAME "/var/adm/lastlog"
++#define LASTLOG_FILENAME "@VARBASE@/adm/lastlog"
+ #endif
+ 
+ #define TRUE 1L
Index: pkgsrc/security/chkrootkit/patches/patch-ad
diff -u pkgsrc/security/chkrootkit/patches/patch-ad:1.3 pkgsrc/security/chkrootkit/patches/patch-ad:1.4
--- pkgsrc/security/chkrootkit/patches/patch-ad:1.3     Wed Apr 29 15:55:47 2015
+++ pkgsrc/security/chkrootkit/patches/patch-ad Mon Oct 16 20:55:52 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.3 2015/04/29 15:55:47 christos Exp $
+$NetBSD: patch-ad,v 1.4 2023/10/16 20:55:52 triaxx Exp $
 
 - Add NetBSD to the list of OS's
 - Handle a false positive for NetBSD's netstat
 
 --- chkrootkit.orig    2009-07-30 14:10:54.000000000 +0000
 +++ chkrootkit
-@@ -509,7 +509,7 @@ ${ROOTDIR}/usr/include/syslogs.h ${ROOTD
+@@ -512,7 +512,7 @@ ${ROOTDIR}/usr/include/syslogs.h ${ROOTD
  
  
         ### OpenBSD rootkit v1
@@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.3 2015/04/29 15:55
            then
            expertmode_output "${find} ${ROOTDIR}usr/lib/security"
         fi
-@@ -931,7 +931,7 @@ ${find} ${ROOTDIR}usr/sbin -name in.slog
+@@ -937,7 +937,7 @@ ${find} ${ROOTDIR}usr/sbin -name in.slog
     fi
  
     ### OpenBSD rootkit v1