ports/143238: [PATCH] sysutils/idled utmp.h --> utmpx.h
Rob Farmer
rfarmer at predatorlabs.net
Tue Jan 26 02:20:06 UTC 2010
>Number: 143238
>Category: ports
>Synopsis: [PATCH] sysutils/idled utmp.h --> utmpx.h
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 26 02:20:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Rob Farmer
>Release: 9.0-CURRENT
>Organization:
>Environment:
FreeBSD pentium4.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r202659: Tue Jan 19 16:02:39 PST 2010 rfarmer at pentium4.predatorlabs.net:/obj/usr/src/sys/PENTIUM4 i386
>Description:
Convert from utmp.h to utmpx.h
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN idled.old/Makefile idled/Makefile
--- idled.old/Makefile 2009-07-14 22:09:45.000000000 -0700
+++ idled/Makefile 2010-01-25 16:18:37.000000000 -0800
@@ -23,10 +23,20 @@
PLIST_FILES= etc/idled.cf.template libexec/idled
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900006
+EXTRA_PATCHES= ${PATCHDIR}/utmpx-Makefile \
+ ${PATCHDIR}/utmpx-idled.h \
+ ${PATCHDIR}/utmpx-idled.c
+.else
+EXTRA_PATCHES= ${PATCHDIR}/utmp-Makefile
+.endif
+
post-extract:
(cd ${WRKSRC}; make clean)
post-install:
@${STRIP_CMD} ${PREFIX}/libexec/idled
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN idled.old/files/patch-Makefile idled/files/patch-Makefile
--- idled.old/files/patch-Makefile 2009-07-14 22:09:46.000000000 -0700
+++ idled/files/patch-Makefile 1969-12-31 16:00:00.000000000 -0800
@@ -1,104 +0,0 @@
---- ./Makefile.orig 1996-05-16 18:05:28.000000000 -0400
-+++ ./Makefile 2009-07-15 01:05:40.560278401 -0400
-@@ -2,8 +2,8 @@
- #
-
- # C compiler flags
--CC = cc
--RM = rm
-+CC ?= cc
-+RM ?= rm
- INCLUDE =
-
- ######################################################################
-@@ -166,26 +166,26 @@
- # You will need to delete parse.c before compiling! You can either
- # do so by hand, or do a 'make clean' followed by the normal 'make'.
- #DEFS += -O -m486
--#DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
-+DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
- #DEFS += -DPROC_SEARCH_1
- #SPECLIBS = -lkvm
--#INSTTYPE = install1a
-+INSTTYPE = install1a
- #
--#DEST = /usr/local/libexec
--#CFDEST = /usr/local/libexec
--#MDEST = /usr/local/man
--#LOGDEST = /var/log
-+DEST = ${PREFIX}/libexec
-+CFDEST = ${PREFIX}/etc
-+MDEST = ${PREFIX}/man
-+LOGDEST = /var/log
- #
--#OWNER = root
--#CFOWNER = root
--#MOWNER = man
-+OWNER = root
-+CFOWNER = root
-+MOWNER = man
- #
--#GROUP = daemon
--#CFGROUP = daemon
-+GROUP = daemon
-+CFGROUP = daemon
- #
--#MODE = 750
--#CFMODE = 664
--#MMODE = 444
-+MODE = 750
-+CFMODE = 644
-+MMODE = 444
-
- ######################################################################
- ######################################################################
-@@ -215,25 +215,25 @@
- # SVR4 -- Solaris 2.x
- # Use install3 for /usr/sbin/install
- # and install1 for /usr/ucb/install
--DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
--SPECLIBS =
--INSTTYPE = install3
-+#DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
-+#SPECLIBS =
-+#INSTTYPE = install3
-
--DEST = /usr/local/bin
--CFDEST = /usr/local/lib
--MDEST = /usr/local/man
--LOGDEST = /var/log
-+#DEST = /usr/local/bin
-+#CFDEST = /usr/local/lib
-+#MDEST = /usr/local/man
-+#LOGDEST = /var/log
-
--OWNER = root
--CFOWNER = root
--MOWNER = root
-+#OWNER = root
-+#CFOWNER = root
-+#MOWNER = root
-
--GROUP = root
--CFGROUP = root
-+#GROUP = root
-+#CFGROUP = root
-
--MODE = 750
--CFMODE = 664
--MMODE = 644
-+#MODE = 750
-+#CFMODE = 664
-+#MMODE = 644
-
- ######################################################################
- ######################################################################
-@@ -428,7 +428,7 @@
- # HERE are the big CFLAGS
- # Add -g if you want debugging
- # Add -O or whatever variant for optimization
--CFLAGS = ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
-+CFLAGS+= ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
-
- # For HP's ANSI C compiler (use -g instead of +O3 for debugging)
- # CFLAGS = +O3 -Aa -D_HPUX_SOURCE ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
diff -ruN idled.old/files/utmp-Makefile idled/files/utmp-Makefile
--- idled.old/files/utmp-Makefile 1969-12-31 16:00:00.000000000 -0800
+++ idled/files/utmp-Makefile 2010-01-23 14:32:16.000000000 -0800
@@ -0,0 +1,104 @@
+--- ./Makefile.orig 1996-05-16 18:05:28.000000000 -0400
++++ ./Makefile 2009-07-15 01:05:40.560278401 -0400
+@@ -2,8 +2,8 @@
+ #
+
+ # C compiler flags
+-CC = cc
+-RM = rm
++CC ?= cc
++RM ?= rm
+ INCLUDE =
+
+ ######################################################################
+@@ -166,26 +166,26 @@
+ # You will need to delete parse.c before compiling! You can either
+ # do so by hand, or do a 'make clean' followed by the normal 'make'.
+ #DEFS += -O -m486
+-#DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
++DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
+ #DEFS += -DPROC_SEARCH_1
+ #SPECLIBS = -lkvm
+-#INSTTYPE = install1a
++INSTTYPE = install1a
+ #
+-#DEST = /usr/local/libexec
+-#CFDEST = /usr/local/libexec
+-#MDEST = /usr/local/man
+-#LOGDEST = /var/log
++DEST = ${PREFIX}/libexec
++CFDEST = ${PREFIX}/etc
++MDEST = ${PREFIX}/man
++LOGDEST = /var/log
+ #
+-#OWNER = root
+-#CFOWNER = root
+-#MOWNER = man
++OWNER = root
++CFOWNER = root
++MOWNER = man
+ #
+-#GROUP = daemon
+-#CFGROUP = daemon
++GROUP = daemon
++CFGROUP = daemon
+ #
+-#MODE = 750
+-#CFMODE = 664
+-#MMODE = 444
++MODE = 750
++CFMODE = 644
++MMODE = 444
+
+ ######################################################################
+ ######################################################################
+@@ -215,25 +215,25 @@
+ # SVR4 -- Solaris 2.x
+ # Use install3 for /usr/sbin/install
+ # and install1 for /usr/ucb/install
+-DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
+-SPECLIBS =
+-INSTTYPE = install3
++#DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
++#SPECLIBS =
++#INSTTYPE = install3
+
+-DEST = /usr/local/bin
+-CFDEST = /usr/local/lib
+-MDEST = /usr/local/man
+-LOGDEST = /var/log
++#DEST = /usr/local/bin
++#CFDEST = /usr/local/lib
++#MDEST = /usr/local/man
++#LOGDEST = /var/log
+
+-OWNER = root
+-CFOWNER = root
+-MOWNER = root
++#OWNER = root
++#CFOWNER = root
++#MOWNER = root
+
+-GROUP = root
+-CFGROUP = root
++#GROUP = root
++#CFGROUP = root
+
+-MODE = 750
+-CFMODE = 664
+-MMODE = 644
++#MODE = 750
++#CFMODE = 664
++#MMODE = 644
+
+ ######################################################################
+ ######################################################################
+@@ -428,7 +428,7 @@
+ # HERE are the big CFLAGS
+ # Add -g if you want debugging
+ # Add -O or whatever variant for optimization
+-CFLAGS = ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
++CFLAGS+= ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
+
+ # For HP's ANSI C compiler (use -g instead of +O3 for debugging)
+ # CFLAGS = +O3 -Aa -D_HPUX_SOURCE ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
diff -ruN idled.old/files/utmpx-Makefile idled/files/utmpx-Makefile
--- idled.old/files/utmpx-Makefile 1969-12-31 16:00:00.000000000 -0800
+++ idled/files/utmpx-Makefile 2010-01-25 16:11:46.000000000 -0800
@@ -0,0 +1,105 @@
+--- Makefile.orig 1996-05-16 15:05:28.000000000 -0700
++++ Makefile 2010-01-25 16:08:20.000000000 -0800
+@@ -2,8 +2,8 @@
+ #
+
+ # C compiler flags
+-CC = cc
+-RM = rm
++CC ?= cc
++RM ?= rm
+ INCLUDE =
+
+ ######################################################################
+@@ -166,26 +166,26 @@
+ # You will need to delete parse.c before compiling! You can either
+ # do so by hand, or do a 'make clean' followed by the normal 'make'.
+ #DEFS += -O -m486
+-#DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
++DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK -DHAVE_UTMPX -DSYSV
+ #DEFS += -DPROC_SEARCH_1
+ #SPECLIBS = -lkvm
+-#INSTTYPE = install1a
++INSTTYPE = install1a
+ #
+-#DEST = /usr/local/libexec
+-#CFDEST = /usr/local/libexec
+-#MDEST = /usr/local/man
+-#LOGDEST = /var/log
++DEST = ${PREFIX}/libexec
++CFDEST = ${PREFIX}/etc
++MDEST = ${PREFIX}/man
++LOGDEST = /var/log
+ #
+-#OWNER = root
+-#CFOWNER = root
+-#MOWNER = man
++OWNER = root
++CFOWNER = root
++MOWNER = man
+ #
+-#GROUP = daemon
+-#CFGROUP = daemon
++GROUP = daemon
++CFGROUP = daemon
+ #
+-#MODE = 750
+-#CFMODE = 664
+-#MMODE = 444
++MODE = 750
++CFMODE = 644
++MMODE = 444
+
+ ######################################################################
+ ######################################################################
+@@ -215,25 +215,25 @@
+ # SVR4 -- Solaris 2.x
+ # Use install3 for /usr/sbin/install
+ # and install1 for /usr/ucb/install
+-DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
+-SPECLIBS =
+-INSTTYPE = install3
+-
+-DEST = /usr/local/bin
+-CFDEST = /usr/local/lib
+-MDEST = /usr/local/man
+-LOGDEST = /var/log
++#DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
++#SPECLIBS =
++#INSTTYPE = install3
+
+-OWNER = root
+-CFOWNER = root
+-MOWNER = root
++#DEST = /usr/local/bin
++#CFDEST = /usr/local/lib
++#MDEST = /usr/local/man
++#LOGDEST = /var/log
++
++#OWNER = root
++#CFOWNER = root
++#MOWNER = root
+
+-GROUP = root
+-CFGROUP = root
++#GROUP = root
++#CFGROUP = root
+
+-MODE = 750
+-CFMODE = 664
+-MMODE = 644
++#MODE = 750
++#CFMODE = 664
++#MMODE = 644
+
+ ######################################################################
+ ######################################################################
+@@ -428,7 +428,7 @@
+ # HERE are the big CFLAGS
+ # Add -g if you want debugging
+ # Add -O or whatever variant for optimization
+-CFLAGS = ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
++CFLAGS+= ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
+
+ # For HP's ANSI C compiler (use -g instead of +O3 for debugging)
+ # CFLAGS = +O3 -Aa -D_HPUX_SOURCE ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
diff -ruN idled.old/files/utmpx-idled.c idled/files/utmpx-idled.c
--- idled.old/files/utmpx-idled.c 1969-12-31 16:00:00.000000000 -0800
+++ idled/files/utmpx-idled.c 2010-01-25 16:12:17.000000000 -0800
@@ -0,0 +1,33 @@
+--- idled.c.orig 2010-01-25 16:06:48.000000000 -0800
++++ idled.c 2010-01-25 16:09:39.000000000 -0800
+@@ -335,7 +335,7 @@
+ if (strcmp(utmpbuf.ut_line,XDM_DEV) == 0)
+ {
+ /* This is the console. Is there a real name attached? */
+- if (strlen(utmpbuf.ut_name) > 0)
++ if (strlen(utmpbuf.ut_user) > 0)
+ isConsole = TRUE; /* Yes, use it */
+ else
+ strcpy(console_user,""); /* No, clear the console user */
+@@ -349,10 +349,10 @@
+ #endif /* SYSV */
+ {
+ user = &users[utmptr];
+- (void) strncpy (tmpname, utmpbuf.ut_name, NAMELEN);
++ (void) strncpy (tmpname, utmpbuf.ut_user, NAMELEN);
+ tmpname[NAMELEN] = 0;
+
+- if (!strcmp (user->uid, tmpname) && user->time_on == utmpbuf.ut_xtime)
++ if (!strcmp (user->uid, tmpname) && user->time_on == utmpbuf.ut_tv.tv_sec)
+ {
+ if (new)
+ setlimits (utmptr);
+@@ -402,7 +402,7 @@
+ logfile ("Error: could not get info on supposed user %s.",user->uid);
+ else
+ getgroups_func (pswd->pw_name, user->groups, pswd->pw_gid);
+- user->time_on = utmpbuf.ut_xtime;
++ user->time_on = utmpbuf.ut_tv.tv_sec;
+ setlimits (utmptr);
+ user->next = tempus;
+ chk_session_refuse(user);
diff -ruN idled.old/files/utmpx-idled.h idled/files/utmpx-idled.h
--- idled.old/files/utmpx-idled.h 1969-12-31 16:00:00.000000000 -0800
+++ idled/files/utmpx-idled.h 2010-01-25 16:12:08.000000000 -0800
@@ -0,0 +1,10 @@
+--- idled.h.orig 2010-01-25 16:07:42.000000000 -0800
++++ idled.h 2010-01-25 16:07:50.000000000 -0800
+@@ -1,7 +1,6 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/param.h>
+-#include <utmp.h>
+
+ #define qelem qelem_sys /* Work around to use our own qelem below */
+ #include <stdlib.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list