Re: UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
Hi, ...and slightly more updated patch. There are some more things that can happen to this port, namely staticlly linking, but I've found the configure script unhappy; instead of messing around with that now, I'd like to move forward and put this in, then work on the above, plus possibly subpackaging it (though I'm leaning towards not anymore) and maybe doing a split install. Previous MAINTAINER has been OK with moving forward for quite some time now :) Feedback, comments, OKs? I'm running it in production without problems (amd64), so I'm ok, but I'm not a developer. It would be great if this could get committed. Maybe I was a little bit too early with saying without problems. Cf-serverd hangs will checking the policy after the local configuration has changed. It hangs on the following line (from cf-serverd -v): Checking policy with command /var/cfengine/bin/cf-promises -f /var/cfengine/inputs/promises.cf Any suggestions? Kind regards, Martijn Rijkeboer
Re: UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
On Sun, May 06, 2012 at 02:29:10PM +0200, Martijn Rijkeboer wrote: Maybe I was a little bit too early with saying without problems. Cf-serverd hangs will checking the policy after the local configuration has changed. It hangs on the following line (from cf-serverd -v): Checking policy with command /var/cfengine/bin/cf-promises -f /var/cfengine/inputs/promises.cf Does /var/cfengine/bin/cf-promises exist? jirib
Re: UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
Maybe I was a little bit too early with saying without problems. Cf-serverd hangs will checking the policy after the local configuration has changed. It hangs on the following line (from cf-serverd -v): Checking policy with command /var/cfengine/bin/cf-promises -f /var/cfengine/inputs/promises.cf Does /var/cfengine/bin/cf-promises exist? Yes and if I run it from the command line it works fine. Kind regards, Martijn Rijkeboer
Re: UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
Hi, ...and slightly more updated patch. There are some more things that can happen to this port, namely staticlly linking, but I've found the configure script unhappy; instead of messing around with that now, I'd like to move forward and put this in, then work on the above, plus possibly subpackaging it (though I'm leaning towards not anymore) and maybe doing a split install. Previous MAINTAINER has been OK with moving forward for quite some time now :) Feedback, comments, OKs? I'm running it in production without problems (amd64), so I'm ok, but I'm not a developer. It would be great if this could get committed. Kind regards, Martijn Rijkeboer
Re: UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
Hi Okan, ...and slightly more updated patch. There are some more things that can happen to this port, namely staticlly linking, but I've found the configure script unhappy; instead of messing around with that now, I'd like to move forward and put this in, then work on the above, plus possibly subpackaging it (though I'm leaning towards not anymore) and maybe doing a split install. I don't know if static linking will work, the official CFEngine binaries (Ubuntu 64 bit) are dynamic linked however. These have the binaries in /var/cfengine/bin and the needed libraries in /var/cfengine/lib. # file /var/cfengine/bin/cf-agent /var/cfengine/bin/cf-agent: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.0, stripped # ls -l /var/cfengine/bin/ total 2916 -rwxr-xr-x 1 root root 109704 2012-04-11 11:41 cf-agent -rwxr-xr-x 1 root root 36552 2012-04-11 11:41 cf-execd -rwxr-xr-x 1 root root 11096 2012-04-11 11:41 cf-key -rwxr-xr-x 1 root root 48608 2012-04-11 11:41 cf-monitord -rwxr-xr-x 1 root root 11048 2012-04-11 11:41 cf-promises -rwxr-xr-x 1 root root 49200 2012-04-11 11:41 cf-report -rwxr-xr-x 1 root root 19544 2012-04-11 11:41 cf-runagent -rwxr-xr-x 1 root root 73928 2012-04-11 11:41 cf-serverd -rwxr-xr-x 1 root root 2586063 2011-09-06 15:13 cf-twin -rwxr-xr-x 1 root root 23536 2012-04-11 11:41 tchmgr # ls -l /var/cfengine/lib/ -rw-r--r-- 1 root root 1611376 2012-04-11 11:41 libcrypto.so.0.9.8 lrwxrwxrwx 1 root root 21 2012-05-01 09:21 libpcreposix.so.0 - libpcreposix.so.0.0.0 -rw-r--r-- 1 root root7480 2012-04-11 11:41 libpcreposix.so.0.0.0 lrwxrwxrwx 1 root root 16 2012-05-01 09:21 libpcre.so.0 - libpcre.so.0.0.1 -rw-r--r-- 1 root root 243144 2012-04-11 11:41 libpcre.so.0.0.1 lrwxrwxrwx 1 root root 12 2012-05-01 09:21 libpq.so.5 - libpq.so.5.3 -rw-r--r-- 1 root root 136232 2012-04-11 11:41 libpq.so.5.3 lrwxrwxrwx 1 root root 20 2012-05-01 09:21 libpromises.so.1 - libpromises.so.1.0.0 -rw-r--r-- 1 root root 900840 2012-04-11 11:41 libpromises.so.1.0.0 -rw-r--r-- 1 root root 325704 2012-04-11 11:41 libssl.so.0.9.8 lrwxrwxrwx 1 root root 24 2012-05-01 09:21 libtokyocabinet.so.9 - libtokyocabinet.so.9.8.0 -rw-r--r-- 1 root root 490464 2012-04-11 11:41 libtokyocabinet.so.9.8.0 lrwxrwxrwx 1 root root 16 2012-05-01 09:21 libvirt.so.0 - libvirt.so.0.8.4 -rw-r--r-- 1 root root 907944 2012-04-11 11:41 libvirt.so.0.8.4 lrwxrwxrwx 1 root root 16 2012-05-01 09:21 libxml2.so.2 - libxml2.so.2.7.7 -rw-r--r-- 1 root root 1317624 2012-04-11 11:41 libxml2.so.2.7.7 lrwxrwxrwx 1 root root 13 2012-05-01 09:21 libz.so.1 - libz.so.1.2.5 -rw-r--r-- 1 root root 98072 2012-04-11 11:41 libz.so.1.2.5 Feedback, comments, OKs? I'll try to test it somewhere this week. Kind regards, Martijn Rijkeboer
Re: UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
On Fri 2012.04.27 at 21:45 +0200, Martijn Rijkeboer wrote:
Hi,
The following patch, based on Okan's work, updates cfengine to
3.3.0. Tested on amd64.
thanks for the non-stop testing!
...and slightly more updated patch. There are some more things that
can happen to this port, namely staticlly linking, but I've found the
configure script unhappy; instead of messing around with that now, I'd
like to move forward and put this in, then work on the above, plus
possibly subpackaging it (though I'm leaning towards not anymore) and
maybe doing a split install.
Previous MAINTAINER has been OK with moving forward for quite some time
now :)
Feedback, comments, OKs?
Cheers,
Okan
Index: Makefile
===
RCS file: /home/open/anoncvs/cvs/ports/sysutils/cfengine/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile16 Sep 2011 11:41:39 - 1.38
+++ Makefile30 Apr 2012 19:55:15 -
@@ -1,29 +1,40 @@
# $OpenBSD: Makefile,v 1.38 2011/09/16 11:41:39 espie Exp $
-COMMENT= GNU system administration tool for networks
+COMMENT = GNU system administration tool for networks
-DISTNAME= cfengine-2.2.10
-REVISION= 2
-CATEGORIES=sysutils
+DISTNAME = cfengine-3.3.0
+CATEGORIES = sysutils
-HOMEPAGE= http://www.cfengine.org/
+HOMEPAGE = http://www.cfengine.com/
+MASTER_SITES = ${HOMEPAGE}source-code/download?file=${DISTFILES}dummy=/
-MAINTAINER=William Yodlowsky b...@openbsd.rutgers.edu
+MAINTAINER = Okan Demirmen o...@openbsd.org
+
+# GPLv3
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = c crypto m pcre pthread qdbm
+
+CONFIGURE_STYLE = gnu
+USE_GMAKE =Yes
+
+LIB_DEPENDS = databases/qdbm \
+ devel/pcre
+
+CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS += --with-openssl=/usr \
+ --with-pcre \
+ --with-qdbm \
+ --without-mysql \
+ --without-postgresql \
+ --disable-shared \
+ --enable-static \
+ --enable-fhs
-# GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP= Yes
-
-WANTLIB= c crypto m pthread lib/db4/db=4
-
-MASTER_SITES= ${HOMEPAGE}/tarballs/
-
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-docs
-USE_GROFF =Yes
-
-LIB_DEPENDS= databases/db/v4
+NO_REGRESS = Yes
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/open/anoncvs/cvs/ports/sysutils/cfengine/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo1 Sep 2009 14:25:15 - 1.12
+++ distinfo24 Apr 2012 18:25:08 -
@@ -1,5 +1,5 @@
-MD5 (cfengine-2.2.10.tar.gz) = O5D/i/LslBzTPPtl9QEvFg==
-RMD160 (cfengine-2.2.10.tar.gz) = Z/09yAJw3AAIh+Pb8m83IzjiYA8=
-SHA1 (cfengine-2.2.10.tar.gz) = AyvsC8Wf/ucXlCLpbf2QKvv5Q0A=
-SHA256 (cfengine-2.2.10.tar.gz) = 80aXzFLhNCxexLRaSt+fv/36BaaL3HxTOC9y0D4QZ4M=
-SIZE (cfengine-2.2.10.tar.gz) = 2690333
+MD5 (cfengine-3.3.0.tar.gz) = 1AQm/MRH5vFYGmq9YRbqIA==
+RMD160 (cfengine-3.3.0.tar.gz) = HNSGvK83OhAnC4g0bz+PXTlOG7U=
+SHA1 (cfengine-3.3.0.tar.gz) = FawAmsrr+PtALCPzYyRwVVvEjss=
+SHA256 (cfengine-3.3.0.tar.gz) = FwplzONbmzM1lFQ7mzSA5dnBnCjidUMeblijvpNywKc=
+SIZE (cfengine-3.3.0.tar.gz) = 1236769
Index: patches/patch-configure
===
RCS file:
/home/open/anoncvs/cvs/ports/sysutils/cfengine/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure 1 Sep 2009 14:25:15 - 1.7
+++ patches/patch-configure 30 Apr 2012 20:01:15 -
@@ -1,12 +1,23 @@
-$OpenBSD: patch-configure,v 1.7 2009/09/01 14:25:15 okan Exp $
configure.orig Sat Apr 11 15:59:34 2009
-+++ configure Thu May 28 17:33:23 2009
-@@ -23738,7 +23738,7 @@ $as_echo_n checking Checking for GCC Specific compile
- if test x$GCC = xyes; then
+$OpenBSD$
+--- configure.orig Tue Apr 10 02:20:47 2012
configure Mon Apr 30 14:01:08 2012
+@@ -13629,7 +13629,7 @@ fi
+ if test x$enable_fhs = xyes; then :
-- GCC_CFLAG=-g -O2 -Wreturn-type -Wmissing-prototypes -Wuninitialized
-+ GCC_CFLAG=
- { $as_echo $as_me:$LINENO: result: yes 5
- $as_echo yes 6; }
+- projlibdir='${libexecdir}/cfengine'
++ projlibdir='${exec_prefix}/lib/cfengine'
+ projdatadir='${exec_prefix}/share/cfengine'
+ projdocdir='${exec_prefix}/share/doc/cfengine'
+
+@@ -15485,7 +15485,9 @@ _ACEOF
+
+ fi
+
+-ac_fn_c_check_type $LINENO socklen_t ac_cv_type_socklen_t #include
UPDATE: sysutils/cfengine 2.2.10 - 3.3.0
Hi,
The following patch, based on Okan's work, updates cfengine to
3.3.0. Tested on amd64.
Kind regards,
Martijn Rijkeboer
Index: Makefile
===
RCS file: /cvs/ports/sysutils/cfengine/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile16 Sep 2011 11:41:39 - 1.38
+++ Makefile27 Apr 2012 19:30:20 -
@@ -2,28 +2,39 @@
COMMENT= GNU system administration tool for networks
-DISTNAME= cfengine-2.2.10
-REVISION= 2
+DISTNAME= cfengine-3.3.0
CATEGORIES=sysutils
-HOMEPAGE= http://www.cfengine.org/
+HOMEPAGE= https://www.cfengine.org/
-MAINTAINER=William Yodlowsky b...@openbsd.rutgers.edu
+MAINTAINER=Okan Demirmen o...@openbsd.org
-# GPLv2+
+# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto m pthread lib/db4/db=4
+WANTLIB= c crypto m pthread pcre qdbm
-MASTER_SITES= ${HOMEPAGE}/tarballs/
+MASTER_SITES=
${HOMEPAGE}source-code/download?file=${DISTFILES}dummy=/
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-docs
-USE_GROFF =Yes
-LIB_DEPENDS= databases/db/v4
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
+
+CONFIGURE_ARGS+= --with-openssl=/usr \
+ --with-pcre \
+ --with-qdbm \
+ --without-mysql \
+ --without-postgresql \
+ --enable-static \
+ --disable-shared \
+ --enable-fhs
+
+USE_GMAKE= Yes
+
+LIB_DEPENDS= databases/qdbm devel/pcre
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/sysutils/cfengine/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo1 Sep 2009 14:25:15 - 1.12
+++ distinfo27 Apr 2012 19:30:20 -
@@ -1,5 +1,5 @@
-MD5 (cfengine-2.2.10.tar.gz) = O5D/i/LslBzTPPtl9QEvFg==
-RMD160 (cfengine-2.2.10.tar.gz) = Z/09yAJw3AAIh+Pb8m83IzjiYA8=
-SHA1 (cfengine-2.2.10.tar.gz) = AyvsC8Wf/ucXlCLpbf2QKvv5Q0A=
-SHA256 (cfengine-2.2.10.tar.gz) =
80aXzFLhNCxexLRaSt+fv/36BaaL3HxTOC9y0D4QZ4M=
-SIZE (cfengine-2.2.10.tar.gz) = 2690333
+MD5 (cfengine-3.3.0.tar.gz) = 1AQm/MRH5vFYGmq9YRbqIA==
+RMD160 (cfengine-3.3.0.tar.gz) = HNSGvK83OhAnC4g0bz+PXTlOG7U=
+SHA1 (cfengine-3.3.0.tar.gz) = FawAmsrr+PtALCPzYyRwVVvEjss=
+SHA256 (cfengine-3.3.0.tar.gz) =
FwplzONbmzM1lFQ7mzSA5dnBnCjidUMeblijvpNywKc=
+SIZE (cfengine-3.3.0.tar.gz) = 1236769
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/cfengine/patches/patch-configure,v
retrieving revision 1.7
diff -u -r1.7 patch-configure
--- patches/patch-configure 1 Sep 2009 14:25:15 - 1.7
+++ patches/patch-configure 27 Apr 2012 19:30:20 -
@@ -1,12 +1,23 @@
-$OpenBSD: patch-configure,v 1.7 2009/09/01 14:25:15 okan Exp $
configure.orig Sat Apr 11 15:59:34 2009
-+++ configure Thu May 28 17:33:23 2009
-@@ -23738,7 +23738,7 @@ $as_echo_n checking Checking for GCC Specific
compile
- if test x$GCC = xyes; then
+$OpenBSD$
+--- configure.orig Wed Apr 18 21:38:11 2012
configure Wed Apr 18 21:40:27 2012
+@@ -13629,7 +13629,7 @@ fi
+ if test x$enable_fhs = xyes; then :
-- GCC_CFLAG=-g -O2 -Wreturn-type -Wmissing-prototypes -Wuninitialized
-+ GCC_CFLAG=
- { $as_echo $as_me:$LINENO: result: yes 5
- $as_echo yes 6; }
+- projlibdir='${libexecdir}/cfengine'
++ projlibdir='${exec_prefix}/lib/cfengine'
+ projdatadir='${exec_prefix}/share/cfengine'
+ projdocdir='${exec_prefix}/share/doc/cfengine'
+
+@@ -15485,7 +15485,9 @@ _ACEOF
+
+ fi
+
+-ac_fn_c_check_type $LINENO socklen_t ac_cv_type_socklen_t
#include sys/socket.h
++ac_fn_c_check_type $LINENO socklen_t ac_cv_type_socklen_t
++#include sys/types.h
++#include sys/socket.h
+
+ if test x$ac_cv_type_socklen_t = xyes; then :
Index: patches/patch-doc_Makefile_in
===
RCS file: patches/patch-doc_Makefile_in
diff -N patches/patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 1 Sep 2009 14:25:15 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.5 2009/09/01 14:25:15 okan Exp $
doc/Makefile.in.orig Sat Apr 11 15:59:32 2009
-+++ doc/Makefile.inThu May 28 17:32:35 2009
-@@ -69,7 +69,7 @@ NROFF = nroff
- MANS = $(man_MANS)
- docDATA_INSTALL = $(INSTALL_DATA)
- htmlDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(doc_DATA) $(html_DATA)
-+DATA =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -697,7 +697,7 @@ info:
