diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2001-01-21 00:38:16 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2001-01-21 00:38:16 +0000 |
commit | 4e6ae5fdf57dc2ea0ae9361a943ba67ded6e04da (patch) | |
tree | d47e9073eb984024641ca3d62fe59b737ed04e28 /sysutils/cfengine3 | |
parent | Upgrade to 4.32 (diff) |
Upgrade to cfengine 1.6.1 to (finally) fix remote vulnerability.
Remove old maintainer for inactivity.
Submitted by: Gordon Tetlow <gordont@bluemtn.net>
Notes
Notes:
svn path=/head/; revision=37381
Diffstat (limited to 'sysutils/cfengine3')
-rw-r--r-- | sysutils/cfengine3/Makefile | 20 | ||||
-rw-r--r-- | sysutils/cfengine3/distinfo | 2 | ||||
-rw-r--r-- | sysutils/cfengine3/files/patch-aa | 30 | ||||
-rw-r--r-- | sysutils/cfengine3/files/patch-ac | 43 | ||||
-rw-r--r-- | sysutils/cfengine3/pkg-plist | 32 |
5 files changed, 103 insertions, 24 deletions
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile index 31d29f3f4b3f..976e903599af 100644 --- a/sysutils/cfengine3/Makefile +++ b/sysutils/cfengine3/Makefile @@ -6,15 +6,13 @@ # PORTNAME= cfengine -PORTVERSION= 1.5.4 +PORTVERSION= 1.6.1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hioslo.no/pub/cfengine/ \ ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= cfengine -MAINTAINER= jseger@FreeBSD.org - -FORBIDDEN= "Remote root vulnerability" +MAINTAINER= ports@FreeBSD.org .if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h) LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper @@ -22,6 +20,20 @@ LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper CFLAGS+= -pthread USE_AUTOCONF=yes +USE_GMAKE=yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" +MAN8= cfengine.8 + +post-install: +.for binary in cfengine cfd cfrun cfkey + strip ${PREFIX}/sbin/${binary} +.endfor +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/${PORTNAME} +.for docfile in cf-security.html cfengine-Reference.html cfengine-Tutorial.html + ${INSTALL_MAN} ${WRKSRC}/doc/${docfile} ${PREFIX}/share/doc/${PORTNAME} +.endfor +.endif + .include <bsd.port.mk> diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo index c9eaffa61e0d..e8566ef68535 100644 --- a/sysutils/cfengine3/distinfo +++ b/sysutils/cfengine3/distinfo @@ -1 +1 @@ -MD5 (cfengine-1.5.4.tar.gz) = adb7f15c42842adb74436a17df38693e +MD5 (cfengine-1.6.1.tar.gz) = 89e2f94456666f6dbde5016d7b972263 diff --git a/sysutils/cfengine3/files/patch-aa b/sysutils/cfengine3/files/patch-aa index ffdfe212966e..abcf4a95f6c5 100644 --- a/sysutils/cfengine3/files/patch-aa +++ b/sysutils/cfengine3/files/patch-aa @@ -1,11 +1,25 @@ ---- src/Makefile.in.orig Thu Oct 28 16:50:34 1999 -+++ src/Makefile.in Thu Oct 28 16:50:37 1999 -@@ -130,7 +130,7 @@ - LEX= @LEX@ +--- src/Makefile.in.orig Tue Dec 26 06:58:05 2000 ++++ src/Makefile.in Mon Jan 8 20:33:09 2001 +@@ -80,19 +80,19 @@ + CFLAGS = @CFLAGS@ # -Wreturn-type -Wstrict-prototypes -Wmissing-prototypes # -Wuninitialized + YFLAGS = -d LEXLIB = @LEXLIB@ +-LDADD = -L../pub -lpub ++LDADD = -L../pub -lpub -ldes --LDFLAGS= @LDFLAGS@ -+LDFLAGS= @LDFLAGS@ -pthread - LIBS= @LIBS@ + sbin_PROGRAMS = cfengine cfd cfrun cfkey + + cfengine_SOURCES = cfengine.c do.c wrapper.c report.c client.c process.c ifconf.c image.c item.c item-ext.c item-file.c 2Dlist.c globals.c classes.c misc.c parse.c edittools.c patches.c install.c link.c tidy.c filedir.c eval.c modes.c chflags.c locks.c mount.c macro.c filenames.c varstring.c wildcard.c cfparse.y comparray.c read.c checksums.c proto.c filters.c copy.c repository.c rotate.c errors.c cflex.l net.c df.c log.c encrypt.c popen.c sensible.c acl.c dce_acl.c + + +-cfengine_LDADD = -L../pub -lpub $(LEXLIB) ++cfengine_LDADD = -L../pub -lpub $(LEXLIB) -ldes + + cfd_SOURCES = cfd.c parse.c install.c cfparse.c chflags.c cflex.l item.c item-ext.c varstring.c popen.c globals.c filenames.c macro.c eval.c read.c classes.c misc.c 2Dlist.c modes.c locks.c wildcard.c copy.c rotate.c net.c acl.c dce_acl.c log.c errors.c encrypt.c filters.c patches.c + + +-cfd_LDADD = -L../pub -lpub $(LEXLIB) ++cfd_LDADD = -L../pub -lpub $(LEXLIB) -ldes + + cfrun_SOURCES = cfrun.c item.c filenames.c proto.c popen.c net.c read.c log.c patches.c globals.c - DEFS= @DEFS@ diff --git a/sysutils/cfengine3/files/patch-ac b/sysutils/cfengine3/files/patch-ac index b912a4ed4371..d1e64063487e 100644 --- a/sysutils/cfengine3/files/patch-ac +++ b/sysutils/cfengine3/files/patch-ac @@ -1,11 +1,32 @@ ---- contrib/Makefile.in.orig Wed Aug 19 07:15:49 1998 -+++ contrib/Makefile.in Wed Aug 19 07:16:06 1998 -@@ -28,7 +28,7 @@ - ${MKINSTALLDIR} ${sbindir} - for x in $?; \ - do \ -- ${INSTALL_PROGRAM} $$x ${sbindir}; \ -+ ${INSTALL_SCRIPT} $$x ${sbindir}; \ - done - - clean: +--- configure.in.orig Mon Dec 18 12:12:07 2000 ++++ configure.in Mon Jan 8 20:52:29 2001 +@@ -60,13 +60,13 @@ + AC_PROG_RANLIB + AC_PROG_INSTALL + +-AC_PATH_PROG(LATEX, latex, /bin/false, \ ++AC_PATH_PROG(LATEX, latex, true, \ + $PATH:$prefix/bin:/usr/bin:/usr/local/bin) +-AC_PATH_PROG(TEXI2DVI, texi2dvi, /bin/false, \ ++AC_PATH_PROG(TEXI2DVI, texi2dvi, true, \ + $PATH:$prefix/bin:/usr/bin:/usr/local/bin) +-AC_PATH_PROG(DVIPS, dvips, /bin/false, \ ++AC_PATH_PROG(DVIPS, dvips, true, \ + $PATH:$prefix/bin:/usr/bin:/usr/local/bin) +-AC_PATH_PROG(MAKEINFO, makeinfo, /bin/false, \ ++AC_PATH_PROG(MAKEINFO, makeinfo, true, \ + $PATH:$prefix/bin:/usr/bin:/usr/local/bin) + + +--- doc/Makefile.in.orig Tue Dec 26 06:58:18 2000 ++++ doc/Makefile.in Mon Jan 8 22:33:39 2001 +@@ -446,8 +446,7 @@ + install-exec-am: + install-exec: install-exec-am + +-install-data-am: install-info-am install-man install-htmlDATA \ +- install-psDATA ++install-data-am: install-info-am install-man + install-data: install-data-am + + install-am: all-am diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist index 2daf6cfdfb3d..394e94e32bd0 100644 --- a/sysutils/cfengine3/pkg-plist +++ b/sysutils/cfengine3/pkg-plist @@ -1,8 +1,33 @@ +@unexec install-info --delete %D/info/cfengine-Reference.info %D/info/dir +@unexec install-info --delete %D/info/cfengine-Tutorial.info %D/info/dir +info/cfengine-Reference.info +info/cfengine-Reference.info-1 +info/cfengine-Reference.info-2 +info/cfengine-Reference.info-3 +info/cfengine-Reference.info-4 +info/cfengine-Reference.info-5 +info/cfengine-Reference.info-6 +info/cfengine-Reference.info-7 +info/cfengine-Tutorial.info +info/cfengine-Tutorial.info-1 +info/cfengine-Tutorial.info-2 +info/cfengine-Tutorial.info-3 +info/cfengine-Tutorial.info-4 +info/cfengine-Tutorial.info-5 +@exec install-info %D/info/cfengine-Reference.info %D/info/dir +@exec install-info %D/info/cfengine-Tutorial.info %D/info/dir +sbin/cfcron sbin/cfd sbin/cfdoc sbin/cfengine sbin/cfkey +sbin/cfmail +sbin/cfmailfilter sbin/cfrun +sbin/cfwrap +sbin/vicf +share/cfengine/cf.chflags.example +share/cfengine/cf.freebsd.example share/cfengine/cf.ftp.example share/cfengine/cf.groups.example share/cfengine/cf.linux.example @@ -17,7 +42,14 @@ share/cfengine/cf.users.example share/cfengine/cfd.conf.example share/cfengine/cfdaily share/cfengine/cfengine.conf.example +share/cfengine/cfengine.el share/cfengine/cfmail share/cfengine/cfrc.example +share/cfengine/cfrun.hosts.example share/cfengine/cfwrap +share/cfengine/start-cfd +share/doc/cfengine/cf-security.html +share/doc/cfengine/cfengine-Reference.html +share/doc/cfengine/cfengine-Tutorial.html @dirrm share/cfengine +@dirrm share/doc/cfengine |