1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- Update to 3.0.2

PR:		ports/108008
Submitted by:	Brad Huntting <huntting at glarp.com> (maintainer)
This commit is contained in:
Rong-En Fan 2007-01-17 07:30:11 +00:00
parent 4bee7abc2f
commit 7d6b6ced47
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=182603
7 changed files with 6 additions and 99 deletions

View File

@ -7,8 +7,7 @@
#
PORTNAME= fcron
PORTVERSION= 3.0.1
PORTREVISION= 1
PORTVERSION= 3.0.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://fcron.free.fr/archives/ \
@ -21,7 +20,6 @@ COMMENT= A periodic command scheduler
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf:259
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
--with-rootname=root --with-rootgroup=wheel \
@ -37,7 +35,7 @@ MAN5= fcron.conf.5 fcrontab.5
MAN8= fcron.8
PAMDIR?= /etc/pam.d
PLIST_SUB+= PAMDIR=${PAMDIR}
PLIST_SUB+= PAMDIR=etc/pam.d
PORTDOCS= *

View File

@ -1,3 +1,3 @@
MD5 (fcron-3.0.1.src.tar.gz) = 8e5dcb3a646c11294294895954ef0a48
SHA256 (fcron-3.0.1.src.tar.gz) = 31288b04619bb9c7cd5fe6ff004c1e2c1340685cec2d0fa8725259c491699de9
SIZE (fcron-3.0.1.src.tar.gz) = 536972
MD5 (fcron-3.0.2.src.tar.gz) = f35e6af41d356ebcb38882f86a14fb94
SHA256 (fcron-3.0.2.src.tar.gz) = ea25f4e9a78f6872c65cc97aa18c018b548e9fcd73b06d77c312e635ecf9ad48
SIZE (fcron-3.0.2.src.tar.gz) = 540559

View File

@ -1,8 +0,0 @@
--- config.h.in.orig Mon Feb 6 14:44:52 2006
+++ config.h.in Tue May 9 17:15:19 2006
@@ -424,3 +424,5 @@
#define O_SYNC O_FSYNC
#endif
+/* Define if (struct sockaddr) has an sa_len field. */
+#undef HAVE_SA_LEN

View File

@ -1,20 +0,0 @@
--- configure.in.orig Mon Jan 9 17:21:24 2006
+++ configure.in Tue May 9 17:04:30 2006
@@ -57,6 +57,17 @@
AC_STRUCT_TM
AC_TYPE_UID_T
+dnl Check for post-Reno style struct sockaddr
+AC_CACHE_CHECK([for sa_len],
+ ac_cv_sa_len,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>], [int main(void) {
+ struct sockaddr t;t.sa_len = 0;}],
+ ac_cv_sa_len=yes,ac_cv_sa_len=no)])
+if test $ac_cv_sa_len = yes; then
+ AC_DEFINE(HAVE_SA_LEN)
+fi
+
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP

View File

@ -1,29 +0,0 @@
--- fcrondyn.c.orig Mon Feb 6 14:44:52 2006
+++ fcrondyn.c Tue May 9 15:24:22 2006
@@ -399,17 +399,21 @@
int fd = -1;
struct sockaddr_un addr;
int len = 0;
+ int sa_len;
if ( (fd = socket(PF_UNIX, SOCK_STREAM, 0)) == -1 )
die_e("could not create socket");
addr.sun_family = AF_UNIX;
- if ( (len = strlen(fifofile)) > sizeof(addr.sun_path) )
- die("Error : fifo file path too long (max is %d)", sizeof(addr.sun_path));
- strncpy(addr.sun_path, fifofile, sizeof(addr.sun_path) - 1);
- addr.sun_path[sizeof(addr.sun_path)-1] = '\0';
+ if ( (len = strlen(fifofile)) > sizeof(addr.sun_path) - 1 )
+ die("Error : fifo file path too long (max is %d)", sizeof(addr.sun_path) - 1);
+ strncpy(addr.sun_path, fifofile, sizeof(addr.sun_path));
+ sa_len = (addr.sun_path - (char *)&addr) + len;
+#if HAVE_SA_LEN
+ addr.sun_len = sa_len;
+#endif
- if ( connect(fd, (struct sockaddr *) &addr, sizeof(addr.sun_family) + len) < 0 )
+ if ( connect(fd, (struct sockaddr *) &addr, sa_len) < 0 )
die_e("Cannot connect() to fcron (check if fcron is running)");
if ( authenticate_user(fd) == ERR ) {

View File

@ -1,34 +0,0 @@
--- socket.c.orig Mon Feb 6 14:44:52 2006
+++ socket.c Tue May 9 16:33:19 2006
@@ -134,6 +134,7 @@
{
struct sockaddr_un addr;
int len = 0;
+ int sa_len;
/* used in fcron.c:main_loop():select() */
FD_ZERO(&read_set);
@@ -145,15 +146,19 @@
}
addr.sun_family = AF_UNIX;
- if ( (len = strlen(fifofile)) > sizeof(addr.sun_path) ) {
- error("Error : fifo file path too long (max is %d)", sizeof(addr.sun_path));
+ if ( (len = strlen(fifofile)) > sizeof(addr.sun_path) - 1) {
+ error("Error : fifo file path too long (max is %d)", sizeof(addr.sun_path) - 1);
goto err;
}
- strncpy(addr.sun_path, fifofile, sizeof(addr.sun_path) - 1);
+ strncpy(addr.sun_path, fifofile, sizeof(addr.sun_path));
addr.sun_path[sizeof(addr.sun_path) -1 ] = '\0';
+ sa_len = (addr.sun_path - (char *)&addr) + len;
+#if HAVE_SA_LEN
+ addr.sun_len = sa_len;
+#endif
unlink(fifofile);
- if (bind(listen_fd, (struct sockaddr*) &addr, sizeof(addr.sun_family)+len+1) != 0){
+ if (bind(listen_fd, (struct sockaddr*) &addr, sa_len) != 0){
error_e("Cannot bind socket to '%s'", fifofile);
goto err;
}

View File

@ -21,7 +21,7 @@ if [ "$2" = PRE-INSTALL ]; then
if /usr/sbin/pw usershow $user 2>/dev/null; then
echo "Using already existing user \"$user\"."
else
if /usr/sbin/pw useradd $user -u $uid -g $group -c "fcron pseudo-user"; then
if /usr/sbin/pw useradd $user -u $uid -g $group -s /sbin/nologin -c "fcron pseudo-user"; then
echo "Added user \"$user\"."
else
echo "Unable to add user \"$user\"."