diff --git a/.gitignore b/.gitignore index 755875f..2920079 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ /cockpit-5e1faad.tar.gz +/cockpit-0.* +/x86_64 +/noarch +.build*.log +*.src.rpm +/cockpit.pam diff --git a/cockpit.pam b/cockpit.pam new file mode 100644 index 0000000..567361f --- /dev/null +++ b/cockpit.pam @@ -0,0 +1,16 @@ +#%PAM-1.0 +auth required pam_sepermit.so +auth substack password-auth +auth include postlogin +account required pam_nologin.so +account include password-auth +password include password-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +# pam_selinux.so open should only be followed by sessions to be executed in the user context +session required pam_selinux.so open env_params +session optional pam_keyinit.so force revoke +session include password-auth +session include postlogin + diff --git a/cockpit.spec b/cockpit.spec index ba1603b..ebefcdc 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -2,17 +2,14 @@ %global gitdate 20140204 Name: cockpit -Version: 0.2 -Release: 0.4.%{gitdate}git%{gitrev}%{?dist} +Version: 0.3 +Release: 1%{?dist} Summary: A user interface for Linux servers License: LGPLv2+ URL: http://cockpit-project.org/ -# To generate: make a checkout, and execute -# git submodule init -# git submodule update -# ./test/git-archive-all cockpit-%%{version} %%{gitrev} | gzip -c -9 > cockpit-%%{gitrev}.tar.gz -Source0: cockpit-%{gitrev}.tar.gz +Source0: cockpit-%{version}.tar.bz2 +Source1: cockpit.pam BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gudev-1.0) @@ -74,11 +71,9 @@ This package contains the web assets used by Cockpit. %prep %setup -q rm -rf src/libgsystem/*.{c,doap} -NOCONFIGURE=1 ./autogen.sh %build %configure --disable-static --disable-silent-rules -#--disable-maintainer-mode make %{?_smp_mflags} %check @@ -87,7 +82,8 @@ make %{?_smp_mflags} %install %make_install -find %{buildroot} -name '*.la' -delete +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so rm -f %{buildroot}%{_sysconfdir}/dbus-1/system.d/com.redhat.Cockpit.DBusTests.Test.conf rm -f %{buildroot}%{_unitdir}/cockpit-testing.service @@ -99,7 +95,7 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets %files -%doc AUTHORS COPYING HACKING README +%doc AUTHORS COPYING README.md %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/cockpit-ws.8.gz %doc %{_mandir}/man8/cockpitd.8.gz @@ -114,7 +110,6 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets %{_libexecdir}/cockpit-ws %{_libexecdir}/cockpit-session %{_libexecdir}/cockpit-agent -%{_libdir}/%{name} %{_sharedstatedir}/%{name} %files assets @@ -134,6 +129,9 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets %changelog +* Fri Mar 28 2014 Stef Walter 0.3-1 +- Update to upstream 0.3 release + * Wed Feb 05 2014 Patrick Uiterwijk (LOCAL) - 0.2-0.4.20140204git5e1faad - Redid the release tag diff --git a/sources b/sources index c6c4ca5..ce79810 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71c64f0fbfb5440f6ca022403893a73f cockpit-5e1faad.tar.gz +e8d48d65a6f58ea8363b6dc074a4f3af cockpit-0.3.tar.bz2