Date: Wed, 30 Jan 2013 09:07:51 GMT From: Loic Pefferkorn <loic-freebsd@loicp.eu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/175693: [patch] sysutils/cfengine34: update to 3.4.2 Message-ID: <201301300907.r0U97pkP064316@red.freebsd.org> Resent-Message-ID: <201301300910.r0U9A0CS057841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175693 >Category: ports >Synopsis: [patch] sysutils/cfengine34: update to 3.4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jan 30 09:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Loic Pefferkorn >Release: 8.3 >Organization: >Environment: FreeBSD vm0 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr 9 21:23:18 UTC 2012 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Hello, There is a new release in cfengine-3.4.x branch. I found that the previous patchs applied in the port are no longer necessary. Thanks, Loic >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN cfengine34.orig/Makefile cfengine34/Makefile --- cfengine34.orig/Makefile 2013-01-30 10:28:30.000000000 +0100 +++ cfengine34/Makefile 2013-01-30 10:28:44.000000000 +0100 @@ -2,7 +2,7 @@ # $FreeBSD: ports/sysutils/cfengine34/Makefile,v 1.5 2013/01/08 14:43:14 svnexp Exp $ PORTNAME= cfengine -PORTVERSION= 3.4.1 +PORTVERSION= 3.4.2 CATEGORIES= sysutils MASTER_SITES= http://cfengine.com/source-code/download?file= diff -ruN cfengine34.orig/distinfo cfengine34/distinfo --- cfengine34.orig/distinfo 2013-01-30 10:28:30.000000000 +0100 +++ cfengine34/distinfo 2013-01-30 10:29:14.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (cfengine-3.4.1.tar.gz) = af57460dc1ac0a451447fb5e98c8c070e20d3e4a9f07c71ad9bf5f7eeec31108 -SIZE (cfengine-3.4.1.tar.gz) = 4697144 +SHA256 (cfengine-3.4.2.tar.gz) = 7548ecf3d95468705aed86ec237ebccb6618983386cee67ff47cab46ab1c2472 +SIZE (cfengine-3.4.2.tar.gz) = 4687590 diff -ruN cfengine34.orig/files/patch-ext-Makefile.am cfengine34/files/patch-ext-Makefile.am --- cfengine34.orig/files/patch-ext-Makefile.am 2013-01-30 10:28:30.000000000 +0100 +++ cfengine34/files/patch-ext-Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ ---- ext/Makefile.am.orig 2012-11-26 03:13:20.000000000 -0800 -+++ ext/Makefile.am 2012-11-27 15:39:01.000000000 -0800 -@@ -1,4 +1,4 @@ --sbin_PROGRAMS = rpmvercmp -+sbin_PROGRAMS = - - rpmvercmp_LDADD = ../pub/libcfpub.la - diff -ruN cfengine34.orig/files/patch-ext-Makefile.in cfengine34/files/patch-ext-Makefile.in --- cfengine34.orig/files/patch-ext-Makefile.in 2013-01-30 10:28:30.000000000 +0100 +++ cfengine34/files/patch-ext-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ ---- ext/Makefile.in.orig 2012-11-26 03:13:28.000000000 -0800 -+++ ext/Makefile.in 2012-11-27 15:46:24.000000000 -0800 -@@ -52,7 +52,7 @@ - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ --sbin_PROGRAMS = rpmvercmp$(EXEEXT) -+sbin_PROGRAMS = - subdir = ext - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -72,8 +72,8 @@ - CONFIG_CLEAN_VPATH_FILES = - am__installdirs = "$(DESTDIR)$(sbindir)" - PROGRAMS = $(sbin_PROGRAMS) --rpmvercmp_SOURCES = rpmvercmp.c --rpmvercmp_OBJECTS = rpmvercmp.$(OBJEXT) -+rpmvercmp_SOURCES = -+rpmvercmp_OBJECTS = - rpmvercmp_DEPENDENCIES = ../pub/libcfpub.la - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -104,8 +104,8 @@ - AM_V_GEN = $(am__v_GEN_@AM_V@) - am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) - am__v_GEN_0 = @echo " GEN " $@; --SOURCES = rpmvercmp.c --DIST_SOURCES = rpmvercmp.c -+SOURCES = -+DIST_SOURCES = - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ -@@ -382,9 +382,6 @@ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --rpmvercmp$(EXEEXT): $(rpmvercmp_OBJECTS) $(rpmvercmp_DEPENDENCIES) $(EXTRA_rpmvercmp_DEPENDENCIES) -- @rm -f rpmvercmp$(EXEEXT) -- $(AM_V_CCLD)$(LINK) $(rpmvercmp_OBJECTS) $(rpmvercmp_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -392,8 +389,6 @@ - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmvercmp.Po@am__quote@ -- - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po diff -ruN cfengine34.orig/files/patch-src-files_select.c cfengine34/files/patch-src-files_select.c --- cfengine34.orig/files/patch-src-files_select.c 2013-01-30 10:28:30.000000000 +0100 +++ cfengine34/files/patch-src-files_select.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/files_select.c.orig 2012-10-03 17:59:39.000000000 +0000 -+++ src/files_select.c 2012-10-03 18:00:44.000000000 +0000 -@@ -27,7 +27,8 @@ - - #include "env_context.h" - #include "files_names.h" - #include "files_interfaces.h" -+#include "promises.h" - - static int SelectTypeMatch(struct stat *lstatptr, Rlist *crit); - static int SelectOwnerMatch(char *path, struct stat *lstatptr, Rlist *crit); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301300907.r0U97pkP064316>