Revision bump for security reasons. Set utempter to sgid utmp instead of suid root. Use non-lazy bindings. Removed old ebuild.

8 files changed, 20 insertions, 114 deletions

diff --git a/sys-apps/utempter/ChangeLog b/sys-apps/utempter/ChangeLog
index b6ce43bd4a78..a913ec599c22 100644
--- a/sys-apps/utempter/ChangeLog
+++ b/sys-apps/utempter/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/utempter
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v 1.24 2004/07/24 17:27:27 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v 1.25 2004/12/17 17:50:39 swegener Exp $
+
+*utempter-0.5.5.5-r1 (17 Dec 2004)
+
+  17 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/utempter-0.5.3.2-soname-makefile-fix.patch,
+  -files/utempter-0.5.5.4-soname-makefile-fix.patch,
+  -utempter-0.5.5.4.ebuild, +utempter-0.5.5.5-r1.ebuild,
+  -utempter-0.5.5.5.ebuild:
+  Revision bump for security reasons. Set utempter to sgid utmp instead of
+  suid root. Use non-lazy bindings. Removed old ebuild.
 
   24 Jul 2004; Stephen P. Becker <geoman@gentoo.org> utempter-0.5.5.5.ebuild:
   Stable on mips.
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index b408b0f41a2c..24f14d60b58b 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,9 +1,5 @@
+MD5 67758e2b4f20a79b2049cd0f7eefc36e utempter-0.5.5.5-r1.ebuild 1309
 MD5 0d4bf83c384a6dd38f94a93d4afdd903 ChangeLog 3403
-MD5 d8570e14072e7d364e2ed684c02fb361 utempter-0.5.5.5.ebuild 1197
 MD5 ead67259560e11f3f635a49255114bf6 metadata.xml 181
-MD5 2e12659dd7ec4d6c1374d06918cd0637 utempter-0.5.5.4.ebuild 1189
-MD5 d3293569252b4437ee84ef41b158aa00 files/digest-utempter-0.5.5.5 68
-MD5 b2dc09a11b51ceac5735f963a718fa32 files/utempter-0.5.3.2-soname-makefile-fix.patch 932
-MD5 d0e4e8890ac8dd494a927260b110b33a files/digest-utempter-0.5.5.4 68
-MD5 b2dc09a11b51ceac5735f963a718fa32 files/utempter-0.5.5.4-soname-makefile-fix.patch 932
+MD5 d3293569252b4437ee84ef41b158aa00 files/digest-utempter-0.5.5.5-r1 68
 MD5 b2dc09a11b51ceac5735f963a718fa32 files/utempter-0.5.5.5-soname-makefile-fix.patch 932
diff --git a/sys-apps/utempter/files/digest-utempter-0.5.5.4 b/sys-apps/utempter/files/digest-utempter-0.5.5.4
deleted file mode 100644
index f821f14a0c3d..000000000000
--- a/sys-apps/utempter/files/digest-utempter-0.5.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4fb1fd3dcc99c4309796478b80755084 utempter-0.5.5-4.src.rpm 21067
diff --git a/sys-apps/utempter/files/digest-utempter-0.5.5.5 b/sys-apps/utempter/files/digest-utempter-0.5.5.5-r1
index 9d04dab1a569..9d04dab1a569 100644
--- a/sys-apps/utempter/files/digest-utempter-0.5.5.5
+++ b/sys-apps/utempter/files/digest-utempter-0.5.5.5-r1
diff --git a/sys-apps/utempter/files/utempter-0.5.3.2-soname-makefile-fix.patch b/sys-apps/utempter/files/utempter-0.5.3.2-soname-makefile-fix.patch
deleted file mode 100644
index ae50456a987f..000000000000
--- a/sys-apps/utempter/files/utempter-0.5.3.2-soname-makefile-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN utempter-0.5.3.orig/Makefile utempter-0.5.3/Makefile
---- utempter-0.5.3.orig/Makefile	2004-04-07 23:02:39.000000000 -0400
-+++ utempter-0.5.3/Makefile	2004-04-07 23:04:33.000000000 -0400
-@@ -5,6 +5,10 @@
- CVSROOT=$(shell cat CVS/Root)
- # major number of the .so lib
- SOMAJOR = 0
-+# minor number of the .so lib
-+SOMINOR = 5
-+# major number of the .so lib
-+SOMICRO = 3
- 
- SHAREDLIB = lib$(NAME).so
- SONAME = $(SHAREDLIB).$(SOMAJOR)
-@@ -29,6 +33,8 @@
- 	install -m 644 utempter.h $(RPM_BUILD_ROOT)/usr/include
- 	install -m 644 $(SHAREDLIB) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(VERSION)
- 	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB)
-+	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR).$(SOMINOR)
-+	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR)
- 
- $(SHAREDLIB): utmpintf.os
- 	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
diff --git a/sys-apps/utempter/files/utempter-0.5.5.4-soname-makefile-fix.patch b/sys-apps/utempter/files/utempter-0.5.5.4-soname-makefile-fix.patch
deleted file mode 100644
index ae50456a987f..000000000000
--- a/sys-apps/utempter/files/utempter-0.5.5.4-soname-makefile-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN utempter-0.5.3.orig/Makefile utempter-0.5.3/Makefile
---- utempter-0.5.3.orig/Makefile	2004-04-07 23:02:39.000000000 -0400
-+++ utempter-0.5.3/Makefile	2004-04-07 23:04:33.000000000 -0400
-@@ -5,6 +5,10 @@
- CVSROOT=$(shell cat CVS/Root)
- # major number of the .so lib
- SOMAJOR = 0
-+# minor number of the .so lib
-+SOMINOR = 5
-+# major number of the .so lib
-+SOMICRO = 3
- 
- SHAREDLIB = lib$(NAME).so
- SONAME = $(SHAREDLIB).$(SOMAJOR)
-@@ -29,6 +33,8 @@
- 	install -m 644 utempter.h $(RPM_BUILD_ROOT)/usr/include
- 	install -m 644 $(SHAREDLIB) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(VERSION)
- 	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB)
-+	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR).$(SOMINOR)
-+	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR)
- 
- $(SHAREDLIB): utmpintf.os
- 	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
diff --git a/sys-apps/utempter/utempter-0.5.5.4.ebuild b/sys-apps/utempter/utempter-0.5.5.4.ebuild
deleted file mode 100644
index 11e6e3ed528c..000000000000
--- a/sys-apps/utempter/utempter-0.5.5.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.4.ebuild,v 1.13 2004/11/05 23:22:16 mr_bones_ Exp $
-
-inherit rpm eutils
-
-MY_P=${P%.*}-${PV##*.}
-S=${WORKDIR}/${P%.*}
-DESCRIPTION="App that allows non-privileged apps to write utmp (login) info, which needs root access"
-HOMEPAGE="http://www.redhat.com/"
-SRC_URI="ftp://fr2.rpmfind.net/linux/fedora/core/development/SRPMS/${MY_P}.src.rpm"
-
-LICENSE="|| ( MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64 ~ppc64"
-IUSE=""
-
-RDEPEND="virtual/libc"
-
-pkg_setup() {
-	enewgroup utmp 406
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/${P}-soname-makefile-fix.patch
-}
-
-src_compile() {
-	make RPM_OPT_FLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	make \
-		RPM_BUILD_ROOT="${D}" \
-		LIBDIR=/usr/lib \
-		install || die
-	dobin utmp
-}
-
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		if [ -f /var/log/wtmp ]
-		then
-			chown root:utmp /var/log/wtmp
-			chmod 664 /var/log/wtmp
-		fi
-
-		if [ -f /var/run/utmp ]
-		then
-			chown root:utmp /var/run/utmp
-			chmod 664 /var/run/utmp
-		fi
-	fi
-}
diff --git a/sys-apps/utempter/utempter-0.5.5.5.ebuild b/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
index b22bb84dd7c6..cc5b2d4d4f53 100644
--- a/sys-apps/utempter/utempter-0.5.5.5.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.5.ebuild,v 1.6 2004/11/05 23:22:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild,v 1.1 2004/12/17 17:50:39 swegener Exp $
 
-inherit rpm eutils
+inherit rpm eutils flag-o-matic
 
 MY_P=${P%.*}-${PV##*.}
 S=${WORKDIR}/${P%.*}
@@ -29,6 +29,8 @@ src_unpack() {
 }
 
 src_compile() {
+	append-ldflags -Wl,-z,now
+
 	make RPM_OPT_FLAGS="${CFLAGS}" || die
 }
 
@@ -38,6 +40,9 @@ src_install() {
 		LIBDIR=/usr/lib \
 		install || die
 	dobin utmp
+
+	fowners root:utmp /usr/sbin/utempter
+	fperms 2755 /usr/sbin/utempter
 }