Accepting request 838373 from home:StefanBruens:branches:Base:System

- Fix License, libutempter has been LGPL-2.1+ for the last 19 years
- Fix utempter.8 man page to match real parameters
- Remove erroneous links to utempter.8 man page
- Clean up spec file

OBS-URL: https://build.opensuse.org/request/show/838373
OBS-URL: https://build.opensuse.org/package/show/Base:System/utempter?expand=0&rev=37
This commit is contained in:
Marcus Meissner 2020-09-29 05:52:20 +00:00 committed by Git OBS Bridge
parent f83f08a47f
commit 9c60c11357
3 changed files with 15 additions and 19 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 28 20:25:57 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix License, libutempter has been LGPL-2.1+ for the last 19 years
- Fix utempter.8 man page to match real parameters
- Remove erroneous links to utempter.8 man page
- Clean up spec file
-------------------------------------------------------------------
Thu Sep 3 15:52:03 UTC 2020 - Marcus Meissner <meissner@suse.com>

View File

@ -19,7 +19,7 @@ Index: libutempter-1.1.6/Makefile
$(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:
@@ -75,6 +78,7 @@ install:
ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME)
ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB)
$(INSTALL) -p -m644 $(PROJECT).3 $(DESTDIR)$(man3dir)/
@ -27,10 +27,6 @@ Index: libutempter-1.1.6/Makefile
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
@ -44,9 +40,9 @@ Index: libutempter-1.1.6/utempter.8
+.SH NAME
+utempter \- privileged helper program for utmp/wtmp updates
+.SH "SYNOPSIS"
+\fButempter\fR \-a \fIslave-device-name\fR \fIhost\fR
+\fButempter\fR add \fIhost\fR
+.sp
+\fButempter\fR \-d \fIslave-device-name\fR
+\fButempter\fR del\fR
+.SH "DESCRIPTION"
+.B utempter
+is a privileged helper program that writes utmp/wtmp entries for unprivileged
@ -54,9 +50,9 @@ Index: libutempter-1.1.6/utempter.8
+
+.SH "OPTIONS"
+The following options are supported:
+.IP "\fB-a \fIslave-device-name host\fR
+.IP "\fBadd \fIhost\fR"
+add an entry to the utmp/wtmp file
+.IP "\fB\-d \fIslave-device-name\fR
+.IP "\fBdel\fR"
+delete an entry from the utmp file
+
+.SH "RETURN VALUE"

View File

@ -22,7 +22,7 @@ Name: utempter
Version: 1.2.0
Release: 0
Summary: A privileged helper for utmp and wtmp updates
License: MIT
License: LGPL-2.1-or-later
Group: Productivity/Security
URL: https://github.com/altlinux/libutempter/
Source: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%{name}-%{version}.tar.gz
@ -31,7 +31,6 @@ Source2: baselibs.conf
Source3: %{name}.keyring
Patch0: utempter.eal3.diff
Patch1: utempter-no-staticlib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Utempter is a utility that allows non-privileged applications such as
@ -51,9 +50,7 @@ package contains the development files needed.
Summary: Shared library of utempter
Group: Development/Libraries/C and C++
Requires(post): permissions
%if 0%{?suse_version} >= 1330
Requires(pre): group(%{utmpGroup})
%endif
Provides: %{name} = %{version}
Obsoletes: %{name} < 0.5.6
@ -70,9 +67,7 @@ package contains the library used by applications.
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags} -fPIC" CC="gcc" libexecdir=%{_libexecdir}
%install
export DESTDIR=%{buildroot}
make PREFIX=$DESTDIR libdir=%{_libdir} libexecdir=%{_libexecdir} DESTDIR=%{buildroot} install
chmod 755 $DESTDIR%{_libdir}/libutempter.so*
make libdir=%{_libdir} libexecdir=%{_libexecdir} DESTDIR=%{buildroot} install
%verifyscript -n %{lname}
%verify_permissions -e %{_libexecdir}/utempter/utempter
@ -84,7 +79,6 @@ chmod 755 $DESTDIR%{_libdir}/libutempter.so*
%postun -n %{lname} -p /sbin/ldconfig
%files -n %{lname}
%defattr(644,root,root,755)
%license COPYING
%dir %{_libexecdir}/utempter
%attr(02755, root, %{utmpGroup}) %{_libexecdir}/utempter/utempter
@ -92,9 +86,7 @@ chmod 755 $DESTDIR%{_libdir}/libutempter.so*
%attr(644,root,root) %doc %{_mandir}/man8/*
%files devel
%defattr(-,root,root)
%license 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/*