head 1.4; access; symbols pkgsrc-2021Q1:1.3.0.124 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.122 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.120 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.116 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.96 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.118 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.114 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.112 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.110 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.108 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.106 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.104 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.102 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.100 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.98 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.94 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.92 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.90 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.88 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.86 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.84 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.82 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.80 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.78 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.76 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.74 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.72 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.70 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.68 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.66 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.64 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.62 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.60 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.58 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.56 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.54 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.52 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.48 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.0.10 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.8 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.6 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.4 netbsd-1-6-RELEASE-base:1.1; locks; strict; comment @# @; 1.4 date 2021.04.13.15.15.46; author nia; state dead; branches; next 1.3; commitid 2AJ7UMqOvShZ09PC; 1.3 date 2006.05.09.19.24.24; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.09.08.14.30.00; author markd; state Exp; branches; next 1.1; 1.1 date 2002.08.19.09.17.16; author agc; state Exp; branches; next ; desc @@ 1.4 log @remove security/srp_client development appears stalled upstream and this does not support current openssl or SSP. @ text @$NetBSD: patch-aj,v 1.3 2006/05/09 19:24:24 joerg Exp $ --- base/libmisc/utmp.c.orig 1998-12-10 14:43:22.000000000 +1300 +++ base/libmisc/utmp.c @@@@ -37,6 +37,12 @@@@ #include #endif +#if HAVE_UTMPX_H && defined(__NetBSD__) +#undef HAVE_SETUTENT +#undef HAVE_GETUTENT +#undef HAVE_ENDUTENT +#endif + #include #include @@@@ -93,6 +99,10 @@@@ checkutmp (picky) #endif #endif +#ifdef LOGIN_PROCESS /* USG */ + ut = NULL; +#endif + #if HAVE_UTMPX_H setutxent (); #endif @@@@ -141,17 +151,21 @@@@ checkutmp (picky) if (utx) utxent = *utx; #endif +#if HAVE_GETUTENT while ((ut = getutent())) if (ut->ut_pid == pid) break; if (ut) utent = *ut; +#endif #if HAVE_UTMPX_H endutxent(); #endif +#if HAVE_ENDUTENT endutent(); +#endif if (!ut) { puts(NO_UTENT); @@@@ -188,6 +202,7 @@@@ checkutmp (picky) if (strncmp(line, "/dev/", 5) == 0) line += 5; +#if !defined(__NetBSD__) strncpy (utent.ut_line, line, sizeof utent.ut_line); if ((ut = getutline(&utent))) strncpy(utent.ut_id, ut->ut_id, sizeof ut->ut_id); @@@@ -206,6 +221,7 @@@@ checkutmp (picky) gettimeofday((struct timeval *) &utxent.ut_tv, NULL); utent.ut_time = utxent.ut_tv.tv_sec; #endif +#endif /* !NetBSD */ } #else /* !USG */ @@@@ -283,6 +299,7 @@@@ setutmp (name, line) break; } } +#if HAVE_GETUTENT while (utmp = getutent ()) { if (utmp->ut_pid == pid) { found_utmp = 1; @@@@ -357,6 +374,7 @@@@ setutmp (name, line) utxent = utxline; utent = utline; +#endif #else /* !SVR4 */ struct utmp utmp; @ 1.3 log @Fix errno. Force USE_TERMIO on DragonFly. Hide ut assignment in utmp.c (patch-aj), it doesn't exist at least in the code path DragonFly is taking. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.2 2004/09/08 14:30:00 markd Exp $ @ 1.2 log @varargs -> stdarg Don't try and use getutent() on NetBSD's that have utmpx Fixes problems seen in bulkbuild. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 2002/08/19 09:17:16 agc Exp $ d18 1 a18 1 @@@@ -93,6 +99,8 @@@@ checkutmp (picky) d22 1 d24 1 d29 1 a29 1 @@@@ -141,17 +149,21 @@@@ checkutmp (picky) d51 1 a51 1 @@@@ -188,6 +200,7 @@@@ checkutmp (picky) d59 1 a59 1 @@@@ -206,6 +219,7 @@@@ checkutmp (picky) d67 1 a67 1 @@@@ -283,6 +297,7 @@@@ setutmp (name, line) d75 1 a75 1 @@@@ -357,6 +372,7 @@@@ setutmp (name, line) @ 1.1 log @Add a patch to get this to compile on NetBSD. @ text @d1 1 a1 1 $NetBSD$ d3 16 a18 3 --- base/libmisc/utmp.c 2002/08/19 08:56:57 1.1 +++ base/libmisc/utmp.c 2002/08/19 09:02:40 @@@@ -93,6 +93,8 @@@@ d27 1 a27 1 @@@@ -141,17 +143,21 @@@@ d49 1 a49 1 @@@@ -188,6 +194,7 @@@@ d57 1 a57 1 @@@@ -206,6 +213,7 @@@@ d65 1 a65 1 @@@@ -283,6 +291,7 @@@@ d73 1 a73 1 @@@@ -357,6 +366,7 @@@@ @