diff options
Diffstat (limited to 'sysutils/cfengine2/files')
-rw-r--r-- | sysutils/cfengine2/files/patch-CAN-2005-2960 | 30 | ||||
-rw-r--r-- | sysutils/cfengine2/files/patch-Makefile.in | 17 | ||||
-rw-r--r-- | sysutils/cfengine2/files/patch-doc_Makefile.in | 83 | ||||
-rw-r--r-- | sysutils/cfengine2/files/patch-src_cfetool.c | 13 | ||||
-rw-r--r-- | sysutils/cfengine2/files/patch-src_cfetoolgraph.c | 20 |
5 files changed, 157 insertions, 6 deletions
diff --git a/sysutils/cfengine2/files/patch-CAN-2005-2960 b/sysutils/cfengine2/files/patch-CAN-2005-2960 new file mode 100644 index 000000000000..25e497f10556 --- /dev/null +++ b/sysutils/cfengine2/files/patch-CAN-2005-2960 @@ -0,0 +1,30 @@ +diff -u -p -Nr --exclude CVS contrib/vicf.in.orig contrib/vicf.in +--- contrib/vicf.in.orig 2005-02-08 12:48:56.000000000 +0100 ++++ contrib/vicf.in 2005-09-23 12:11:34.000000000 +0200 +@@ -56,12 +56,13 @@ EdFile () { + while [ "$editfile" = "n" ] + do + ${EDITOR} ${CFINPUTS}/.${file}.lock +- cp /dev/null /tmp/cfparse.$$ +- $sbindir/cfengine --no-warn --parse-only --file ${CFINPUTS}/.${file}.lock > /tmp/cfparse.$$ 2>&1 +- if [ -s /tmp/cfparse.$$ ] ++ tmpfile=`mktemp -t tempfile.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1; } ++ trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 ++ $sbindir/cfengine --no-warn --parse-only --file ${CFINPUTS}/.${file}.lock > $tmpfile 2>&1 ++ if [ -s $tmpfile ] + then + echo PARSE ERROR IN NEW INPUT-FILE: +- cat /tmp/cfparse.$$ ++ cat $tmpfile + /usr/ucb/echo -n "Re-edit file? (Y/n) " + read answer + if [ "$answer" = "n" ] +@@ -75,7 +76,7 @@ EdFile () { + fi + done + +- rm -f /tmp/cfparse.$$ ${CFINPUTS}/.${file}.lock ++ rm -f ${CFINPUTS}/.${file}.lock + } + + force=n diff --git a/sysutils/cfengine2/files/patch-Makefile.in b/sysutils/cfengine2/files/patch-Makefile.in new file mode 100644 index 000000000000..cb72f3e3c0c5 --- /dev/null +++ b/sysutils/cfengine2/files/patch-Makefile.in @@ -0,0 +1,17 @@ +--- Makefile.in.orig Sat Oct 1 16:32:09 2005 ++++ Makefile.in Fri Oct 7 10:36:51 2005 +@@ -201,8 +201,12 @@ + @BUILD_DOC_TRUE@DOC_DIR = doc + SUBDIRS = pub src contrib inputs $(DOC_DIR) + EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README +-docdir = $(pkgdatadir) +-doc_DATA = README ChangeLog INSTALL NEWS ++docdir = $(prefix)/share/doc/cfengine ++.if defined(NOPORTDOCS) ++doc_DATA = ++.else ++doc_DATA = AUTHORS ChangeLog README TODO ++.endif + + # + # Some basic clean ups diff --git a/sysutils/cfengine2/files/patch-doc_Makefile.in b/sysutils/cfengine2/files/patch-doc_Makefile.in index 13e4ad0aac7b..dd3452bb8f36 100644 --- a/sysutils/cfengine2/files/patch-doc_Makefile.in +++ b/sysutils/cfengine2/files/patch-doc_Makefile.in @@ -1,18 +1,89 @@ ---- doc/Makefile.in.orig Thu Jul 7 13:32:07 2005 -+++ doc/Makefile.in Thu Jul 7 13:37:09 2005 -@@ -205,14 +205,14 @@ - +--- doc/Makefile.in.orig Sat Oct 1 16:32:08 2005 ++++ doc/Makefile.in Fri Oct 7 10:07:40 2005 +@@ -52,8 +52,12 @@ + CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = ++.if defined(NOPORTDOCS) ++INFO_DEPS = ++.else + INFO_DEPS = cfengine-Reference.info cfengine-Tutorial.info \ + cfengine-Anomalies.info ++.endif + am__TEXINFO_TEX_DIR = $(srcdir) + DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \ + cfengine-Anomalies.dvi +@@ -205,15 +209,23 @@ + # Info used in building and installing HTML files htmlfiles = $(info_TEXINFOS:.texinfo=.html) -htmldir = $(pkgdatadir)/html +htmldir = $(docdir) ++.if defined(NOPORTDOCS) ++html_DATA = ++.else html_DATA = $(htmlfiles) - ++.endif + # Info used in building and installing Postscript files psfiles = $(info_TEXINFOS:.texinfo=.ps) pdffiles = $(info_TEXINFOS:.texinfo=.pdf) dvifiles = $(info_TEXINFOS:.texinfo=.dvi) -docdir = $(pkgdatadir)/doc +docdir = $(prefix)/share/doc/cfengine ++.if defined(NOPORTDOCS) ++doc_DATA = ++.else doc_DATA = $(psfiles) $(pdffiles) - ++.endif + + # Make sure these get distributed with everything else. + EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles) $(psfiles) $(dvifiles) $(pdffiles) +@@ -579,6 +591,7 @@ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done + install-docDATA: $(doc_DATA) ++.if !defined(NOPORTDOCS) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ +@@ -587,6 +600,7 @@ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done ++.endif + + uninstall-docDATA: + @$(NORMAL_UNINSTALL) +@@ -596,6 +610,7 @@ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done + install-htmlDATA: $(html_DATA) ++.if !defined(NOPORTDOCS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ +@@ -604,6 +619,7 @@ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done ++.endif + + uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) +@@ -712,6 +728,7 @@ + install-info: install-info-am + + install-info-am: $(INFO_DEPS) ++.if !defined(NOPORTDOCS) + @$(NORMAL_INSTALL) + test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +@@ -741,6 +758,7 @@ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ + done; \ + else : ; fi ++.endif + install-man: install-man8 + + installcheck-am: diff --git a/sysutils/cfengine2/files/patch-src_cfetool.c b/sysutils/cfengine2/files/patch-src_cfetool.c new file mode 100644 index 000000000000..dcbe06b3386e --- /dev/null +++ b/sysutils/cfengine2/files/patch-src_cfetool.c @@ -0,0 +1,13 @@ +--- src/cfetool.c.orig Thu Oct 6 19:16:39 2005 ++++ src/cfetool.c Thu Oct 6 19:25:48 2005 +@@ -2646,9 +2646,9 @@ void DoBatch(int dbtype) + double val=0; + float val1=0, val2=0, val3=0, val4=0, val5=0, val6=0, val7=0, val8=0, val9=0, val10=0; + int i = 0, j = 0, n = 0, y = 0, k = 0, w = 0; +- time_to_update = false; + int timeint = -1; + struct Average av; ++ time_to_update = false; + + Verbose("Batch mode\n"); + diff --git a/sysutils/cfengine2/files/patch-src_cfetoolgraph.c b/sysutils/cfengine2/files/patch-src_cfetoolgraph.c new file mode 100644 index 000000000000..f1e51df51aff --- /dev/null +++ b/sysutils/cfengine2/files/patch-src_cfetoolgraph.c @@ -0,0 +1,20 @@ +--- src/cfetoolgraph.c.orig Thu Oct 6 19:31:19 2005 ++++ src/cfetoolgraph.c Thu Oct 6 19:32:22 2005 +@@ -542,6 +542,8 @@ void WriteGraphFiles(int dbtype) + void WriteHistogram(int dbtype) + { + int numdays=0; ++ int position, day; ++ int weekly[CF_GRAINS]; + /* Finally, look at the histogram */ + + printf("Writing histogram file now!\n"); +@@ -554,8 +556,6 @@ void WriteHistogram(int dbtype) + } + } + +- int position, day; +- int weekly[CF_GRAINS]; + + switch(dbtype) + { |