View | Details | Raw Unified | Return to bug 85817
Collapse All | Expand All

(-)fcron/Makefile (-31 / +22 lines)
Lines 1-54 Link Here
1
# ex:ts=8
1
# ex:ts=8
2
# New ports collection makefile for:	fcron
2
# New ports collection makefile for:	fcron
3
# Date created:			Mar 1, 2001
3
# Date created:			Sep  6 2005
4
# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
4
# Whom:				Brad Huntting <huntting@glarp.com>
5
#
5
#
6
# $FreeBSD: ports/sysutils/fcron/Makefile,v 1.17 2004/12/07 08:47:42 sem Exp $
6
# $FreeBSD: ports/sysutils/fcron/Makefile,v 1.15 2004/03/14 06:17:23 ade Exp $
7
#
7
#
8
8
9
PORTNAME=	fcron
9
PORTNAME=	fcron
10
PORTVERSION=	2.1.0
10
PORTVERSION=	2.0.2
11
PORTEPOCH=	1
11
CATEGORIES=	sysutils
12
CATEGORIES=	sysutils
12
MASTER_SITES=	${MASTER_SITE_SUNSITE} \
13
MASTER_SITES=	ftp://ftp.seul.org/pub/fcron/ http://fcron.free.fr/archives/
13
		http://fcron.free.fr/
14
DISTNAME=	fcron-${PORTVERSION}.src
14
MASTER_SITE_SUBDIR=	system/daemons/cron
15
DISTNAME=	${PORTNAME}-${PORTVERSION}.src
16
15
17
MAINTAINER=	svenasse@polaris.ca
16
MAINTAINER=	huntting@glarp.com
18
COMMENT=	Fcron is a periodical command scheduler
17
COMMENT=	fcron (stable release) is a periodic command scheduler
19
20
NO_PACKAGE=	"Runaway package build"
21
18
19
USE_RC_SUBR=	fcron
22
USE_AUTOCONF_VER=	213
20
USE_AUTOCONF_VER=	213
23
USE_PERL5=	yes
21
USE_PERL5=	yes
24
CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
22
CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
25
		--with-rootname=root --with-rootgroup=wheel \
23
		--with-rootname=root --with-rootgroup=wheel \
26
		--with-answer-all=yes
24
		--with-answer-all=yes
27
25
28
.if !defined(NOPORTDOCS)
26
WRKSRC=		${WRKDIR}/fcron-${PORTVERSION}
27
28
.if defined(NOPORTDOCS)
29
CONFIGURE_ARGS+=	--with-docdir=${WRKDIR}/docs
30
.else
29
CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
31
CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
30
PLIST_SUB=	PORTVERSION=${PORTVERSION}
31
.endif
32
.endif
32
33
33
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
34
pre-su-install:
34
35
	${INSTALL} -m 644 ${WRKSRC}/files/fcron.conf ${LOCALBASE}/etc/fcron.conf.dist
35
MAN1=	fcrontab.1
36
	${INSTALL} -m 640 ${WRKSRC}/files/fcron.allow ${LOCALBASE}/etc/fcron.allow.dist
36
MAN3=	bitstring.3
37
	${INSTALL} -m 640 ${WRKSRC}/files/fcron.deny ${LOCALBASE}/etc/fcron.deny.dist
37
MAN5=	fcrontab.5 fcron.conf.5
38
MAN8=	fcron.8
39
38
40
post-install:
39
post-install:
41
.if !defined(NOPORTDOCS)
40
	${CHGRP} fcron ${LOCALBASE}/etc/fcron.allow.dist
42
	@${MKDIR} ${DOCSDIR}
41
	${CHGRP} fcron ${LOCALBASE}/etc/fcron.deny.dist
43
	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}
42
	${INSTALL} -m 644 ${FILESDIR}/sample-fcrontab-* ${DOCSDIR}/
44
	@${INSTALL_DATA} ${WRKSRC}/files/fcron.pam ${DOCSDIR}
45
	@${INSTALL_DATA} ${WRKSRC}/files/fcrontab.pam ${DOCSDIR}
46
.endif
47
.for i in allow deny conf
48
.if !exists(${PREFIX}/etc/fcron.$i)
49
	@${CP} -p ${PREFIX}/etc/fcron.$i.dist ${PREFIX}/etc/fcron.$i
50
.endif
51
.endfor
52
	@${CAT} ${PKGMESSAGE}
43
	@${CAT} ${PKGMESSAGE}
53
44
54
.include <bsd.port.mk>
45
.include <bsd.port.mk>
(-)fcron/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (fcron-2.1.0.src.tar.gz) = 054a21772e06ea9b37243c34d38fd9fb
1
MD5 (fcron-2.0.2.src.tar.gz) = 416c55d8a484eb6c9907828009fd649c
2
SIZE (fcron-2.1.0.src.tar.gz) = 147802
2
SIZE (fcron-2.0.2.src.tar.gz) = 169081
(-)fcron/files/fcron.in (+19 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: src/etc/rc.d/cron,v 1.5.2.1 2004/10/10 09:50:53 mtm Exp $
4
#
5
6
# PROVIDE: fcron
7
# REQUIRE: LOGIN
8
# BEFORE: securelevel
9
# KEYWORD: shutdown
10
11
. /etc/rc.subr
12
13
name="fcron"
14
rcvar="`set_rcvar`"
15
command="%%LOCALBASE%%/sbin/${name}"
16
pidfile="/var/run/${name}.pid"
17
18
load_rc_config $name
19
run_rc_command "$1"
(-)fcron/files/patch-Makefile.in (-25 / +23 lines)
Lines 1-29 Link Here
1
--- Makefile.in.org	Wed Jan 23 21:49:55 2002
1
--- Makefile.in.orig	Sat Nov 13 13:56:01 2004
2
+++ Makefile.in	Wed Jan 23 21:50:52 2002
2
+++ Makefile.in	Tue Sep  6 13:38:43 2005
3
@@ -102,23 +102,20 @@
3
@@ -114,7 +114,6 @@
4
 	if test ! -d $(DESTMAN)/man3; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man3 ; fi
5
 	if test ! -d $(DESTMAN)/man5; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man5 ; fi
6
 	if test ! -d $(DESTMAN)/man8; then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTMAN)/man8 ; fi
7
-	if test ! -d $(DESTDOC)/fcron-$(VERSION); then $(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 755 -d $(DESTDOC)/fcron-$(VERSION) ; fi
8
 # create the spool dir (and change its mode if it already exists)
9
 	$(INSTALL) -g $(GROUPNAME) -o $(USERNAME) -m 770 -d $(FCRONTABS)
10
 
11
 	$(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 110 -s fcron $(DESTSBIN)
12
 	$(INSTALL) -g $(GROUPNAME) -o $(USERNAME) -m 6111 -s fcrontab $(DESTBIN)
13
 	$(INSTALL) -g $(ROOTGROUP) -o $(ROOTNAME) -m 6111 -s fcronsighup $(DESTBIN)
14
-	test -f $(ETC)/fcron.allow || test -f $(ETC)/fcron.deny || $(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.allow $(SRCDIR)/files/fcron.deny $(ETC)
15
-	test -f $(ETC)/fcron.conf || $(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.conf $(ETC)
16
-	test "${USEPAM}" = "0" || $(SRCDIR)/script/install-pam-conf $(SRCDIR) $(ETC) $(ROOTNAME) $(ROOTGROUP) "$(INSTALL)"
17
+	$(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.allow $(ETC)/fcron.allow.dist
18
+	$(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.deny $(ETC)/fcron.deny.dist
19
+	$(INSTALL) -m 640 -o $(ROOTNAME) -g $(GROUPNAME) $(SRCDIR)/files/fcron.conf $(ETC)/fcron.conf.dist
20
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcron.8 $(DESTMAN)/man8
21
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcrontab.1 $(DESTMAN)/man1
4
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcrontab.1 $(DESTMAN)/man1
22
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcrontab.5 $(DESTMAN)/man5
5
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcrontab.5 $(DESTMAN)/man5
23
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcron.conf.5 $(DESTMAN)/man5
6
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/fcron.conf.5 $(DESTMAN)/man5
24
 	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/bitstring.3 $(DESTMAN)/man3
7
-	$(INSTALL) -m 644 -o $(ROOTNAME) $(SRCDIR)/doc/bitstring.3 $(DESTMAN)/man3
25
-	$(INSTALL) -m 644 -o $(ROOTNAME) doc/README doc/LICENSE doc/CHANGES doc/*.html \
8
 	$(INSTALL) -m 644 -o $(ROOTNAME) doc/README doc/LICENSE doc/CHANGES doc/*.html \
26
-		 $(DESTDOC)/fcron-$(VERSION)/
9
 		 $(DESTDOC)/fcron-$(VERSION)/
10
 
11
@@ -125,8 +124,6 @@
12
 	if test -f $(ETC)/fcron.deny; then chown $(ROOTNAME):$(GROUPNAME) $(ETC)/fcron.deny ; fi
13
 	if test -f $(ETC)/fcron.allow; then chown $(ROOTNAME):$(GROUPNAME) $(ETC)/fcron.allow ; fi
27
 
14
 
28
 # in order to get correct rights when upgrading :
15
-	$(SRCDIR)/script/boot-install "$(INSTALL) -o $(ROOTNAME)" $(DESTSBIN) $(DEBUG) $(FCRONTABS) $(ANSWERALL) $(SRCDIR)
29
 	find $(FCRONTABS) -type f \( -name "*.orig" -a ! -name "root.orig" \) -exec chown $(USERNAME):$(GROUPNAME) {} \; -exec chmod 640 {} \;
16
-
17
 install-boot: install
18
 	if test "$(DEBUG)" = "1"; then \
19
 	  $(SRCDIR)/script/boot-install "$(INSTALL) -o $(ROOTNAME)" $(DESTSBIN) 0 $(FCRONTABS)  $(ANSWERALL) $(SRCDIR);\
20
@@ -144,7 +141,6 @@
21
 	rm -f $(DESTBIN)/fcronsighup
22
 	rm -fR $(DESTDOC)/fcron-$(VERSION)
23
 	rm -f $(DESTMAN)/man1/fcrontab.1
24
-	rm -f $(DESTMAN)/man3/bitstring.3
25
 	rm -f $(DESTMAN)/man5/fcrontab.5
26
 	rm -f $(DESTMAN)/man5/fcron.conf.5
27
 	rm -f $(DESTMAN)/man8/fcron.8
(-)fcron/files/patch-conf.c (-9 lines)
Lines 1-9 Link Here
1
--- conf.c.orig	Tue Dec  7 11:44:09 2004
2
+++ conf.c	Tue Dec  7 11:44:32 2004
3
@@ -1086,5 +1086,6 @@
4
 	    break ;
5
 
6
       next_file:
7
+	;
8
     }
9
 }
(-)fcron/files/patch-configure.in (-22 lines)
Lines 1-22 Link Here
1
--- configure.in.orig	Sun Jul  8 07:32:17 2001
2
+++ configure.in	Sat Aug 25 14:36:05 2001
3
@@ -201,13 +201,13 @@
4
     fi
5
     ;;
6
   *)
7
-    if test -d "$withval"; then
8
+#    if test -d "$withval"; then
9
       etcdir="$withval"
10
-      AC_MSG_RESULT($withval)
11
-    else
12
-      AC_MSG_ERROR([
13
-Directory $withval does not exist])
14
-    fi
15
+#      AC_MSG_RESULT($withval)
16
+#    else
17
+#      AC_MSG_ERROR([
18
+#Directory $withval does not exist])
19
+#    fi
20
     ;;
21
   esac ],
22
   if test -d "/etc"; then
(-)fcron/files/patch-script::boot-install (-11 lines)
Lines 1-11 Link Here
1
--- script/boot-install.orig	Fri Jul 20 14:44:40 2001
2
+++ script/boot-install	Fri Jul 20 14:44:48 2001
3
@@ -11,7 +11,7 @@
4
 #                    the automatic answer
5
 #                    the src dir
6
 
7
-PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
8
+PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin"
9
 if test -d /usr/ucb; then
10
     PATH=/usr/ucb:$PATH
11
 fi
(-)fcron/files/patch-script::gen-in.pl (+8 lines)
Line 0 Link Here
1
--- script/gen-in.pl.orig	Wed Jun 16 14:36:38 2004
2
+++ script/gen-in.pl	Tue Sep  6 11:29:55 2005
3
@@ -1,4 +1,4 @@
4
-#!/usr/bin/perl
5
+#!/usr/local/bin/perl
6
 
7
 # - read define assignations in config.h
8
 # - read variable assignations in Makefile
(-)fcron/files/patch-script::has_usrgrp.pl (+8 lines)
Line 0 Link Here
1
--- script/has_usrgrp.pl.orig	Wed Jun 16 14:36:38 2004
2
+++ script/has_usrgrp.pl	Tue Sep  6 11:30:21 2005
3
@@ -1,4 +1,4 @@
4
-#!/usr/bin/perl
5
+#!/usr/local/bin/perl
6
 
7
 # call getpwnam() or getgrnam() to check if user or group (given as arg) exists
8
 #   on the system (getpwnam() and getgrnam() use nsswitch.conf, so it works
(-)fcron/files/patch-script::user-group (+18 lines)
Line 0 Link Here
1
--- script/user-group.orig	Sat Nov 13 13:56:04 2004
2
+++ script/user-group	Tue Sep  6 11:49:20 2005
3
@@ -93,12 +93,12 @@
4
 else
5
   echo "no."
6
   CMD=""
7
-  if useradd -D 2> /dev/null; then
8
+  if test "$IS_FREEBSD" -eq 1; then
9
+    CMD="pw useradd $USERNAME -c $USERNAME"
10
+  elif useradd -D 2> /dev/null; then
11
     CMD="useradd -c '$USERNAME' -g $GROUPNAME $USERNAME"
12
   elif adduser -D 2> /dev/null; then
13
     CMD="adduser -c '$USERNAME' -g $GROUPNAME $USERNAME"
14
-  elif test "$IS_FREEBSD" -eq 1; then
15
-    CMD="pw useradd $USERNAME -c $USERNAME"
16
   fi
17
   if test -z "$CMD"; then
18
     echo "Could not determine the command to use to add a user."
(-)fcron/files/sample-fcrontab-operator (+9 lines)
Line 0 Link Here
1
# Derived from the default /etc/crontab for FreeBSD
2
# See fcrontab(5) for syntax and semantics
3
#
4
SHELL=/bin/sh
5
PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
6
HOME=/var/log
7
#
8
# Save some entropy so that /dev/random can re-seed on boot.
9
@nolog 11 /usr/libexec/save-entropy
(-)fcron/files/sample-fcrontab-root (+20 lines)
Line 0 Link Here
1
# Derived from the default /etc/crontab for FreeBSD
2
# See fcrontab(5) for syntax and semantics
3
#
4
SHELL=/bin/sh
5
PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
6
HOME=/var/log
7
#
8
@nolog,serial,lavg5(1.5) 5 /usr/libexec/atrun
9
#
10
# Rotate log files every hour, if necessary.
11
%nolog,hourly,lavg15(0.2) *	newsyslog
12
#
13
# Perform daily/weekly/monthly maintenance.
14
%daily,serial,lavg15(0.2) * * periodic daily
15
%weekly,serial,lavg15(0.2) * * periodic weekly
16
%monthly,serial,lavg15(0.2) * * * periodic monthly
17
#
18
# Adjust the time zone if the CMOS clock keeps local time, as opposed to
19
# UTC time.  See adjkerntz(8) for details.
20
1,31	0-5	*	*	*	root	adjkerntz -a
(-)fcron/pkg-descr (+2 lines)
Lines 8-11 Link Here
8
according to its time of execution, which is normally the same as
8
according to its time of execution, which is normally the same as
9
system up time. 
9
system up time. 
10
10
11
This is the stable release.
12
11
WWW: http://fcron.free.fr/
13
WWW: http://fcron.free.fr/
(-)fcron/pkg-message (-3 / +9 lines)
Lines 1-5 Link Here
1
1
2
This new version of fcron uses PAM support for authentication.
2
	To enable fcron, and disable the default system cron, add
3
Please refer to the fcron.pam and fcrontab.pam files in the
3
	the following lines to your /etc/rc.conf:
4
documentation directory for configuring PAM.
4
5
		fcron_enable="YES"
6
		cron_enable="NO"
7
8
	and move any jobs in /etc/crontab to roots fcrontab(5)
9
	entry.  See DOCSDIR/sample-fcrontab-* for a translation of
10
	the default freebsd /etc/crontab.
5
11
(-)fcron/pkg-plist (-13 / +11 lines)
Lines 1-17 Link Here
1
bin/fcronsighup
2
bin/fcrontab
3
sbin/fcron
4
@unexec if cmp -s %D/etc/fcron.allow %D/etc/fcron.allow.dist; then rm -f %D/etc/fcron.allow; fi
1
@unexec if cmp -s %D/etc/fcron.allow %D/etc/fcron.allow.dist; then rm -f %D/etc/fcron.allow; fi
5
etc/fcron.allow.dist
6
@exec [ -f %B/fcron.allow ] || cp %B/%f %B/fcron.allow
7
@unexec if cmp -s %D/etc/fcron.deny %D/etc/fcron.deny.dist; then rm -f %D/etc/fcron.deny; fi
2
@unexec if cmp -s %D/etc/fcron.deny %D/etc/fcron.deny.dist; then rm -f %D/etc/fcron.deny; fi
8
etc/fcron.deny.dist
9
@exec [ -f %B/fcron.deny ] || cp %B/%f %B/fcron.deny
10
@unexec if cmp -s %D/etc/fcron.conf %D/etc/fcron.conf.dist; then rm -f %D/etc/fcron.conf; fi
3
@unexec if cmp -s %D/etc/fcron.conf %D/etc/fcron.conf.dist; then rm -f %D/etc/fcron.conf; fi
4
@unexec rmdir /var/spool/fcron || true
5
bin/fcronsighup
6
bin/fcrontab
7
etc/fcron.allow.dist
11
etc/fcron.conf.dist
8
etc/fcron.conf.dist
12
@exec [ -f %B/fcron.conf ] || cp %B/%f %B/fcron.conf
9
etc/fcron.deny.dist
13
etc/rc.d/fcron.sh
10
man/man1/fcrontab.1
14
%%PORTDOCS%%share/doc/fcron/FAQ
11
man/man5/fcron.conf.5
15
%%PORTDOCS%%share/doc/fcron/fcron.pam
12
man/man5/fcrontab.5
16
%%PORTDOCS%%share/doc/fcron/fcrontab.pam
13
man/man8/fcron.8
17
%%PORTDOCS%%@unexec rmdir %D/share/doc/fcron 2>/dev/null || true
14
sbin/fcron
15
%%PORTDOCS%%@unexec rm -rf %D/share/doc/fcron-stable 2>/dev/null || true

Return to bug 85817