head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.116 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.114 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.112 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.110 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.108 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.106 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.104 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.102 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.100 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.98 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.96 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.94 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.92 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.90 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.88 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.86 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.84 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.82 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.80 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.78 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.76 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.74 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.72 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.68 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.48 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.70 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.66 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.64 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.62 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.60 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.58 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.56 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.54 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.52 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.50 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.46 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.44 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.42 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.40 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.38 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.36 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.34 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.32 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.30 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.28 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.26 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.24 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.22 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.20 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.18 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.16 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.14 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.12 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.10 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.8 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.6 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.4 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.2 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.1.0.6 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.4 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.2 pkgsrc-2011Q1-base:1.1; locks; strict; comment @# @; 1.6 date 2011.11.22.15.07.04; author is; state Exp; branches; next 1.5; 1.5 date 2011.11.22.09.44.18; author is; state Exp; branches; next 1.4; 1.4 date 2011.11.22.09.04.49; author is; state Exp; branches; next 1.3; 1.3 date 2011.11.15.13.04.46; author is; state Exp; branches; next 1.2; 1.2 date 2011.11.15.00.11.07; author dholland; state Exp; branches; next 1.1; 1.1 date 2011.01.18.12.28.25; author is; state Exp; branches 1.1.6.1; next ; 1.1.6.1 date 2011.12.08.04.01.09; author sbd; state Exp; branches; next ; desc @@ 1.6 log @Put comments back into the patch file. @ text @$NetBSD: patch-ak,v 1.5 2011/11/22 09:44:18 is Exp $ - use standard includes - 64-bit time_t fixes - remove union wait - replace mktemp() by mkstemp() --- src/in.fingerd.c.orig 1999-03-29 06:05:30.000000000 +0000 +++ src/in.fingerd.c @@@@ -33,9 +33,7 @@@@ static char *rcsid = "$Id: in.fingerd.c, #include #include #include -#ifndef X_OK #include -#endif #include #include #include @@@@ -811,7 +809,7 @@@@ finger_users (user, options, stream) /* don't print trailing \n from ctime() */ fprintf(stream, " seen at %s on %.24s", strip_hostname (upackets[i]->host), - ctime (&upackets[i]->idle_time)); + ctime32 (&upackets[i]->idle_time)); if (*(upackets[i]->ttyloc)) fprintf(stream, " from %s", @@@@ -897,7 +895,6 @@@@ finger_clients (user, options, stream) else { status = ""; - idle_time = ""; } @@@@ -1271,7 +1268,7 @@@@ show_unlogged_packet (packet, stream) /* In SunOS4 getpwnam() seems to call ctime(), so we move this call down * here to be sure the intended result doesn't get overwritten. */ - char *the_time = ctime(&packet->idle_time); + char *the_time = ctime32(&packet->idle_time); the_time[strlen(the_time) - 1] = '\0'; /* delete newline */ if (*(packet->real_name)) @@@@ -1415,14 +1412,7 @@@@ run_target_script(script, target, cd, in char *arg; { int pid; -#ifdef SYSV int status; -#else -#ifndef WEXITSTATUS -# define WEXITSTATUS(w) ((w).w_retcode) -#endif - union wait status; -#endif if (access (script, X_OK) >= 0) { @@@@ -1537,6 +1527,7 @@@@ maybe_user_script (entry, stream, packet FILE *long_output; int result; extern char *mktemp(); + int temp_fd; #ifndef FINGERRC return (0); @@@@ -1580,8 +1571,9 @@@@ maybe_user_script (entry, stream, packet /* Collect regular long finger output in file */ strcpy (temp_file, TEMPFILE); - if (!mktemp (temp_file) || - !(long_output = fopen (temp_file, "w+"))) + temp_fd = mkstemp (temp_file); + if (temp_fd < 0 || + !(long_output = fdopen (temp_fd, "w+"))) { file_error (WARNING, temp_file); free (user_script); @ 1.5 log @icsi-finger 1.0.28 (+ our old patches). @ text @d1 6 a6 1 $NetBSD$ @ 1.4 log @Remove a data-dependent case of segmentation fault in in.fingerd. @ text @d3 1 a3 1 --- src/in.fingerd.c.orig 1996-01-10 19:26:24.000000000 +0000 d15 3 a17 3 @@@@ -805,12 +803,12 @@@@ finger_users (user, options, stream) fprintf (stream, "%s (%s) seen at %s on %s", upackets[i]->real_name, upackets[i]->name, d21 4 a24 10 else fprintf (stream, "%s seen at %s on %s", upackets[i]->name, strip_hostname (upackets[i]->host), - ctime (&upackets[i]->idle_time)); + ctime32 (&upackets[i]->idle_time)); } else { @@@@ -888,7 +886,6 @@@@ finger_clients (user, options, stream) d32 1 a32 1 @@@@ -1262,7 +1259,7 @@@@ show_unlogged_packet (packet, stream) d41 1 a41 1 @@@@ -1406,14 +1403,7 @@@@ run_target_script(script, target, cd, in d56 1 a56 1 @@@@ -1528,6 +1518,7 @@@@ maybe_user_script (entry, stream, packet d64 1 a64 1 @@@@ -1571,8 +1562,9 @@@@ maybe_user_script (entry, stream, packet @ 1.3 log @replace mktemp() by mkstemp(), updating net/icsi-finger to 1.0.27nb6 @ text @a2 5 - use standard includes - 64-bit time_t fixes - remove union wait - replace mktemp() by mkstemp() d30 9 a38 1 @@@@ -1262,7 +1260,7 @@@@ show_unlogged_packet (packet, stream) d47 1 a47 1 @@@@ -1406,14 +1404,7 @@@@ run_target_script(script, target, cd, in d62 1 a62 1 @@@@ -1528,6 +1519,7 @@@@ maybe_user_script (entry, stream, packet d70 1 a70 1 @@@@ -1571,8 +1563,9 @@@@ maybe_user_script (entry, stream, packet @ 1.2 log @Use stdlib.h instead of private decls of malloc; remove union wait. Should fix build with newer gcc and maybe also clang. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2011/01/18 12:28:25 is Exp $ d6 1 d59 20 @ 1.1 log @Fix for 64bit time_t: - make the packet contain explicit 32bit data for compatibility with clients on machines with 32bit time_t. - replace ctime() calls on such changed former time_t values by a shim that does the translation. This does not start to work after 2038 yet - that would need a change of the collection protocol. @ text @d1 5 a5 1 $NetBSD$ d9 11 a19 1 @@@@ -805,12 +805,12 @@@@ finger_users (user, options, stream) d34 1 a34 1 @@@@ -1262,7 +1262,7 @@@@ show_unlogged_packet (packet, stream) d43 15 @ 1.1.6.1 log @Pullup ticket #3616 - requested by is net/icsi-finger security update Revisions pulled up: - doc/CHANGES-2011 1.2900 - net/icsi-finger/Makefile 1.17-1.19 - net/icsi-finger/distinfo 1.10-1.13 - net/icsi-finger/patches/patch-ak 1.2-1.4 - net/icsi-finger/patches/patch-al 1.2 - net/icsi-finger/patches/patch-an 1.1 - net/icsi-finger/patches/patch-lib_util_c 1.1 --- Module Name: pkgsrc Committed By: is Date: Thu Nov 10 09:42:22 UTC 2011 Modified Files: pkgsrc/net/icsi-finger: distinfo Added Files: pkgsrc/net/icsi-finger/patches: patch-an Log Message: Missed part of the fix for 64bit time_t from 2011/01/18 12:28:25. The maintainance program packet2ascii (actually, the ascii2packet part) needed to be fixed, too. --- Module Name: pkgsrc Committed By: is Date: Thu Nov 10 09:59:53 UTC 2011 Modified Files: pkgsrc/net/icsi-finger: Makefile Log Message: Missed part of the fix for 64bit time_t from 2011/01/18 12:28:25. The maintainance program packet2ascii (actually, the ascii2packet part) needed to be fixed, too. --- Module Name: pkgsrc Committed By: dholland Date: Tue Nov 15 00:11:07 UTC 2011 Modified Files: pkgsrc/net/icsi-finger: distinfo pkgsrc/net/icsi-finger/patches: patch-ak patch-al Added Files: pkgsrc/net/icsi-finger/patches: patch-lib_util_c Log Message: Use stdlib.h instead of private decls of malloc; remove union wait. Should fix build with newer gcc and maybe also clang. --- Module Name: pkgsrc Committed By: is Date: Tue Nov 15 13:04:47 UTC 2011 Modified Files: pkgsrc/doc: CHANGES-2011 pkgsrc/net/icsi-finger: Makefile distinfo pkgsrc/net/icsi-finger/patches: patch-ak Log Message: replace mktemp() by mkstemp(), updating net/icsi-finger to 1.0.27nb6 --- Module Name: pkgsrc Committed By: is Date: Tue Nov 22 09:04:49 UTC 2011 Modified Files: pkgsrc/net/icsi-finger: Makefile distinfo pkgsrc/net/icsi-finger/patches: patch-ak Log Message: Remove a data-dependent case of segmentation fault in in.fingerd. @ text @d5 1 a5 11 @@@@ -33,9 +33,7 @@@@ static char *rcsid = "$Id: in.fingerd.c, #include #include #include -#ifndef X_OK #include -#endif #include #include #include @@@@ -805,12 +803,12 @@@@ finger_users (user, options, stream) d20 1 a20 9 @@@@ -888,7 +886,6 @@@@ finger_clients (user, options, stream) else { status = ""; - idle_time = ""; } @@@@ -1262,7 +1259,7 @@@@ show_unlogged_packet (packet, stream) a28 35 @@@@ -1406,14 +1403,7 @@@@ run_target_script(script, target, cd, in char *arg; { int pid; -#ifdef SYSV int status; -#else -#ifndef WEXITSTATUS -# define WEXITSTATUS(w) ((w).w_retcode) -#endif - union wait status; -#endif if (access (script, X_OK) >= 0) { @@@@ -1528,6 +1518,7 @@@@ maybe_user_script (entry, stream, packet FILE *long_output; int result; extern char *mktemp(); + int temp_fd; #ifndef FINGERRC return (0); @@@@ -1571,8 +1562,9 @@@@ maybe_user_script (entry, stream, packet /* Collect regular long finger output in file */ strcpy (temp_file, TEMPFILE); - if (!mktemp (temp_file) || - !(long_output = fopen (temp_file, "w+"))) + temp_fd = mkstemp (temp_file); + if (temp_fd < 0 || + !(long_output = fdopen (temp_fd, "w+"))) { file_error (WARNING, temp_file); free (user_script); @