Accepting request 198736 from Base:System

- define PIDIDIR to "/run" instead of the (outdated) definition 
  coming from glibc "paths.h"
- systemd: there is no mail-transfer-agent target anymore, services
  must be ordered After= a list of possible MTA. (forwarded request 198383 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/198736
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cronie?expand=0&rev=48
This commit is contained in:
Tomáš Chvátal 2013-09-13 12:44:01 +00:00 committed by Git OBS Bridge
commit f51dfe0cb9
4 changed files with 23 additions and 1 deletions

View File

@ -1,6 +1,7 @@
[Unit]
Description=Command Scheduler
After=mail-transfer-agent.target ypbind.service nscd.service network.target
After=ypbind.service nscd.service network.target
After=postfix.service sendmail.service exim.service
[Service]
ExecStart=/usr/sbin/cron -n

11
cronie-piddir.patch Normal file
View File

@ -0,0 +1,11 @@
--- cronie-1.4.8.orig/src/pathnames.h
+++ cronie-1.4.8/src/pathnames.h
@@ -37,7 +37,7 @@
* (Don't ask why the default is "/etc/".)
*/
#ifdef _PATH_VARRUN
-# define PIDDIR _PATH_VARRUN
+# define PIDDIR "/run/"
#else
# define PIDDIR SYSCONFDIR "/"
#endif

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Sep 10 21:30:58 UTC 2013 - crrodriguez@opensuse.org
- define PIDIDIR to "/run" instead of the (outdated) definition
coming from glibc "paths.h"
- systemd: there is no mail-transfer-agent target anymore, services
must be ordered After= a list of possible MTA.
-------------------------------------------------------------------
Sun Apr 14 02:14:21 UTC 2013 - crrodriguez@opensuse.org

View File

@ -60,6 +60,7 @@ Patch9: cronie-1.4.8-bug_756197.diff
Patch10: cronie-nofork-nopid.patch
# PATCH-FIX-UPSTREAM bnc#786096
Patch11: bug-786096_cronie-fdleak.diff
Patch12: cronie-piddir.patch
Conflicts: cron <= 4.1
# When finish update protection of sles11 we could uncomment line bellow and drop all
# ugly hacks with subpackage cron needed for proper update proces
@ -106,6 +107,7 @@ overloaded in settings.
cp %{S:7} ./cron_to_cronie.README
%patch10
%patch11 -p1
%patch12 -p1
%build
# fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked
export CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\""