diff --git a/mcstrans-0.3.4.tgz b/mcstrans-0.3.4.tgz deleted file mode 100644 index 1514e872d7cf2c49590918d2d006bad21f9dd704..0000000000000000000000000000000000000000 Binary files a/mcstrans-0.3.4.tgz and /dev/null differ diff --git a/mcstrans-3.1.tar.gz b/mcstrans-3.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1e7c02b15d8269b3dbe3bf983469a52537871f15 Binary files /dev/null and b/mcstrans-3.1.tar.gz differ diff --git a/mcstrans.spec b/mcstrans.spec index c0a8bd7870e7cd14bc7b0423db7a13208a2d4c9c..50eda0f75822f7b20ddca21be1923828fc4754b3 100644 --- a/mcstrans.spec +++ b/mcstrans.spec @@ -1,20 +1,19 @@ Name: mcstrans -Version: 0.3.4 -Release: 17 +Version: 3.1 +Release: 1 Summary: SELinux Translation Daemon License: GPL2 -URL: https://src.fedoraproject.org/rpms/mcstrans -Source0: https://src.fedoraproject.org/repo/pkgs/mcstrans/%{name}-%{version}.tgz -Source1: mcstransd.service +URL: https://github.com/SELinuxProject/selinux/wiki +Source: https://github.com/SELinuxProject/selinux/releases/download/20200710/mcstrans-3.1.tar.gz BuildRequires: gcc systemd-units make -BuildRequires: libselinux-devel >= 1.30.3-1 +BuildRequires: libselinux-devel >= %{version} BuildRequires: libcap-devel pcre-devel libsepol-devel libsepol-static Requires: pcre Requires(pre): systemd Requires(post): systemd -Provides: libsetrans -Obsoletes: libsetrans +Provides: libsetrans = %{version}-%{release} +Obsoletes: libsetrans < %{version}-%{release} Provides: setransd %description @@ -41,44 +40,38 @@ mcstrans-help include help files for man page %setup -q %build -make clean -make CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" LIBDIR="%{_libdir}" %{?_smp_mflags} +%set_build_flags + +make LIBDIR="%{_libdir}" %{?_smp_mflags} %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_sysconfdir}/selinux/mls/setrans.d -mkdir -p %{buildroot}%{_usr}/share/mcstrans -mkdir -p %{buildroot}/%{_libdir} mkdir -p %{buildroot}/%{_lib} +mkdir -p %{buildroot}/%{_libdir} +mkdir -p %{buildroot}%{_usr}/share/mcstrans +mkdir -p %{buildroot}%{_sysconfdir}/selinux/mls/setrans.d -make SHLIBDIR="%{buildroot}/%{_lib}" SBINDIR="%{buildroot}%{_sbindir}" DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install +make DESTDIR="%{buildroot}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" SBINDIR="%{_sbindir}" install rm -f %{buildroot}%{_libdir}/*.a cp -r share/* %{buildroot}%{_usr}/share/mcstrans/ mkdir -p %{buildroot}%{_unitdir} -install -m644 %{SOURCE1} %{buildroot}%{_unitdir} +ln -s %{_unitdir}/mcstrans.service %{buildroot}/%{_unitdir}/mcstransd.service rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/mcstrans %post -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post mcstransd.service %preun -if [ $1 -eq 0 ]; then - /usr/bin/systemctl --no-reload mcstransd.service >/dev/null 2>&1 || : - /usr/bin/systemctl stop mcstransd.service > /dev/null 2>&1 || : -fi +%systemd_preun mcstransd.service %postun -/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ]; then - /usr/bin/systemctl try-restart mcstransd.service >/dev/null 2>&1 || : -fi +%systemd_postun mcstransd.service %files -%dir %{_sysconfdir}/selinux/mls/setrans.d -%{_unitdir}/mcstransd.service /usr/sbin/mcstransd +%{_unitdir}/mcstrans.service +%{_unitdir}/mcstransd.service +%dir %{_sysconfdir}/selinux/mls/setrans.d %dir %{_usr}/share/mcstrans %defattr(0644,root,root,0755) %dir %{_usr}/share/mcstrans/util @@ -88,9 +81,15 @@ fi %{_usr}/share/mcstrans/util/* %files help +%{_mandir}/man5/*.5.gz %{_mandir}/man8/*.8.gz +%{_mandir}/ru/man5/*.5.gz +%{_mandir}/ru/man8/*.8.gz %changelog +* Thu Jul 23 2020 openEuler Buildteam - 3.1-1 +- update to 3.1 + * Thu Feb 13 2020 openEuler Buildteam - 0.3.4-17 - add BuildRequires: make diff --git a/mcstransd.service b/mcstransd.service deleted file mode 100644 index 03fa8996d23666578e659625a89a2e5d2fdea5b8..0000000000000000000000000000000000000000 --- a/mcstransd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description= Daemon used to translate SELinux MCS/MLS labels to human readable form -After=syslog.target -ConditionPathExists=/etc/selinux/mls/setrans.d - -[Service] -Type=forking -PIDFile=/run/mcstransd.pid -ExecStart=/usr/sbin/mcstransd - -[Install] -WantedBy=multi-user.target