Add protection of yum package (RhBug:1639363)

https://bugzilla.redhat.com/show_bug.cgi?id=1639363
jrohel · Mar 7, 2019 · 3ccabe3 · 3ccabe3
1 parent 3670558
commit 3ccabe3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/dnf.spec b/dnf.spec
@@ -428,12 +428,14 @@ ln -sr  %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
 %{_mandir}/man8/yum.8*
 %{_mandir}/man8/yum-shell.8*
 %{_mandir}/man1/yum-aliases.1*
+%config(noreplace) %{confdir}/protected.d/yum.conf
 %else
 %exclude %{_mandir}/man8/yum-shell.8*
 %exclude %{_mandir}/man1/yum-aliases.1*
 %exclude %{_sysconfdir}/yum/pluginconf.d
 %exclude %{_sysconfdir}/yum/protected.d
 %exclude %{_sysconfdir}/yum/vars
+%exclude %{confdir}/protected.d/yum.conf
 %endif
 
 %if "%{yum_subpackage_name}" == "nextgen-yum4"

diff --git a/etc/dnf/protected.d/CMakeLists.txt b/etc/dnf/protected.d/CMakeLists.txt
@@ -1 +1 @@
-INSTALL (FILES "dnf.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
+INSTALL (FILES "dnf.conf" "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
diff --git a/etc/dnf/protected.d/yum.conf b/etc/dnf/protected.d/yum.conf
@@ -0,0 +1 @@
+yum
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		INSTALL (FILES "dnf.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
		INSTALL (FILES "dnf.conf" "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)