]> git.pld-linux.org Git - packages/systemd.git/blobdiff - systemd.spec
- add systemd-coredump user; filled missing userremove/groupremove
[packages/systemd.git] / systemd.spec
index e65958593dcc65bdeb81a679a1f09f660171577e..ec4967c903a73de2aab665d3278da002ccf7cfb2 100644 (file)
@@ -26,21 +26,17 @@ Summary(pl.UTF-8):  systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       232
-Release:       0.1
+Release:       6
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
-Source0:       https://github.com/systemd/systemd/archive/v%{version}.tar.gz
+Source0:       https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 3e3a0b14050eff62e68be72142181730
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
 Source4:       var-lock.mount
 Source5:       var-run.mount
-Source10:      pld-storage-init-late.service
-Source11:      pld-storage-init.service
-Source12:      pld-wait-storage.service
-Source13:      pld-storage-init.sh
 Source14:      pld-clean-tmp.service
 Source15:      pld-clean-tmp.sh
 Source16:      pld-rc-inetd-generator.sh
@@ -68,13 +64,16 @@ Patch3:             tmpfiles-not-fatal.patch
 Patch4:                udev-ploop-rules.patch
 Patch5:                udevadm-in-sbin.patch
 Patch6:                net-rename-revert.patch
-
+Patch7:                %{name}-lz4.patch
 Patch8:                proc-hidepid.patch
 Patch9:                %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
 Patch11:       optional-tmp-on-tmpfs.patch
 Patch12:       uids_gids.patch
 Patch13:       sysctl.patch
+Patch14:       pld-pam-systemd-user.patch
+Patch15:       gperf-3.1.patch
+Patch16:       %{name}-seccomp_disable_on_i386.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -102,26 +101,21 @@ BuildRequires:    libgcrypt-devel >= 1.4.5
 %{?with_microhttpd:BuildRequires:      libmicrohttpd-devel >= 0.9.33}
 BuildRequires: libmount-devel >= 2.28.2-2
 BuildRequires: libseccomp-devel >= 1.0.0
-%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9}
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.6}
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxslt-progs
 BuildRequires: lz4-devel >= r119
 BuildRequires: m4
 %{?with_pam:BuildRequires:     pam-devel >= 1.1.2}
 BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: python-devel
-BuildRequires: python-lxml
-BuildRequires: python-modules
 %{?with_qrencode:BuildRequires:        qrencode-devel}
-BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.628
 BuildRequires: sed >= 4.0
 %{?with_tests:BuildRequires:   systemd}
 BuildRequires: usbutils >= 0.82
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      %{name}-units = %{epoch}:%{version}-%{release}
+Requires(post,postun): %{name}-units = %{epoch}:%{version}-%{release}
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post):        /bin/setfacl
@@ -129,6 +123,8 @@ Requires(pre):      /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-units = %{epoch}:%{version}-%{release}
 Requires:      /etc/os-release
 Requires:      SysVinit-tools
 Requires:      agetty
@@ -157,6 +153,7 @@ Provides:   group(systemd-network)
 Provides:      group(systemd-resolve)
 Provides:      group(systemd-timesync)
 Provides:      udev-acl = %{epoch}:%{version}-%{release}
+Provides:      user(systemd-coredump)
 Provides:      user(systemd-journal-remote)
 Provides:      user(systemd-journal-upload)
 Provides:      user(systemd-network)
@@ -167,6 +164,9 @@ Provides:   user(systemd-timesync)
 #Obsoletes:    ConsoleKit-x11
 Obsoletes:     systemd-no-compat-tmpfiles
 Obsoletes:     udev-systemd
+# for storage detection / activation services
+Conflicts:     dmraid < 1.0.0-0.rc16.3.3
+Conflicts:     mdadm < 4.0-2
 # sytemd wants pam with pam_systemd.so in system-auth...
 Conflicts:     pam < 1:1.1.5-5
 # ...and sudo hates it
@@ -174,8 +174,8 @@ Conflicts:  sudo < 1:1.7.8p2-4
 # for prefdm script
 Conflicts:     xinitrc-ng < 1.0
 # systemd scripts use options not present in older versions
-Conflicts:     kpartx < 0.4.9-7
-Conflicts:     multipath-tools < 0.4.9-7
+Conflicts:     kpartx < 0.6.1-1
+Conflicts:     multipath-tools < 0.6.1-1
 # no tmpfs on /media, use /run/media/$USER for mounting
 Conflicts:     udisks2 < 1.92.0
 # packages that have dirs under /var/run and/or /var/lock must provide tmpfiles configs
@@ -442,7 +442,7 @@ Summary:    Shared systemd libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone systemd
 Group:         Libraries
 Requires:      libgcrypt >= 1.4.5
-%{?with_selinux:Requires:      libselinux >= 2.1.9}
+%{?with_selinux:Requires:      libselinux >= 2.6}
 Obsoletes:     nss_myhostname
 
 %description libs
@@ -529,7 +529,7 @@ Requires:   coreutils
 Requires:      filesystem >= 3.0-45
 Requires:      kmod >= 15
 Requires:      libblkid >= 2.24
-%{?with_selinux:Requires:      libselinux >= 2.1.9}
+%{?with_selinux:Requires:      libselinux >= 2.6}
 Requires:      setup >= 2.9.0-3
 Requires:      udev-libs = %{epoch}:%{version}-%{release}
 Requires:      uname(release) >= 3.12
@@ -613,13 +613,16 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch5 -p1
 # rejected upstream (do not disable!)
 %patch6 -p1
-
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 cp -p %{SOURCE2} src/systemd_booted.c
 
@@ -632,14 +635,13 @@ cp -p %{SOURCE2} src/systemd_booted.c
 %{__automake}
 
 %configure \
+       CPPFLAGS="%{rpmcppflags} -I/usr/include/lz4" \
        QUOTAON=/sbin/quotaon \
        QUOTACHECK=/sbin/quotacheck \
        SETCAP=/sbin/setcap \
        KILL=/bin/kill \
        KMOD=/sbin/kmod \
        KEXEC=/sbin/kexec \
-       PYTHON="$PYTHON" \
-       PYTHON_BINARY="%{__python}" \
 %if "%{?configure_cache}" == "1"
        --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}.cache \
 %endif
@@ -662,11 +664,12 @@ cp -p %{SOURCE2} src/systemd_booted.c
        --with-rootprefix="" \
        --with-rootlibdir=/%{_lib} \
        --with-sysvinit-path=/etc/rc.d/init.d \
-       --with-sysvrcnd-path=/etc/rc.d
+       --with-sysvrcnd-path=/etc/rc.d \
+       --without-kill-user-processes
 
 %{__make}
 
-./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
+./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd
 
 %{?with_tests:%{__make} check}
 
@@ -755,16 +758,9 @@ ln -s ../var-run.mount $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
 # and remove mounting tmp on tmpfs by default
 %{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants/tmp.mount
 
-# Install and enable storage subsystems support services (RAID, LVM, etc.)
-cp -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init-late.service
-cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init.service
-cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/pld-wait-storage.service
+# add /tmp cleanup service
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{systemdunitdir}/pld-clean-tmp.service
-install -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-storage-init
 install -p %{SOURCE15} $RPM_BUILD_ROOT/lib/systemd/pld-clean-tmp
-
-ln -s ../pld-storage-init-late.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
-ln -s ../pld-storage-init.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
 ln -s ../pld-clean-tmp.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants
 
 # Add inside container only SIGPWR handler which is used by lxc-stop
@@ -819,6 +815,7 @@ install -d $RPM_BUILD_ROOT/var/log
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la \
+       $RPM_BUILD_ROOT/lib/systemd/*.la \
        $RPM_BUILD_ROOT/%{_lib}/*.la
 
 %find_lang %{name}
@@ -839,6 +836,7 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 320 systemd-journal-upload
 %useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
 %groupadd -g 333 systemd-coredump
+%useradd -u 333 -g 333 -d /var/log/journal -s /bin/false -c "Systemd Core Dumper" systemd-coredump
 
 %post
 /bin/systemd-machine-id-setup || :
@@ -852,6 +850,18 @@ if [ $1 -ge 1 ]; then
        /bin/systemctl try-restart systemd-logind.service || :
 fi
 if [ "$1" = "0" ]; then
+       %userremove systemd-coredump
+       %groupremove systemd-coredump
+       %userremove systemd-network
+       %groupremove systemd-network
+       %userremove systemd-resolve
+       %groupremove systemd-resolve
+       %userremove systemd-timesync
+       %groupremove systemd-timesync
+       %userremove systemd-journal-remote
+       %groupremove systemd-journal-remote
+       %userremove systemd-journal-upload
+       %groupremove systemd-journal-upload
        %groupremove systemd-journal
 fi
 
@@ -863,8 +873,14 @@ chmod g+s /var/log/journal
 # https://bugs.freedesktop.org/show_bug.cgi?id=89202
 /bin/getfacl -p /var/log/journal/$(cat /etc/machine-id) | grep -v '^#' | sort -u | /bin/setfacl -R --set-file=- /var/log/journal/$(cat /etc/machine-id) || :
 
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%triggerpostun -- systemd-consoled < 1:232-1
+if [ -f %{_sysconfdir}/vconsole.conf.rpmsave ]; then
+       %{__mv} -f %{_sysconfdir}/vconsole.conf %{_sysconfdir}/vconsole.conf.rpmnew
+       %{__mv} -f %{_sysconfdir}/vconsole.conf.rpmsave %{_sysconfdir}/vconsole.conf
+fi
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %post units
 if [ $1 -eq 1 ]; then
@@ -1065,7 +1081,9 @@ fi
 %dir %{_sysconfdir}/systemd/system/multi-user.target.wants
 %dir %{_sysconfdir}/systemd/system/sockets.target.wants
 %dir %{_sysconfdir}/systemd/system/sysinit.target.wants
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/ctrl-alt-del.target
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/machines.target
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/sysinit.target.wants/systemd-timesyncd.service
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/systemd-user
@@ -1103,8 +1121,8 @@ fi
 %attr(755,root,root) %{_bindir}/systemd-sysv-convert
 %attr(755,root,root) %{_bindir}/timedatectl
 /lib/systemd/import-pubring.gpg
+/lib/systemd/resolv.conf
 %attr(755,root,root) /lib/systemd/pld-clean-tmp
-%attr(755,root,root) /lib/systemd/pld-storage-init
 %attr(755,root,root) /lib/systemd/systemd-ac-power
 %attr(755,root,root) /lib/systemd/systemd-backlight
 %attr(755,root,root) /lib/systemd/systemd-binfmt
@@ -1179,7 +1197,6 @@ fi
 %{_libexecdir}/systemd/boot/efi/systemd-bootaa64.efi
 %endif
 %endif
-%dir %{_libexecdir}/systemd/catalog
 %{_libexecdir}/systemd/catalog/systemd.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be@latin.catalog
@@ -1265,6 +1282,7 @@ fi
 %{_mandir}/man5/binfmt.d.5*
 %{_mandir}/man5/coredump.conf.5*
 %{_mandir}/man5/coredump.conf.d.5*
+%{_mandir}/man5/dnssec-trust-anchors.d.5*
 %{_mandir}/man5/hostname.5*
 %if %{with microhttpd}
 %{_mandir}/man5/journal-remote.conf.5*
@@ -1302,6 +1320,7 @@ fi
 %{_mandir}/man7/systemd.generator.7*
 %{_mandir}/man7/systemd.index.7*
 %{_mandir}/man7/systemd.journal-fields.7*
+%{_mandir}/man7/systemd.offline-updates.7*
 %{_mandir}/man7/systemd.special.7*
 %{_mandir}/man7/systemd.time.7*
 %{_mandir}/man8/kernel-install.8*
@@ -1405,6 +1424,7 @@ fi
 %dir %{_libexecdir}/sysctl.d
 %{_libexecdir}/sysctl.d/50-default.conf
 %dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/catalog
 %dir %{_libexecdir}/systemd/system-shutdown
 %dir %{_libexecdir}/systemd/system-sleep
 %dir %{_libexecdir}/systemd/user
@@ -1491,9 +1511,6 @@ fi
 %{systemdunitdir}/netfs.service
 %{systemdunitdir}/network.service
 %{systemdunitdir}/pld-clean-tmp.service
-%{systemdunitdir}/pld-storage-init-late.service
-%{systemdunitdir}/pld-storage-init.service
-%{systemdunitdir}/pld-wait-storage.service
 %{systemdunitdir}/prefdm.service
 %{systemdunitdir}/quotaon.service
 %{systemdunitdir}/random.service
@@ -1657,8 +1674,6 @@ fi
 %{systemdunitdir}/graphical.target.wants/display-manager.service
 %{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
 %{systemdunitdir}/local-fs.target.wants/pld-clean-tmp.service
-%{systemdunitdir}/local-fs.target.wants/pld-storage-init-late.service
-%{systemdunitdir}/local-fs.target.wants/pld-storage-init.service
 %{systemdunitdir}/local-fs.target.wants/systemd-remount-fs.service
 %{systemdunitdir}/local-fs.target.wants/var-lib-machines.mount
 %{systemdunitdir}/local-fs.target.wants/var-lock.mount
@@ -1821,6 +1836,7 @@ fi
 %attr(755,root,root) /%{_lib}/libnss_systemd.so.2
 %attr(755,root,root) /%{_lib}/libsystemd.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libsystemd.so.0
+%attr(755,root,root) /lib/systemd/libsystemd-shared*.so
 %{_mandir}/man8/libnss_resolve.so.2.8*
 %{_mandir}/man8/libnss_systemd.so.2.8*
 %{_mandir}/man8/nss-resolve.8*
This page took 0.090103 seconds and 4 git commands to generate.