diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2005-04-15 13:03:31 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2005-04-15 13:03:31 +0000 |
| commit | 18154ac58b187ea00035be7c71e2fa3af0dcbac6 (patch) | |
| tree | 032c3d7cb668d307ac9c3a82a76c49699b5beba5 /sys-apps/utempter/files | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-18154ac58b187ea00035be7c71e2fa3af0dcbac6.tar.gz gentoo-2-18154ac58b187ea00035be7c71e2fa3af0dcbac6.tar.bz2 gentoo-2-18154ac58b187ea00035be7c71e2fa3af0dcbac6.zip | |
version bump, that's allegedly compilable with gcc-4. Also, this adds a patch so that utempter can be compiled against uclibc. Patch provided by Peter S. Mazinger <ps.m@gmx.net> in bug #69470 by Daniel Black <dragonheart@gentoo.org>
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps/utempter/files')
3 files changed, 61 insertions, 0 deletions
diff --git a/sys-apps/utempter/files/digest-utempter-0.5.5.6 b/sys-apps/utempter/files/digest-utempter-0.5.5.6 new file mode 100644 index 000000000000..859f0d2d8643 --- /dev/null +++ b/sys-apps/utempter/files/digest-utempter-0.5.5.6 @@ -0,0 +1 @@ +MD5 d204e000147675ed4f1533f485fd2d7e utempter-0.5.5-6.src.rpm 21099 diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch new file mode 100644 index 000000000000..8644db837f4a --- /dev/null +++ b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch @@ -0,0 +1,38 @@ +--- utempter-0.5.5/utempter.c.mps 2004-12-11 14:54:06.000000000 +0100 ++++ utempter-0.5.5/utempter.c 2004-12-11 14:57:46.000000000 +0100 +@@ -11,7 +11,9 @@ + #include <sys/stat.h> + #include <sys/sysmacros.h> + #include <utmp.h> ++#ifndef __UCLIBC__ + #include <utmpx.h> ++#endif + #include <unistd.h> + + static void usage(void) { +@@ -82,7 +84,11 @@ + } + + int main(int argc, const char ** argv) { ++#ifndef __UCLIBC__ + struct utmpx utx; ++#else ++ struct utmp utx; ++#endif + int add; + const char * device, * host; + struct passwd * pw; +@@ -154,8 +160,13 @@ + + gettimeofday(&utx.ut_tv, NULL); + ++#ifndef __UCLIBC__ + pututxline(&utx); + updwtmpx(_PATH_WTMP, &utx); ++#else ++ pututline(&utx); ++ updwtmp(_PATH_WTMP, &utx); ++#endif + + return 0; + } diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch b/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch new file mode 100644 index 000000000000..123c77eb357c --- /dev/null +++ b/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch @@ -0,0 +1,22 @@ +--- Makefile.orig 2005-04-15 08:54:32.000000000 -0400 ++++ Makefile 2005-04-15 08:56:17.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 ++# micro number of the .so lib ++SOMICRO = 5 + + 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 |