From a05bac28ee5c4de34354b9bca1d991e9e5bbc5db9d826ff70d5a3d9657477e35 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 20 Jun 2013 09:49:51 +0000 Subject: [PATCH] Accepting request 180096 from home:msmeissn:branches:Base:System - updated to 1.1.6 upstream (bnc#823302) - new apis (old are staying) - utempter-ppc64.patch: is upstream, removed - utempter-0.5.5-pie.diff: done differently, removed - utempter-no-staticlib.patch: no static library wanted - gpg source tarball checking - hooked up permissions framework correctly OBS-URL: https://build.opensuse.org/request/show/180096 OBS-URL: https://build.opensuse.org/package/show/Base:System/utempter?expand=0&rev=20 --- baselibs.conf | 3 +- libutempter-1.1.6.tar.bz2 | 3 + libutempter-1.1.6.tar.bz2.asc | 7 +++ utempter-0.5.5-pie.diff | 15 ----- utempter-0.5.5.tar.gz | 3 - utempter-no-staticlib.patch | 30 ++++++++++ utempter-ppc64.patch | 30 ---------- utempter.changes | 11 ++++ utempter.eal3.diff | 51 +++++++++++----- utempter.keyring | 110 ++++++++++++++++++++++++++++++++++ utempter.spec | 70 +++++++++++++++------- 11 files changed, 248 insertions(+), 85 deletions(-) create mode 100644 libutempter-1.1.6.tar.bz2 create mode 100644 libutempter-1.1.6.tar.bz2.asc delete mode 100644 utempter-0.5.5-pie.diff delete mode 100644 utempter-0.5.5.tar.gz create mode 100644 utempter-no-staticlib.patch delete mode 100644 utempter-ppc64.patch create mode 100644 utempter.keyring diff --git a/baselibs.conf b/baselibs.conf index b11e4b8..345ac0e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,2 @@ -utempter +libutempter0 +utempter-devel diff --git a/libutempter-1.1.6.tar.bz2 b/libutempter-1.1.6.tar.bz2 new file mode 100644 index 0000000..629071c --- /dev/null +++ b/libutempter-1.1.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397 +size 15705 diff --git a/libutempter-1.1.6.tar.bz2.asc b/libutempter-1.1.6.tar.bz2.asc new file mode 100644 index 0000000..5bdc2e9 --- /dev/null +++ b/libutempter-1.1.6.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iEYEABECAAYFAkzSv90ACgkQ2XqGi/fduzoyqgCeL+Ib3+WRh63+dGi1b62yh8Qk +1/sAnRP+QVdpxvP+L4uB+MvwEj7tRJAR +=Lwhu +-----END PGP SIGNATURE----- diff --git a/utempter-0.5.5-pie.diff b/utempter-0.5.5-pie.diff deleted file mode 100644 index b71d7ca..0000000 --- a/utempter-0.5.5-pie.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile -+++ Makefile 2005/06/20 11:16:24 -@@ -21,6 +21,12 @@ - %.os : %.c - $(CC) -c $(CFLAGS) -fPIC $< -o $@ - -+%.o : %.c -+ $(CC) -c $(CFLAGS) -fpie $< -o $@ -+ -+utempter: utempter.o -+ $(CC) -o $@ -pie $^ -+ - install: - mkdir -p $(RPM_BUILD_ROOT)/usr/sbin - mkdir -p $(RPM_BUILD_ROOT)/$(LIBDIR) diff --git a/utempter-0.5.5.tar.gz b/utempter-0.5.5.tar.gz deleted file mode 100644 index 89bd598..0000000 --- a/utempter-0.5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:555da9e323b7691bfc8b7d3e428e57642f9a776b742c308dc363e30ca99d4d90 -size 13765 diff --git a/utempter-no-staticlib.patch b/utempter-no-staticlib.patch new file mode 100644 index 0000000..4cad074 --- /dev/null +++ b/utempter-no-staticlib.patch @@ -0,0 +1,30 @@ +Index: libutempter-1.1.6/Makefile +=================================================================== +--- libutempter-1.1.6.orig/Makefile ++++ libutempter-1.1.6/Makefile +@@ -27,7 +27,7 @@ SONAME = $(SHAREDLIB).$(MAJOR) + STATICLIB = lib$(PROJECT).a + MAP = lib$(PROJECT).map + +-TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB) ++TARGETS = $(PROJECT) $(SHAREDLIB) + + INSTALL = install + libdir = /usr/lib +@@ -53,7 +53,7 @@ all: $(TARGETS) + $(COMPILE.c) -fPIC $< $(OUTPUT_OPTION) + + $(PROJECT): utempter.c +- $(LINK.c) -Wl,-z,now,-stats $(LDLIBS) $< $(OUTPUT_OPTION) ++ $(LINK.c) -Wl,-z,now,-stats -pie $(LDLIBS) $< $(OUTPUT_OPTION) + + $(SHAREDLIB): iface.os $(MAP) + $(LINK.o) -shared \ +@@ -74,7 +74,6 @@ install: + $(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) -p -m644 $(PROJECT).3 $(DESTDIR)$(man3dir)/ diff --git a/utempter-ppc64.patch b/utempter-ppc64.patch deleted file mode 100644 index db8da4b..0000000 --- a/utempter-ppc64.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- utempter-0.5.5/utempter.c -+++ utempter-0.5.5/utempter.c -@@ -89,6 +89,7 @@ int main(int argc, const char ** argv) { - int i; - struct stat sb; - char * id; -+ struct timeval tv; - - if (argc < 3) usage(); - -@@ -116,6 +117,9 @@ int main(int argc, const char ** argv) { - host = NULL; - } - -+ memset(&tv, 0, sizeof(tv)); -+ (void) gettimeofday(&tv, 0); -+ - memset(&utx, 0, sizeof(utx)); - if (add) - utx.ut_type = USER_PROCESS; -@@ -152,7 +156,8 @@ int main(int argc, const char ** argv) { - - strncpy(utx.ut_id, id, sizeof(utx.ut_id)); - -- gettimeofday(&utx.ut_tv, NULL); -+ utx.ut_tv.tv_sec = tv.tv_sec; -+ utx.ut_tv.tv_usec = tv.tv_usec; - - pututxline(&utx); - updwtmpx(_PATH_WTMP, &utx); diff --git a/utempter.changes b/utempter.changes index ff23a3b..10f87a6 100644 --- a/utempter.changes +++ b/utempter.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jun 5 11:23:54 UTC 2013 - meissner@suse.com + +- updated to 1.1.6 upstream (bnc#823302) + - new apis (old are staying) +- utempter-ppc64.patch: is upstream, removed +- utempter-0.5.5-pie.diff: done differently, removed +- utempter-no-staticlib.patch: no static library wanted +- gpg source tarball checking +- hooked up permissions framework correctly + ------------------------------------------------------------------- Fri Apr 5 10:01:05 UTC 2013 - idonmez@suse.com diff --git a/utempter.eal3.diff b/utempter.eal3.diff index 9a5ed94..a290336 100644 --- a/utempter.eal3.diff +++ b/utempter.eal3.diff @@ -1,19 +1,40 @@ ---- utempter-0.5.5/Makefile.eal3 2004-08-05 11:33:17.000000000 +0200 -+++ utempter-0.5.5/Makefile 2004-08-05 11:34:06.000000000 +0200 -@@ -25,9 +25,11 @@ - mkdir -p $(RPM_BUILD_ROOT)/usr/sbin - mkdir -p $(RPM_BUILD_ROOT)/$(LIBDIR) - mkdir -p $(RPM_BUILD_ROOT)/usr/include -+ mkdir -p $(RPM_BUILD_ROOT)/usr/share/man/man8 - install -m 4755 utempter $(RPM_BUILD_ROOT)/usr/sbin - install -m 644 utempter.h $(RPM_BUILD_ROOT)/usr/include - install -m 644 $(SHAREDLIB) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(VERSION) -+ install -c -m 644 utempter.8 $(RPM_BUILD_ROOT)/usr/share/man/man8/utempter.8 - ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB) +Index: libutempter-1.1.6/Makefile +=================================================================== +--- libutempter-1.1.6.orig/Makefile ++++ libutempter-1.1.6/Makefile +@@ -35,6 +35,7 @@ libexecdir = /usr/lib + includedir = /usr/include + mandir = /usr/share/man + man3dir = $(mandir)/man3 ++man8dir = $(mandir)/man8 + DESTDIR = - $(SHAREDLIB): utmpintf.os ---- utempter-0.5.5/utempter.8.eal3 1970-01-01 01:00:00.000000000 +0100 -+++ utempter-0.5.5/utempter.8 2003-11-18 09:01:43.000000000 +0100 + WARNINGS = -W -Wall -Waggregate-return -Wcast-align -Wconversion \ +@@ -68,6 +69,8 @@ iface.o: iface.c utempter.h + install: + mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir)/$(PROJECT) \ + $(DESTDIR)$(includedir) $(DESTDIR)$(man3dir) ++ mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir)/$(PROJECT) \ ++ $(DESTDIR)$(includedir) $(DESTDIR)$(man8dir) + $(INSTALL) -p -m2711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/ + $(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/ + $(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION) +@@ -75,9 +78,11 @@ install: + ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) + ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) + $(INSTALL) -p -m644 $(PROJECT).3 $(DESTDIR)$(man3dir)/ ++ $(INSTALL) -p -m644 $(PROJECT).8 $(DESTDIR)$(man8dir)/ + for n in lib$(PROJECT) utempter_add_record utempter_remove_record \ + utempter_remove_added_record utempter_set_helper; do \ + ln -s $(PROJECT).3 $(DESTDIR)$(man3dir)/$$n.3; \ ++ ln -s $(PROJECT).8 $(DESTDIR)$(man8dir)/$$n.8; \ + done + + clean: +Index: libutempter-1.1.6/utempter.8 +=================================================================== +--- /dev/null ++++ libutempter-1.1.6/utempter.8 @@ -0,0 +1,30 @@ +.\" Copyright (C) 2003 International Business Machines Corporation +.\" Author: Emily Ratliff diff --git a/utempter.keyring b/utempter.keyring new file mode 100644 index 0000000..d900228 --- /dev/null +++ b/utempter.keyring @@ -0,0 +1,110 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +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 +=GfHG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/utempter.spec b/utempter.spec index a306a88..acdd69c 100644 --- a/utempter.spec +++ b/utempter.spec @@ -16,9 +16,10 @@ # +%define lname libutempter0 Name: utempter %define utmpGroup utmp -Version: 0.5.5 +Version: 1.1.6 Release: 0 Summary: A privileged helper for utmp and wtmp updates License: MIT @@ -27,12 +28,17 @@ Group: Productivity/Security %ifarch ppc64 Obsoletes: utempter-64bit %endif -%define _hash a628f149132e2f729bc4601e6a4f6c29 -Source: http://pkgs.fedoraproject.org/repo/pkgs/%{name}/%{name}-%{version}.tar.gz/%{_hash}/%{name}-%{version}.tar.gz +Url: ftp://ftp.altlinux.org/pub/people/ldv/utempter/ +Source: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%name-%version.tar.bz2 +Source1: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%name-%version.tar.bz2.asc Source2: baselibs.conf +Source3: %name.keyring Patch0: utempter.eal3.diff -Patch1: utempter-0.5.5-pie.diff -Patch2: utempter-ppc64.patch +Patch1: utempter-no-staticlib.patch +%if 0%{?suse_version} > 1220 +BuildRequires: gpg-offline +%endif + # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,41 +50,63 @@ setuid root. %package devel Summary: Development files for utempter Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %lname = %{version} %description devel Utempter is a privileged helper for utmp and wtmp updates. This package contains the development files needed. +%package -n %lname +Summary: Shared library of utempter +Group: Development/Libraries/C and C++ +PreReq: permissions +Provides: utempter = %version +Obsoletes: utempter <= 0.5.5 +Requires: %{name} + +%description -n %lname +Utempter is a privileged helper for utmp and wtmp updates. This +package contains the library used by applications. + %prep -%setup -q +%if 0%{?suse_version} > 1220 +%gpg_verify %{S:1} +%endif +%setup -q -n lib%name-%version %patch0 -p1 -%patch1 -%patch2 -p1 +%patch1 -p1 %build -make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" CC="gcc" +make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags} -fPIC" CC="gcc" %install export DESTDIR=%{buildroot} -make PREFIX=$DESTDIR LIBDIR=%{_libdir} install +make PREFIX=$DESTDIR libdir=%{_libdir} DESTDIR=%{buildroot} install chmod 755 $DESTDIR%{_libdir}/libutempter.so* /sbin/ldconfig -n $DESTDIR%{_libdir} -%post -p /sbin/ldconfig +%verifyscript -n %lname +%verify_permissions -e /usr/lib/utempter/utempter -%postun -p /sbin/ldconfig +%post -n %lname +%set_permissions /usr/lib/utempter/utempter +/sbin/ldconfig -%files -%defattr(444,root,root,755) +%postun -n %lname -p /sbin/ldconfig + +%files -n %lname +%defattr(644,root,root,755) %doc COPYING -%attr(02755, root, %{utmpGroup}) %{_sbindir}/utempter -%attr(555,root,root) %{_libdir}/libutempter.so.* -%attr(444,root,root) %doc %{_mandir}/man8/* +%dir /usr/lib/utempter +%attr(02755, root, %{utmpGroup}) /usr/lib/utempter/utempter +%attr(755,root,root) %{_libdir}/libutempter.so.* +%attr(644,root,root) %doc %{_mandir}/man8/* %files devel -%defattr(444,root,root,755) -%attr(555,root,root) %{_libdir}/libutempter.so -%attr(444,root,root) %{_includedir}/utempter.h +%doc COPYING +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libutempter.so +%attr(644,root,root) %{_includedir}/utempter.h +%attr(644,root,root) %doc %{_mandir}/man3/* %changelog