commit 0fd9e261a258e094db58dc4cb70bff11f3b6f44e Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:54:23 2019 -0400 Package init diff --git a/bugfix-fix-argv-string-out-of-bounds.patch b/bugfix-fix-argv-string-out-of-bounds.patch new file mode 100644 index 0000000..cbf96b4 --- /dev/null +++ b/bugfix-fix-argv-string-out-of-bounds.patch @@ -0,0 +1,28 @@ +From 8645960b76db8ff5986efc60f7d2b77b8c5c0094 Mon Sep 17 00:00:00 2001 +From: sunguoshuai +Date: Fri, 10 May 2019 16:33:10 +0800 +Subject: [PATCH] add monotonic timestamp for bugfix of rsyslog-7.4.7 imjournal + +reason: add monotonic timestamp for bugfix of rsyslog-7.4.7 imjournal + +Signed-off-by: sunguoshuai +--- + keyctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keyctl.c b/keyctl.c +index 801a864..f13c2a1 100644 +--- a/keyctl.c ++++ b/keyctl.c +@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) + for (cmd = commands; cmd->name; cmd++) { + if (!cmd->action) + continue; +- if (strlen(cmd->name) > n) ++ if (strlen(cmd->name) != n) + continue; + if (memcmp(cmd->name, *argv, n) != 0) + continue; +-- +1.8.3.1 + diff --git a/keyutils-1.5.10.tar.bz2 b/keyutils-1.5.10.tar.bz2 new file mode 100644 index 0000000..e2f0c20 Binary files /dev/null and b/keyutils-1.5.10.tar.bz2 differ diff --git a/keyutils.spec b/keyutils.spec new file mode 100644 index 0000000..ebd6257 --- /dev/null +++ b/keyutils.spec @@ -0,0 +1,94 @@ +Name: keyutils +Version: 1.5.10 +Release: 9 +Summary: Utilities of Linux Key Management +License: GPLv2+ and LGPLv2+ + +Url: http://people.redhat.com/~dhowells/keyutils/ +Source0: http://people.redhat.com/~dhowells/keyutils/keyutils-%{version}.tar.bz2 + +Patch9000: bugfix-fix-argv-string-out-of-bounds.patch + +BuildRequires: gcc +BuildRequires: glibc-kernheaders >= 2.4-9.1.92 +Provides: %{name}-libs = %{version}-%{release} +Obsoletes:%{name}-libs + +%description +The keyutils contains the kernel key management facility and provides the +call back mechanism to get a key to user space. + +%package libs-devel +Summary: libs-devle package for keyutils +Requires: %{name}-libs = %{version}-%{release} + +%description libs-devel +The libs-devel package of keyutils. + +%package help +Summary: man files and other docs for keyutils + +%description help +The help package for keyutils. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +make \ + NO_ARLIB=1 \ + ETCDIR=%{_sysconfdir} \ + LIBDIR=%{_libdir} \ + USRLIBDIR=%{_libdir} \ + BINDIR=%{_bindir} \ + SBINDIR=%{_sbindir} \ + MANDIR=%{_mandir} \ + INCLUDEDIR=%{_includedir} \ + SHAREDIR=%{_datarootdir}/keyutils \ + RELEASE=.%{release} \ + NO_GLIBC_KEYERR=1 \ + CFLAGS="-Wall $RPM_OPT_FLAGS" \ + LDFLAGS="%{?__global_ldflags}" + +%install +make \ + NO_ARLIB=1 \ + DESTDIR=$RPM_BUILD_ROOT \ + ETCDIR=%{_sysconfdir} \ + LIBDIR=%{_libdir} \ + USRLIBDIR=%{_libdir} \ + BINDIR=%{_bindir} \ + SBINDIR=%{_sbindir} \ + MANDIR=%{_mandir} \ + INCLUDEDIR=%{_includedir} \ + SHAREDIR=%{_datarootdir}/keyutils \ + install + +%ldconfig_scriptlets + +%files +%doc README +%license LICENCE.GPL +%license LICENCE.LGPL +%{_sbindir}/* +%{_bindir}/* +%{_datarootdir}/keyutils +%config(noreplace) %{_sysconfdir}/* +%{_libdir}/libkeyutils.so.* + +%files libs-devel +%{_libdir}/libkeyutils.so +%{_includedir}/* + +%files help +%{_mandir}/man*/* + +%changelog +* Thu May 10 2019 huangchangyu - 1.5.10-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix argv string out of bounds + +* Fri Mar 1 2019 openEuler Buildteam - 1.5.10-8 +- Package init