From root@mail.vx.sk  Thu Feb  8 11:04:22 2007
Return-Path: <root@mail.vx.sk>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 62E0116A40B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Feb 2007 11:04:09 +0000 (UTC)
	(envelope-from root@mail.vx.sk)
Received: from mail.vx.sk (neo.vx.sk [88.198.35.14])
	by mx1.freebsd.org (Postfix) with ESMTP id DB09013C478
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Feb 2007 11:04:08 +0000 (UTC)
	(envelope-from root@mail.vx.sk)
Received: from localhost (localhost [127.0.0.1])
	by mail.vx.sk (Postfix) with ESMTP id 155DE3F4FB
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Feb 2007 11:44:11 +0100 (CET)
Received: from mail.vx.sk ([127.0.0.1])
	by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id XxTxqpUFY52g for <FreeBSD-gnats-submit@freebsd.org>;
	Thu,  8 Feb 2007 11:44:06 +0100 (CET)
Received: by mail.vx.sk (Postfix, from userid 0)
	id 988B73F4F2; Thu,  8 Feb 2007 11:44:06 +0100 (CET)
Message-Id: <20070208104406.988B73F4F2@mail.vx.sk>
Date: Thu,  8 Feb 2007 11:44:06 +0100 (CET)
From: Martin Matuska <martin@matuska.org>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] sysutils/libutempter 1.1.1 -> 1.1.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         108927
>Category:       ports
>Synopsis:       [UPDATE] sysutils/libutempter 1.1.1 -> 1.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 08 11:10:17 GMT 2007
>Closed-Date:    Thu Feb 08 22:27:28 GMT 2007
>Last-Modified:  Thu Feb  8 22:43:24 GMT 2007
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Update of sysutils/libutempter from 1.1.1 to 1.1.4

Removed files:
files/patch-iface.c (Reason: already included in source)
files/patch-utempter.c (Reason: already included in source)

Tested with portlint & tinderbox.

>How-To-Repeat:
>Fix:
diff -Nbur sysutils/libutempter.orig/Makefile sysutils/libutempter/Makefile
--- sysutils/libutempter.orig/Makefile	Wed Jan 31 10:26:22 2007
+++ sysutils/libutempter/Makefile	Thu Feb  8 11:21:00 2007
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/sysutils/libutempter/Makefile,v 1.3 2007/01/30 04:23:58 kris Exp $
 
 PORTNAME=	libutempter
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.altlinux.org/pub/people/ldv/utempter/
 
diff -Nbur sysutils/libutempter.orig/distinfo sysutils/libutempter/distinfo
--- sysutils/libutempter.orig/distinfo	Fri Nov 25 19:14:41 2005
+++ sysutils/libutempter/distinfo	Thu Feb  8 11:21:00 2007
@@ -1,3 +1,3 @@
-MD5 (libutempter-1.1.1.tar.bz2) = 0d472416e0234ece562c38a037fbaba0
-SHA256 (libutempter-1.1.1.tar.bz2) = 04a2f69f0d1302e4b55a1d83ed7ff878a787ed9565a3bcd924418224b7a17a1f
-SIZE (libutempter-1.1.1.tar.bz2) = 13668
+MD5 (libutempter-1.1.4.tar.bz2) = b60ade66538e807ca28ca68a7a8dd3b9
+SHA256 (libutempter-1.1.4.tar.bz2) = ca09ab18a8d29a5f0af1ce04e19924839f108f0cadbba90dd3e3a33c4dbf092c
+SIZE (libutempter-1.1.4.tar.bz2) = 14583
diff -Nbur sysutils/libutempter.orig/files/patch-Makefile sysutils/libutempter/files/patch-Makefile
--- sysutils/libutempter.orig/files/patch-Makefile	Mon Aug 30 00:54:38 2004
+++ sysutils/libutempter/files/patch-Makefile	Thu Feb  8 11:21:00 2007
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Dec 24 12:25:11 2002
-+++ Makefile	Wed Aug 18 15:54:06 2004
-@@ -30,12 +30,12 @@
+--- Makefile.orig	Sun Dec 11 13:13:49 2005
++++ Makefile	Thu Feb  8 10:13:03 2007
+@@ -31,10 +31,10 @@
  TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB)
  
  INSTALL = install
@@ -13,12 +13,18 @@
 +includedir = /include
 +DESTDIR = $(PREFIX)
  
--CFLAGS = $(RPM_OPT_FLAGS) -DLIBEXECDIR=\"$(libexecdir)\"
+ WARNINGS = -W -Wall -Waggregate-return -Wcast-align -Wconversion \
+ 	-Wdisabled-optimization -Wmissing-declarations \
+@@ -42,7 +42,7 @@
+ 	-Wmissing-prototypes -Wpointer-arith -Wredundant-decls \
+ 	-Wshadow -Wstrict-prototypes -Wwrite-strings
+ CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\"
+-CFLAGS = $(RPM_OPT_FLAGS)
 +CFLAGS+= -DLIBEXECDIR=\"$(PREFIX)$(libexecdir)\"
+ LDLIBS =
  
  all: $(TARGETS)
- 
-@@ -51,13 +51,21 @@
+@@ -64,15 +64,20 @@
  
  iface.o: iface.c utempter.h
  
@@ -27,14 +33,13 @@
 +$(PROJECT): $(PROJECT).o
 +	$(LINK.o) $(PROJECT).o -o $(PROJECT) -lutil
 +
-+
  install:
--	$(INSTALL) -pD -m2711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/$(PROJECT)
--	$(INSTALL) -pD -m644 $(PROJECT).h $(DESTDIR)$(includedir)/$(PROJECT).h
--	$(INSTALL) -pD -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
--	$(INSTALL) -pD -m644 $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
-+	mkdir -p $(DESTDIR)$(libexecdir)/$(PROJECT) $(DESTDIR)$(includedir) \
-+		$(DESTDIR)$(libdir)
+ 	mkdir -p $(DESTDIR)$(libexecdir)/$(PROJECT) $(DESTDIR)$(includedir) \
+ 		$(DESTDIR)$(libdir)
+-	$(INSTALL) -p -m2711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/
+-	$(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/
+-	$(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
+-	$(INSTALL) -p -m644 $(STATICLIB) $(DESTDIR)$(libdir)/
 +	$(INSTALL) -m4711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/$(PROJECT)
 +	$(INSTALL) -m644 $(PROJECT).h $(DESTDIR)$(includedir)/$(PROJECT).h
 +	$(INSTALL) -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION)
diff -Nbur sysutils/libutempter.orig/files/patch-iface.c sysutils/libutempter/files/patch-iface.c
--- sysutils/libutempter.orig/files/patch-iface.c	Mon Aug 30 00:54:38 2004
+++ sysutils/libutempter/files/patch-iface.c	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
---- iface.c.orig	Wed Aug 18 16:09:25 2004
-+++ iface.c	Wed Aug 18 16:11:38 2004
-@@ -32,6 +32,15 @@
- #include <sys/wait.h>
- #include <sys/types.h>
- 
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression)                           \
-+         (__extension__                                          \
-+          ({ long int __result;                                  \
-+                 do __result = (long int) (expression);          \
-+                 while (__result == -1L && errno == EINTR);      \
-+                 __result; }))
-+#endif
-+
- extern int getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid);
- 
- #include "utempter.h"
diff -Nbur sysutils/libutempter.orig/files/patch-utempter.c sysutils/libutempter/files/patch-utempter.c
--- sysutils/libutempter.orig/files/patch-utempter.c	Mon Aug 30 00:54:38 2004
+++ sysutils/libutempter/files/patch-utempter.c	Thu Jan  1 01:00:00 1970
@@ -1,76 +0,0 @@
---- utempter.c.orig	Wed Aug 18 15:04:15 2004
-+++ utempter.c	Wed Aug 18 15:16:18 2004
-@@ -29,11 +29,11 @@
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <pty.h>
- #include <pwd.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <utmp.h>
-+#include <libutil.h>
- 
- #define	DEV_PREFIX	"/dev/"
- #define	DEV_PREFIX_LEN	(sizeof(DEV_PREFIX)-1)
-@@ -102,42 +102,29 @@
- 		    pid_t pid, int add)
- {
- 	struct utmp ut;
--	int     offset = strlen (term) - sizeof (ut.ut_id);
- 
- 	memset (&ut, 0, sizeof (ut));
- 
--	strncpy (ut.ut_user, user, sizeof (ut.ut_user));
-+	strncpy (ut.ut_name, user, sizeof (ut.ut_name));
- 
- 	strncpy (ut.ut_line, term, sizeof (ut.ut_line));
- 
--	if (offset < 0)
--		offset = 0;
--	strncpy (ut.ut_id, term + offset, sizeof (ut.ut_id));
--
- 	if (host)
- 		strncpy (ut.ut_host, host, sizeof (ut.ut_host));
- 
--	if (add)
--		ut.ut_type = USER_PROCESS;
--	else
--		ut.ut_type = DEAD_PROCESS;
--
--	ut.ut_pid = pid;
--
--	gettimeofday (&ut.ut_tv, 0);
-+	time (&ut.ut_time);
- 
--	setutent ();
--	if (!pututline (&ut))
--	{
-+	if (add) {
-+		login (&ut);
-+	} else {
-+		if (logout (term) != 1) {
- #ifdef	UTEMPTER_DEBUG
--		fprintf (stderr, "utempter: pututline: %s\n",
--			 strerror (errno));
-+	fprintf (stderr, "utempter: logout: %s\n",
-+		strerror (errno));
- #endif
- 		exit (EXIT_FAILURE);
-+		}
- 	}
--	endutent ();
--
--	updwtmp (_PATH_WTMP, &ut);
- 
- #ifdef	UTEMPTER_DEBUG
- 	fprintf (stderr,
-@@ -203,7 +190,7 @@
- 		exit (EXIT_FAILURE);
- 	}
- 
--	device = ptsname (STDIN_FILENO);
-+	device = ttyname (STDIN_FILENO);
- 	if (!device)
- 	{
- #ifdef	UTEMPTER_DEBUG
diff -Nbur sysutils/libutempter.orig/pkg-plist sysutils/libutempter/pkg-plist
--- sysutils/libutempter.orig/pkg-plist	Mon Aug 30 00:54:38 2004
+++ sysutils/libutempter/pkg-plist	Thu Feb  8 11:21:00 2007
@@ -2,6 +2,6 @@
 lib/libutempter.a
 lib/libutempter.so
 lib/libutempter.so.0
-lib/libutempter.so.1.1.1
+lib/libutempter.so.1.1.4
 libexec/utempter/utempter
 @dirrm libexec/utempter
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Feb 8 11:11:37 UTC 2007 
Responsible-Changed-Why:  
miwi@ wants this PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108927 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Feb 8 22:27:24 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108927 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108927: commit references a PR
Date: Thu,  8 Feb 2007 22:35:47 +0000 (UTC)

 miwi        2007-02-08 22:35:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/libutempter Makefile distinfo pkg-plist 
     sysutils/libutempter/files patch-Makefile 
   Removed files:
     sysutils/libutempter/files patch-iface.c patch-utempter.c 
   Log:
   - Update to 1.1.4
   
   PR:             108927
   Submitted by:   Martin Matuska <martin@matuska.org>
   
   Revision  Changes    Path
   1.4       +1 -1      ports/sysutils/libutempter/Makefile
   1.3       +3 -3      ports/sysutils/libutempter/distinfo
   1.2       +18 -13    ports/sysutils/libutempter/files/patch-Makefile
   1.2       +0 -18     ports/sysutils/libutempter/files/patch-iface.c (dead)
   1.2       +0 -76     ports/sysutils/libutempter/files/patch-utempter.c (dead)
   1.2       +1 -1      ports/sysutils/libutempter/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
