update to 2.6 [release 2.6-1mamba;Wed Nov 16 2016]

This commit is contained in:
Silvan Calarco 2024-01-06 05:45:19 +01:00
parent ce6e4f4d10
commit ab6fd58c2e
2 changed files with 40 additions and 7 deletions

View File

@ -0,0 +1,20 @@
--- selinux-libselinux-2.6/libsepol/cil/src/cil_lexer.l.orig 2016-11-16 17:52:41.490786500 +0100
+++ selinux-libselinux-2.6/libsepol/cil/src/cil_lexer.l 2016-11-16 17:51:43.890953733 +0100
@@ -69,7 +69,7 @@
int cil_lexer_setup(char *buffer, uint32_t size)
{
size = (yy_size_t)size;
- if (yy_scan_buffer(buffer, size) == NULL) {
+ if (cil_yy_scan_buffer(buffer, size) == NULL) {
cil_log(CIL_INFO, "Lexer failed to setup buffer\n");
return SEPOL_ERR;
}
@@ -81,7 +81,7 @@
void cil_lexer_destroy(void)
{
- yylex_destroy();
+ cil_yylex_destroy();
}
int cil_lexer_next(struct token *tok)

View File

@ -1,5 +1,5 @@
Name: libsepol Name: libsepol
Version: 2.1.4 Version: 2.6
Release: 1mamba Release: 1mamba
Summary: Security Enhanced Linux policy manipulation library Summary: Security Enhanced Linux policy manipulation library
Group: System/Libraries Group: System/Libraries
@ -7,7 +7,11 @@ Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://userspace.selinuxproject.org/trac URL: http://userspace.selinuxproject.org/trac
Source: http://userspace.selinuxproject.org/releases/20120216/%{name}-%{version}.tar.gz Source: https://github.com/SELinuxProject/selinux/archive/libselinux-%{version}.tar.gz
Patch0: libsepol-2.6-flex-2.6.2.patch
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
## AUTOBUILDREQ-END
License: LGPL License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -40,13 +44,16 @@ This package contains the Security Enhanced Linux policy utility programs.
%debug_package %debug_package
%prep %prep
%setup -q %setup -q -n selinux-libselinux-%{version}
%patch0 -p1
%build %build
cd libsepol
%make CC=%{_host}-gcc %make CC=%{_host}-gcc
%install %install
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
cd libsepol
%makeinstall \ %makeinstall \
LIBDIR=%{buildroot}%{_libdir} \ LIBDIR=%{buildroot}%{_libdir} \
SHLIBDIR=%{buildroot}/%{_lib} SHLIBDIR=%{buildroot}/%{_lib}
@ -62,16 +69,19 @@ rm -f %{buildroot}%{_mandir}/man8/genpolusers.*
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/%{_lib}/*.so.* /%{_lib}/libsepol.so.*
%doc COPYING ChangeLog %doc libsepol/COPYING libsepol/ChangeLog
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_includedir}/sepol %dir %{_includedir}/sepol
%{_includedir}/sepol/*.h %{_includedir}/sepol/*.h
%dir %{_includedir}/sepol/policydb
%{_includedir}/sepol/policydb/*.h %{_includedir}/sepol/policydb/*.h
%{_libdir}/*.a %dir %{_includedir}/sepol/cil
%{_libdir}/*.so %{_includedir}/sepol/cil/cil.h
%{_libdir}/libsepol.a
%{_libdir}/libsepol.so
%{_libdir}/pkgconfig/libsepol.pc %{_libdir}/pkgconfig/libsepol.pc
%{_mandir}/man3/* %{_mandir}/man3/*
@ -81,6 +91,9 @@ rm -f %{buildroot}%{_mandir}/man8/genpolusers.*
%{_mandir}/man8/chkcon.* %{_mandir}/man8/chkcon.*
%changelog %changelog
* Wed Nov 16 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.6-1mamba
- update to 2.6
* Sat May 19 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.4-1mamba * Sat May 19 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.4-1mamba
- update to 2.1.4 - update to 2.1.4