From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f03673966635ae1e1d7f0751b396f3f601562630 Date: Sun, 10 Jun 2012 21:52:11 +0200 Message-ID: <20120610195212.3556D20145@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7937874129106052241==" List-Id: --===============7937874129106052241== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via f03673966635ae1e1d7f0751b396f3f601562630 (commit) via d1e3ffe966c6155061c4ab5f257a1a1334dfa145 (commit) via 6eb163c49b448437b2ce4259a0710a3183d1ef6b (commit) from 7cf06828e7e4d05bf5d784bec07d48f65bf40c33 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f03673966635ae1e1d7f0751b396f3f601562630 Merge: 6eb163c d1e3ffe Author: Michael Tremer Date: Sun Jun 10 21:51:59 2012 +0200 Merge remote-tracking branch 'stevee/cronie' commit d1e3ffe966c6155061c4ab5f257a1a1334dfa145 Author: Stefan Schantl Date: Sun Jun 10 20:00:24 2012 +0200 cronie: Update to 1.4.8. =20 * Enable support for audit, pam and selinux. * Add systemd service file. =20 Fixes #10135. commit 6eb163c49b448437b2ce4259a0710a3183d1ef6b Author: Stefan Schantl Date: Sun Jun 10 18:47:47 2012 +0200 avahi: Add scriptet to create service user and group. =20 Reload dbus configuration after installation. ----------------------------------------------------------------------- Summary of changes: avahi/avahi.nm | 32 +++++++++++++++++++++------ cronie/cronie.nm | 48 +++++++++++++++++++++++++++++++++++----- cronie/systemd/cronie.service | 9 +++++++ 3 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 cronie/systemd/cronie.service Difference in files: diff --git a/avahi/avahi.nm b/avahi/avahi.nm index 3df04f7..1041320 100644 --- a/avahi/avahi.nm +++ b/avahi/avahi.nm @@ -5,7 +5,7 @@ =20 name =3D avahi version =3D 0.6.30 -release =3D 3 +release =3D 4 =20 groups =3D Networking/Zeroconf url =3D http://avahi.org/ @@ -13,12 +13,12 @@ license =3D LGPLv2+ summary =3D Local network service discovery =20 description - Avahi is a system which facilitates service discovery on \ - a local network -- this means that you can plug your laptop or \ - computer into a network and instantly be able to view other people who \ - you can chat with, find printers to print to or find files being \ - shared. This kind of technology is already found in MacOS X (branded \ - 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very \ + Avahi is a system which facilitates service discovery on + a local network -- this means that you can plug your laptop or + computer into a network and instantly be able to view other people who + you can chat with, find printers to print to or find files being + shared. This kind of technology is already found in MacOS X (branded + 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very convenient. end =20 @@ -59,9 +59,23 @@ packages libdaemon>=3D0.14 end =20 + prerequires +=3D shadow-utils + + # Create avahi user and group. + script prein + getent group avahi >/dev/null || groupadd -r avahi + getent passwd avahi >/dev/null || \ + useradd -r -g avahi -d /run/avahi-daemon -s /sbin/nologin \ + -c "Avahi mDNS/DNS-SD Stack" avahi + exit 0 + end + # Just search for new unit files that were just installed. script postin systemctl daemon-reload >/dev/null 2>&1 || : + + # Reload dbus configuration. + systemctl reload dbus.service >/dev/null 2>&1 || : end =20 # Disable the service that is to be removed and stop it if it is still run= ning. @@ -78,6 +92,10 @@ packages # Try to restart the service if it is running. script postup systemctl daemon-reload >/dev/null 2>&1 || : + + # Reload dbus configuration. + systemctl reload dbus.service >/dev/null 2>&1 || : + systemctl try-restart avahi-daemon.service avahi-dnsconfd.service >/dev/n= ull 2>&1 || : end end diff --git a/cronie/cronie.nm b/cronie/cronie.nm index ae94fa5..0ad2b6e 100644 --- a/cronie/cronie.nm +++ b/cronie/cronie.nm @@ -4,35 +4,71 @@ ############################################################################= ### =20 name =3D cronie -version =3D 1.4.7 +version =3D 1.4.8 release =3D 1 =20 groups =3D System/Environment/Base -url =3D https://fedorahosted.org/releases/c/r/cronie/ +url =3D https://fedorahosted.org/cronie/ license =3D MIT and BSD and ISC and GPLv2 summary =3D Cron daemon for executing programs at set times =20 description - Cronie contains the standard UNIX daemon crond that runs specified programs= at \ - scheduled times and related tools. It is a fork of the \ - original vixie-cron and has security and configuration enhancements like \ + Cronie contains the standard UNIX daemon crond that runs specified programs= at + scheduled times and related tools. It is a fork of the + original vixie-cron and has security and configuration enhancements like the ability to use pam and SELinux. end =20 -source_dl =3D +source_dl =3D https://fedorahosted.org/releases/c/r/cronie/ =20 build requires + audit-devel bison libcap-devel libedit-devel + libselinux-devel + pam-devel readline-devel texinfo end + + configure_options +=3D \ + --with-pam \ + --with-audit \ + --with-selinux + + install_cmds + mkdir -pv %{BUILDROOT}%{localstatedir}/spool/cron + end end =20 packages package %{name} + # Just search for new unit files that were just installed. + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + + # Enable cronie on startup. + systemctl enable cronie.service >/dev/null 2>&1 || : + end + + # Disable the service that is to be removed and stop it if it is still run= ning. + script preun + systemctl --no-reload disable cronie.service >/dev/null 2>&1 || : + systemctl stop cronie.service >/dev/null 2>&1 || : + end + + # Just tell systemd that unitfiles have been removed. + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + # Try to restart the service if it is running. + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart cronie.service >/dev/null 2>&1 || : + end end =20 package %{name}-debuginfo diff --git a/cronie/systemd/cronie.service b/cronie/systemd/cronie.service new file mode 100644 index 0000000..16730c3 --- /dev/null +++ b/cronie/systemd/cronie.service @@ -0,0 +1,9 @@ +[Unit] +Description=3DCommand Scheduler +After=3Dsyslog.target auditd.service systemd-user-sessions.service + +[Service] +ExecStart=3D/usr/sbin/crond -n + +[Install] +WantedBy=3Dmulti-user.target hooks/post-receive -- IPFire 3.x development tree --===============7937874129106052241==--