Browse code

Bug 1618534: Sysctl security hardening - Systemd: Correct commit after merge conflict

Change-Id: I49bf566c889dccfb542fd84d9e10105ab20a62f9
Reviewed-on: http://photon-jenkins.eng.vmware.com/673
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George

Kumar Kaushik authored on 2016/03/31 03:24:06
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Systemd-228
2 2
 Name:		systemd
3 3
 Version:	228
4
-Release:	12%{?dist}
4
+Release:	13%{?dist}
5 5
 License:	LGPLv2+ and GPLv2+ and MIT
6 6
 URL:		http://www.freedesktop.org/wiki/Software/systemd/
7 7
 Group:		System Environment/Security
... ...
@@ -10,6 +10,7 @@ Distribution:	Photon
10 10
 Source0:	%{name}-%{version}.tar.gz
11 11
 %define sha1 systemd=15475d874dc38f8d759f334bbcf7d8aff4b412da
12 12
 Source1:        99-vmware-hotplug.rules
13
+Source2:        50-security-hardening.conf
13 14
 #patch for ostree
14 15
 Patch0:         systemd-228-mount.patch
15 16
 Patch1:         01-enoX-uses-instance-number-for-vmware-hv.patch
... ...
@@ -107,6 +108,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/journal
107 107
 #cp %{buildroot}/usr/share/factory/etc/pam.d/other %{buildroot}%{_sysconfdir}/pam.d/other
108 108
 find %{buildroot}%{_libdir} -name '*.la' -delete
109 109
 install -Dm 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/udev/rules.d
110
+install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysctl.d
110 111
 
111 112
 %post
112 113
 /sbin/ldconfig
... ...
@@ -129,6 +131,8 @@ rm -rf %{buildroot}/*
129 129
 
130 130
 
131 131
 %changelog
132
+*       Wed Mar 30 2016 Kumar Kaushik <kaushikk@vmware.com>  228-13
133
+-       Install the security hardening script as part of systemd.
132 134
 *       Tue Mar 29 2016 Kumar Kaushik <kaushikk@vmware.com>  228-12
133 135
 -       Added patch for timedatectl /etc/adjtime PR2749.
134 136
 *       Fri Mar 11 2016 Anish Swaminathan <anishs@vmware.com>  228-11