From c537443ece94a2eed6911db7fb3058e9ee54e22e Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 11 Sep 2019 10:03:14 +0000 Subject: [PATCH] Remove libutempter The feature is present in base for all supported version of FreeBSD It was kept in ports mostly for the use of dragonfly via dports. They will not have any use of it anymore, time to deorbit that port. Reported by: zrj from dragonfly (via irc) --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/libutempter/Makefile | 22 --------- sysutils/libutempter/distinfo | 2 - sysutils/libutempter/files/patch-Makefile | 54 --------------------- sysutils/libutempter/files/patch-utempter.c | 20 -------- sysutils/libutempter/pkg-descr | 12 ----- sysutils/libutempter/pkg-plist | 6 --- 8 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 sysutils/libutempter/Makefile delete mode 100644 sysutils/libutempter/distinfo delete mode 100644 sysutils/libutempter/files/patch-Makefile delete mode 100644 sysutils/libutempter/files/patch-utempter.c delete mode 100644 sysutils/libutempter/pkg-descr delete mode 100644 sysutils/libutempter/pkg-plist diff --git a/MOVED b/MOVED index 95554fb04219..ca773d779113 100644 --- a/MOVED +++ b/MOVED @@ -12952,3 +12952,4 @@ x11-wm/pawm||2019-09-05|Has expired: Broken for more than 6 months x11-toolkits/p5-Wx||2019-09-07|Has expired: Broken for more than 6 months graphics/luxrender14||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70 graphics/luxrender||2019-09-07|Has expired: Depends on expiring graphics/embree, broken with boost 1.70 +sysutils/libutempter||2019-09-11|Belong to base in all supported version of FreeBSD diff --git a/sysutils/Makefile b/sysutils/Makefile index c891b60e8c34..8b67aee08800 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -582,7 +582,6 @@ SUBDIR += libsunacl SUBDIR += libsysstat SUBDIR += liburcu - SUBDIR += libutempter SUBDIR += life-preserver SUBDIR += lineak-defaultplugin SUBDIR += lineak-xosdplugin diff --git a/sysutils/libutempter/Makefile b/sysutils/libutempter/Makefile deleted file mode 100644 index bd2fa7dddcfd..000000000000 --- a/sysutils/libutempter/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Michael Nottebrock , -# $FreeBSD$ - -PORTNAME= libutempter -PORTVERSION= 1.1.5 -PORTREVISION= 2 -CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.altlinux.org/pub/people/ldv/utempter/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Interface to record user sessions to utmp and wtmp files - -USES= gmake tar:bzip2 -USE_LDCONFIG= yes - -.include - -.if ${OPSYS} == FreeBSD -IGNORE= is now contained in the base system -.endif - -.include diff --git a/sysutils/libutempter/distinfo b/sysutils/libutempter/distinfo deleted file mode 100644 index b813edee4581..000000000000 --- a/sysutils/libutempter/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (libutempter-1.1.5.tar.bz2) = 73d0576b16caeb22874dc80d0ce7a6aeebb3181b117e95c147cd8d29df99e70e -SIZE (libutempter-1.1.5.tar.bz2) = 14588 diff --git a/sysutils/libutempter/files/patch-Makefile b/sysutils/libutempter/files/patch-Makefile deleted file mode 100644 index 47025fc6dda0..000000000000 --- a/sysutils/libutempter/files/patch-Makefile +++ /dev/null @@ -1,54 +0,0 @@ ---- Makefile.orig 2007-02-19 12:14:08 UTC -+++ Makefile -@@ -30,9 +30,9 @@ MAP = lib$(PROJECT).map - TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB) - - INSTALL = install --libdir = /usr/lib --libexecdir = /usr/lib --includedir = /usr/include -+libdir = $(PREFIX)/lib -+libexecdir = $(PREFIX)/libexec -+includedir = $(PREFIX)/include - DESTDIR = - - WARNINGS = -W -Wall -Waggregate-return -Wcast-align -Wconversion \ -@@ -40,8 +40,8 @@ WARNINGS = -W -Wall -Waggregate-return - - -Wmissing-format-attribute -Wmissing-noreturn \ - -Wmissing-prototypes -Wpointer-arith -Wredundant-decls \ - -Wshadow -Wstrict-prototypes -Wwrite-strings --CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\" --CFLAGS = $(RPM_OPT_FLAGS) -+CPPFLAGS = -std=gnu99 $(WARNINGS) -+CFLAGS+= -DLIBEXECDIR=\"$(libexecdir)\" - LDLIBS = - - all: $(TARGETS) -@@ -63,15 +63,20 @@ $(STATICLIB): iface.o - - iface.o: iface.c utempter.h - -+$(PROJECT).o: $(PROJECT).c -+ -+$(PROJECT): $(PROJECT).o -+ $(LINK.o) $(PROJECT).o -o $(PROJECT) -lutil -+ - install: - 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)/ -- ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) -- ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) -+ $(INSTALL) -m4711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/$(PROJECT) -+ $(INSTALL) -m644 $(PROJECT).h $(DESTDIR)$(includedir)/$(PROJECT).h -+ $(INSTALL) -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION) -+ $(INSTALL) -m644 $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB) -+ ln -sf $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) -+ ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) - - clean: -- $(RM) $(TARGETS) iface.o iface.os core *~ -+ $(RM) $(TARGETS) $(PROJECT).o iface.o iface.os core *~ diff --git a/sysutils/libutempter/files/patch-utempter.c b/sysutils/libutempter/files/patch-utempter.c deleted file mode 100644 index 4de9d2f14a25..000000000000 --- a/sysutils/libutempter/files/patch-utempter.c +++ /dev/null @@ -1,20 +0,0 @@ ---- utempter.c.orig 2007-02-19 12:14:08.000000000 +0000 -+++ utempter.c -@@ -36,7 +36,7 @@ - - #ifdef __GLIBC__ - # include --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - # include - #else - # error Unsupported platform -@@ -157,7 +157,7 @@ write_uwtmp_record(const char *user, con - - (void) updwtmp(_PATH_WTMP, &ut); - --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - - ut.ut_time = tv.tv_sec; - diff --git a/sysutils/libutempter/pkg-descr b/sysutils/libutempter/pkg-descr deleted file mode 100644 index 78235d39adaa..000000000000 --- a/sysutils/libutempter/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -The libutempter library provides interface for terminal emulators such as -screen and xterm to record user sessions to utmp and wtmp files. - -The utempter is a privileged helper used by libutempter library to manipulate -utmp and wtmp files. - -This implementation is based on ideas of RedHat's utempter by Erik Troan -(version 0.5.2 at the moment of writing). - -There are two interfaces supported: old and new. -New API is recommended for new applications, old - for compatibility with -old software. diff --git a/sysutils/libutempter/pkg-plist b/sysutils/libutempter/pkg-plist deleted file mode 100644 index 900cb13fc828..000000000000 --- a/sysutils/libutempter/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -include/utempter.h -lib/libutempter.a -lib/libutempter.so -lib/libutempter.so.0 -lib/libutempter.so.1.1.5 -libexec/utempter/utempter