summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-02-08 22:35:36 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-02-08 22:35:36 +0000
commitba145dde76952f28161067f7292201e4fe2030af (patch)
tree3bd228510d76c446d628beb41cb8d88fd08dc684 /sysutils
parent- Update to 2.4 (diff)
- Update to 1.1.4
PR: 108927 Submitted by: Martin Matuska <martin@matuska.org>
Notes
Notes: svn path=/head/; revision=184630
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/libutempter/Makefile2
-rw-r--r--sysutils/libutempter/distinfo6
-rw-r--r--sysutils/libutempter/files/patch-Makefile31
-rw-r--r--sysutils/libutempter/files/patch-iface.c18
-rw-r--r--sysutils/libutempter/files/patch-utempter.c76
-rw-r--r--sysutils/libutempter/pkg-plist2
6 files changed, 23 insertions, 112 deletions
diff --git a/sysutils/libutempter/Makefile b/sysutils/libutempter/Makefile
index 1f13d29c6e9f..545ea64c2072 100644
--- a/sysutils/libutempter/Makefile
+++ b/sysutils/libutempter/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= libutempter
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.altlinux.org/pub/people/ldv/utempter/
diff --git a/sysutils/libutempter/distinfo b/sysutils/libutempter/distinfo
index 492b036ce983..dba8c3daeb6e 100644
--- a/sysutils/libutempter/distinfo
+++ b/sysutils/libutempter/distinfo
@@ -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 --git a/sysutils/libutempter/files/patch-Makefile b/sysutils/libutempter/files/patch-Makefile
index e93763181dd3..b551924be02a 100644
--- a/sysutils/libutempter/files/patch-Makefile
+++ b/sysutils/libutempter/files/patch-Makefile
@@ -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 --git a/sysutils/libutempter/files/patch-iface.c b/sysutils/libutempter/files/patch-iface.c
deleted file mode 100644
index 1c214aacb334..000000000000
--- a/sysutils/libutempter/files/patch-iface.c
+++ /dev/null
@@ -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 --git a/sysutils/libutempter/files/patch-utempter.c b/sysutils/libutempter/files/patch-utempter.c
deleted file mode 100644
index 7b89e73506d9..000000000000
--- a/sysutils/libutempter/files/patch-utempter.c
+++ /dev/null
@@ -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 --git a/sysutils/libutempter/pkg-plist b/sysutils/libutempter/pkg-plist
index c52e0300e9da..f7f842dc1b1e 100644
--- a/sysutils/libutempter/pkg-plist
+++ b/sysutils/libutempter/pkg-plist
@@ -2,6 +2,6 @@ include/utempter.h
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