From b8bc09f95db8570b63d6064fa4e654a232556001 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Thu, 16 Sep 2010 12:15:43 +0000 Subject: Revision bump. Use shared libraries by default. Fix some QA warnings during compile. Package-Manager: portage-2.2_rc83/cvs/Linux x86_64 --- net-misc/cfengine/ChangeLog | 11 +- net-misc/cfengine/Manifest | 22 ++-- net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild | 134 +++++++++++++++++++++ net-misc/cfengine/cfengine-3.0.5_p1.ebuild | 132 -------------------- .../files/cfengine-3.0.5_p1-Makefile.am.patch | 29 +++++ .../files/cfengine-3.0.5_p1-configure.ac.patch | 40 +++--- .../cfengine/files/cfengine-3.0.5_p1-regex.c.patch | 12 ++ 7 files changed, 222 insertions(+), 158 deletions(-) create mode 100644 net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild delete mode 100644 net-misc/cfengine/cfengine-3.0.5_p1.ebuild create mode 100644 net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch create mode 100644 net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch (limited to 'net-misc/cfengine') diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog index 1fa8872c777a..f3f8032538c7 100644 --- a/net-misc/cfengine/ChangeLog +++ b/net-misc/cfengine/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/cfengine # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.105 2010/09/01 20:23:20 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.106 2010/09/16 12:15:42 idl0r Exp $ + +*cfengine-3.0.5_p1-r1 (16 Sep 2010) + + 16 Sep 2010; Christian Ruppert -cfengine-3.0.5_p1.ebuild, + +cfengine-3.0.5_p1-r1.ebuild, +files/cfengine-3.0.5_p1-Makefile.am.patch, + files/cfengine-3.0.5_p1-configure.ac.patch, + +files/cfengine-3.0.5_p1-regex.c.patch: + Revision bump. Use shared libraries by default. Fix some QA warnings during + compile. *cfengine-3.0.5_p1 (01 Sep 2010) diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest index 33fd522fa77e..293330b1a172 100644 --- a/net-misc/cfengine/Manifest +++ b/net-misc/cfengine/Manifest @@ -6,7 +6,9 @@ AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6ab AUX cf-execd.rc6 263 RMD160 bec43d07a575100aba0e845b70d2296ec1936417 SHA1 313fd7150e56cb62241863f9ae27edc1ba86b1b5 SHA256 a5fc7f9994c48fc18885d07ddef7e3a69abd500e6a0e2eff2f688f54e886d1b9 AUX cf-monitord.rc6 275 RMD160 75fe87edaaeac30a40abf0dbf3bf41b6d1a73ba7 SHA1 b6b35fae103c593aee295da36fb5cc3389492205 SHA256 3e78f87709c8abd69bcc4a2c25787f986655c8c7d1221784600c59af23535bed AUX cf-serverd.rc6 271 RMD160 55ef90418fb1f6ca943c0807ba520644d6b2c20d SHA1 91e0b17009e80be23f6886e71b3584dc9533a3d6 SHA256 6829f3cd53334a657bf808ec96b995f2510baf2a16f2712b4609e09d5eaaff7d -AUX cfengine-3.0.5_p1-configure.ac.patch 13373 RMD160 d172348b78e5a79fee47b3b85a6c9ee3e828c012 SHA1 219caac39d86758fc2b2c8cbee51bc5f4bdf0a44 SHA256 3051079f8fa9930e56e63d29f502a8b9e1970724628a1c2bb7e8330eb5cb0be5 +AUX cfengine-3.0.5_p1-Makefile.am.patch 1010 RMD160 63be934e2e0529f320034882cfa7a477bf818d6b SHA1 5370668dc725135cf27252c4928c54e6560ca0e7 SHA256 17558b112bdd3991f4ca18a135e8c96cd10f5477dab5eed208d8f33222ca4dac +AUX cfengine-3.0.5_p1-configure.ac.patch 13597 RMD160 645163b58d05124f03dc8aa4525954f7412ce038 SHA1 a716dc0af3f835a5327e0e9096ef53d7c0e6120b SHA256 82ff6baf5e8c0215ddda4824d233cd9ab7a144e6bc8c409112980c03cc804835 +AUX cfengine-3.0.5_p1-regex.c.patch 330 RMD160 d5cf6c473f11432b6d215666a0257f1ed980ff44 SHA1 cb4c994df51d91a45ca1d73fef6f9f8951d61a8a SHA256 bc50e35480ab2fb0837f5a68d3ce5d33e06f098ee7c219f4b5c7fe63326ecf4d AUX cfenvd.rc6 254 RMD160 cbbb932dfee81318437f27b0e644b3201d6e4664 SHA1 d27f693a0744cbbd8f06ec85779935fc1a3181f2 SHA256 de0877e26bbb5cd8eb5da1827308b8fa00c9ce487e61263306c4b57e3ba9e150 AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df7747bded2a2d9c5bdcfb1bebc3e3c9ef463 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7f7598154775bf9f180383f69294a00624a69735 SHA256 c1a5a2af3b7e41a9b1c6d5e252e7a3673ec17d12ed3fa0aa34581b5893c8f833 @@ -19,17 +21,17 @@ EBUILD cfengine-2.2.10-r2.ebuild 3026 RMD160 207e3472692821d04ac70539038abf895c9 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d EBUILD cfengine-3.0.4.ebuild 2976 RMD160 49d0fe986fe15528eb4978850be26548ae76d33b SHA1 d155348f12bfdf5cb072f9e99bfeba142bb3d3be SHA256 e35e0c67f0e50b4a57cca3b49a0b298bb24011b6577517611cf50b0057772dad EBUILD cfengine-3.0.5.ebuild 2976 RMD160 c099526c8658650ca8f111628c2cf97b797e1c3c SHA1 f05732b9c9858e7b29dccc207ea6ec4db60643bd SHA256 bd4e1fcd4f7b10a795c9acc45030a647e98d516bafc7679d6f3629383f8bfa05 -EBUILD cfengine-3.0.5_p1.ebuild 3578 RMD160 2c29743c8959cbba4d5f805dcb4e577c6e007376 SHA1 4a0e8d1796e36b73e9d38ed57df364352a3c1e0b SHA256 7454cfeaec9192dd88c11f0cfe4f290c41530ba9c9ee1f9d9a90448b20fd4787 -MISC ChangeLog 17450 RMD160 814c31f2b49ac7f3f56fd778dca5ef109520a0d7 SHA1 cf38794d583deae5796a19ea80e7fa6c13ae0256 SHA256 e7500503066b48f0a48e2bfc848bec7b0c19e376e5ccceaaef03d395146401ff +EBUILD cfengine-3.0.5_p1-r1.ebuild 3667 RMD160 34a70eb44c47cfcc5e02fc69b704b331c3a32046 SHA1 8db85e6faaecf79ea0c3b2b738ec63fe996befe8 SHA256 32f924e075084b56536798d88028037e80eda280e69bcdc70c009dd78bf0ee82 +MISC ChangeLog 17820 RMD160 4a069382ad36fc4483595f8903eb6ac7b3794393 SHA1 29771aa02fb44a4df776e3b0736fdee519f7eb36 SHA256 97da6ab435eeb920b0f0679470d7fed7f80ca188aa94f5bf68ee28c7619a9e7a MISC metadata.xml 2550 RMD160 54b3002fb2ec4fa40c1f8ada30a96888dce49152 SHA1 783075e090785dd673ac6ba68c5ec20706348c9b SHA256 7872950fe463d7c39fe36a2381ca3819784a52325069b2bc607ddd5849934640 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQEcBAEBAgAGBQJMfrbRAAoJEMOx0zmdw4Z1UA0H/jF1I8B/LZyVYfQ52vxVo0e4 -dtC1d3rT7oCAxSWfzTMy1vyXXuKiXspmMYC2AA433HH/WBVq4nTNSBkuN1Jtr0H1 -s1oDtSCw+WWi/RPH5mT36ndsD5/PAZp/T8DC2A7EzFbcPVxb5PV6tNjoUN1/qtxC -3yr1PXuF+N69PWoOHkRP5QNujr7sWODiHZL+/iRwJwh/bNpwmC56i0ndzYz6/v8/ -gXAyNgB/VIfKBS1+YrgEXuE4qxqRHRAOuiNL2+WXC25iRRtMTgzpWsrZrTNfo5q2 -9KuDL1MtpB5mS9QNvfimZTh5+Q/rI0Xu5IfKl/+V9FW/PzzLMlUzfHabUXuuxT8= -=sels +iQEcBAEBAgAGBQJMkgpyAAoJEMOx0zmdw4Z1erQH/0DDDUm+oBOWQcG5BmXj/vtj +p0omabzELnzV7pksOV0jrRLe+DXX36wSUn2gOuqLknnNNII+Yftk6ia7ENBy56jc +8l0jKHmnP6BQTasiW8nX93dewYAiRbEqFO8R05eNq0RyyPHnS2oiuRgRdes5mKLK +u+asonxNhY27oGosSOeEvStO/9LVU+x1fli392BVzxXmLdrwNUU2ORCv6fQJT2li +2ZjTznFIXC5OGgs9a2Q2coS85kclDtGSeojNvTDdJ8w2K+Rk00qG5isIY4Z+DStK +u5kvTPTq54FTWIEq10hHHoJ33JBBkDOsoizyWkVA+aSew5257a7R2k7hvRoibDw= +=Fv2M -----END PGP SIGNATURE----- diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild new file mode 100644 index 000000000000..66294a83e634 --- /dev/null +++ b/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild,v 1.1 2010/09/16 12:15:42 idl0r Exp $ + +EAPI="3" + +inherit eutils autotools + +MY_PV="${PV//_beta/b}" +MY_PV="${MY_PV/_p/p}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="An automated suite of programs for configuring and maintaining +Unix-like computers" +HOMEPAGE="http://www.cfengine.org/" +SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="3" +KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" + +IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax" + +DEPEND=">=sys-libs/db-4 + gd? ( media-libs/gd ) + graphviz? ( media-gfx/graphviz ) + ldap? ( net-nds/openldap ) + libvirt? ( app-emulation/libvirt ) + mysql? ( virtual/mysql ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql-base ) + selinux? ( sys-libs/libselinux ) + tokyocabinet? ( dev-db/tokyocabinet ) + qdbm? ( dev-db/qdbm ) + !tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) ) + >=dev-libs/openssl-0.9.7" +RDEPEND="${DEPEND}" +PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/${P}-configure.ac.patch" + epatch "${FILESDIR}/${P}-Makefile.am.patch" + epatch "${FILESDIR}/${P}-regex.c.patch" + eautoreconf +} + +src_configure() { + local myconf + + if use mysql || use postgres ; then + myconf="--with-sql" + else + myconf="--without-sql" + fi + + if ! use qdbm && ! use tokyocabinet; then + myconf="${myconf} --with-berkeleydb=/usr" + fi + + # Enforce /var/cfengine for historical compatibility + econf \ + --docdir=/usr/share/doc/"${PF}" \ + --with-workdir=/var/cfengine \ + ${myconf} \ + $(use_with gd) \ + $(use_with graphviz) \ + $(use_with ldap) \ + $(use_with libvirt) \ + $(use_with pcre) \ + $(use_with qdbm) \ + $(use_enable selinux) \ + $(use_with tokyocabinet) + + # Fix Makefile to skip inputs, see below "examples" + sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die + + # We install documentation through portage + sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die + + if use tests; then + # Fix Makefiles to install tests in correct directory + for i in file_masters file_operands units ; do + sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \ + tests/${i}/Makefile || die + done + else + sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die + fi +} + +src_install() { + newinitd "${FILESDIR}"/cf-serverd.rc6 cf-servd || die + newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die + newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die + + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README TODO INSTALL + + if use examples; then + docinto examples + dodoc inputs/*.cf || die + fi + + # Create cfengine working directory + dodir /var/cfengine/bin + fperms 700 /var/cfengine + + # Copy cfagent into the cfengine tree otherwise cfexecd won't + # find it. Most hosts cache their copy of the cfengine + # binaries here. This is the default search location for the + # binaries. + for bin in know promises agent monitord serverd execd runagent key report; do + dosym /usr/sbin/cf-$bin /var/cfengine/bin/$bin || die + done + + if use html; then + docinto html + dohtml -r docs/ || die + fi +} + +pkg_postinst() { + einfo + einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." + einfo + einfo "To run cfengine out of cron every half hour modify your crontab:" + einfo "0,30 * * * * /usr/sbin/cf-execd -F" + einfo + + elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:" + elog "/usr/sbin/cf-key" +} diff --git a/net-misc/cfengine/cfengine-3.0.5_p1.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1.ebuild deleted file mode 100644 index 50ca38c894b1..000000000000 --- a/net-misc/cfengine/cfengine-3.0.5_p1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1.ebuild,v 1.2 2010/09/01 20:25:47 idl0r Exp $ - -EAPI="3" - -inherit eutils autotools - -MY_PV="${PV//_beta/b}" -MY_PV="${MY_PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An automated suite of programs for configuring and maintaining -Unix-like computers" -HOMEPAGE="http://www.cfengine.org/" -SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="3" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" - -IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax" - -DEPEND=">=sys-libs/db-4 - gd? ( media-libs/gd ) - graphviz? ( media-gfx/graphviz ) - ldap? ( net-nds/openldap ) - libvirt? ( app-emulation/libvirt ) - mysql? ( virtual/mysql ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql-base ) - selinux? ( sys-libs/libselinux ) - tokyocabinet? ( dev-db/tokyocabinet ) - qdbm? ( dev-db/qdbm ) - !tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) ) - >=dev-libs/openssl-0.9.7" -RDEPEND="${DEPEND}" -PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/${P}-configure.ac.patch" - eautoreconf -} - -src_configure() { - local myconf - - if use mysql || use postgres ; then - myconf="--with-sql" - else - myconf="--without-sql" - fi - - if ! use qdbm && ! use tokyocabinet; then - myconf="${myconf} --with-berkeleydb=/usr" - fi - - # Enforce /var/cfengine for historical compatibility - econf \ - --docdir=/usr/share/doc/"${PF}" \ - --with-workdir=/var/cfengine \ - ${myconf} \ - $(use_with gd) \ - $(use_with graphviz) \ - $(use_with ldap) \ - $(use_with libvirt) \ - $(use_with pcre) \ - $(use_with qdbm) \ - $(use_enable selinux) \ - $(use_with tokyocabinet) - - # Fix Makefile to skip inputs, see below "examples" - sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die - - # We install documentation through portage - sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die - - if use tests; then - # Fix Makefiles to install tests in correct directory - for i in file_masters file_operands units ; do - sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \ - tests/${i}/Makefile || die - done - else - sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die - fi -} - -src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-servd || die - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die - - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README TODO INSTALL - - if use examples; then - docinto examples - dodoc inputs/*.cf || die - fi - - # Create cfengine working directory - dodir /var/cfengine/bin - fperms 700 /var/cfengine - - # Copy cfagent into the cfengine tree otherwise cfexecd won't - # find it. Most hosts cache their copy of the cfengine - # binaries here. This is the default search location for the - # binaries. - for bin in know promises agent monitord serverd execd runagent key report; do - dosym /usr/sbin/cf-$bin /var/cfengine/bin/$bin || die - done - - if use html; then - docinto html - dohtml -r docs/ || die - fi -} - -pkg_postinst() { - einfo - einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." - einfo - einfo "To run cfengine out of cron every half hour modify your crontab:" - einfo "0,30 * * * * /usr/sbin/cf-execd -F" - einfo - - elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:" - elog "/usr/sbin/cf-key" -} diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch new file mode 100644 index 000000000000..999c9a92f3f0 --- /dev/null +++ b/net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch @@ -0,0 +1,29 @@ +diff --git a/pub/Makefile.am b/pub/Makefile.am +index 14ad1a2..6ef675a 100644 +--- a/pub/Makefile.am ++++ b/pub/Makefile.am +@@ -2,9 +2,9 @@ + AM_CFLAGS = @CFLAGS@ @GCC_CFLAG@ + INCLUDES = @BERKELEY_DB_CFLAGS@ @OPENSSL_LIB_CPPFLAGS@ + +-noinst_LIBRARIES = libcfpub.a ++noinst_LTLIBRARIES = libcfpub.la + +-libcfpub_a_SOURCES = \ ++libcfpub_la_SOURCES = \ + getopt.c \ + getopt1.c \ + full-write.c \ +diff --git a/src/Makefile.am b/src/Makefile.am +index e48bb5b..c69ce0e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -5,7 +5,7 @@ LDADD = libpromises.la # $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LI + INCLUDES = $(BERKELEY_DB_CFLAGS) $(OPENSSL_LIB_CPPFLAGS) + AM_LDFLAGS = $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@ + +-lib_LTLIBRARIES = libpromises.la ++pkglib_LTLIBRARIES = libpromises.la + + libpromises_la_LDFLAGS = -version-info 1:0:0 -no-undefined + libpromises_la_LIBADD = $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB) diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch index e746f51c4e9b..64bdab4891ed 100644 --- a/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch +++ b/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch @@ -1,8 +1,18 @@ diff --git a/configure.ac b/configure.ac -index 64b2a13..09821a5 100644 +index 64b2a13..8202c6c 100644 --- a/configure.ac +++ b/configure.ac -@@ -84,13 +84,9 @@ AC_CHECK_LIB(m,main) +@@ -68,8 +68,7 @@ AC_PROG_CC + AM_PROG_LEX + AC_PROG_YACC + AC_PROG_RANLIB +-AC_DISABLE_SHARED +-dnl AC_DISABLE_STATIC - maybe use shared libs later ++AC_DISABLE_STATIC + AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_CONFIG_LIBOBJ_DIR(pub) +@@ -84,13 +83,9 @@ AC_CHECK_LIB(m,main) dnl Look for ldap @@ -19,7 +29,7 @@ index 64b2a13..09821a5 100644 dnl Now check for database connectors -@@ -99,15 +95,9 @@ dnl ###################################################################### +@@ -99,15 +94,9 @@ dnl ###################################################################### dnl Look for SQL connectors. dnl ###################################################################### @@ -38,7 +48,7 @@ index 64b2a13..09821a5 100644 if test $WITH_SQL = 1; then case "$target_os" in -@@ -124,31 +114,17 @@ if test $WITH_SQL = 1; then +@@ -124,31 +113,17 @@ if test $WITH_SQL = 1; then fi @@ -79,7 +89,7 @@ index 64b2a13..09821a5 100644 AC_CHECK_FUNC(door_create,door) AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) -@@ -162,18 +138,12 @@ dnl +@@ -162,18 +137,12 @@ dnl dnl Choose a database dnl @@ -102,7 +112,7 @@ index 64b2a13..09821a5 100644 AC_CHECK_LIB(tokyocabinet,main, [], [AC_MSG_ERROR(Cannot find Tokyo Cabinet)]) AC_CHECK_HEADERS(tcutil.h) AC_CHECK_HEADERS(tchdb.h) -@@ -182,18 +152,12 @@ fi +@@ -182,18 +151,12 @@ fi dnl else qdbm? @@ -125,7 +135,7 @@ index 64b2a13..09821a5 100644 AC_CHECK_LIB(qdbm,main, [], [AC_MSG_ERROR(Cannot find Quick Database Manager)]) AC_CHECK_HEADERS(depot.h) AC_DEFINE(QDB, 1, [Define if QDBM is available.]) -@@ -471,18 +435,12 @@ AC_SUBST(OPENSSL_LIB_LIB) +@@ -471,18 +434,12 @@ AC_SUBST(OPENSSL_LIB_LIB) # Others # @@ -148,7 +158,7 @@ index 64b2a13..09821a5 100644 AC_CHECK_LIB(virt,main, [], [AC_MSG_ERROR(Cannot find libvirt)]) fi -@@ -491,60 +449,52 @@ dnl ###################################################################### +@@ -491,60 +448,52 @@ dnl ###################################################################### dnl Checks for perl compatible regular expressions dnl ###################################################################### @@ -247,7 +257,7 @@ index 64b2a13..09821a5 100644 dnl ###################################################################### dnl Checks for header files. dnl ###################################################################### -@@ -564,7 +514,6 @@ AC_CHECK_HEADERS(sys/param.h) +@@ -564,7 +513,6 @@ AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(sys/filesys.h) AC_CHECK_HEADERS(dustat.h) @@ -255,7 +265,7 @@ index 64b2a13..09821a5 100644 AC_CHECK_HEADERS(sys/systeminfo.h) AC_CHECK_HEADERS(sys/acl.h winsock2.h) -@@ -579,32 +528,23 @@ dnl ###################################################################### +@@ -579,32 +527,23 @@ dnl ###################################################################### dnl Checks for graph support dnl ###################################################################### @@ -298,7 +308,7 @@ index 64b2a13..09821a5 100644 dnl ###################################################################### dnl Checks for data types -@@ -627,7 +567,7 @@ dnl Check for special functions +@@ -627,7 +566,7 @@ dnl Check for special functions dnl ###################################################################### AC_CHECK_FUNCS(getcwd getnetgrent waitpid seteuid setegid setreuid setregid) @@ -307,7 +317,7 @@ index 64b2a13..09821a5 100644 AC_CHECK_FUNCS(strstr strsep putenv drand48 srand48 getaddrinfo) AC_CHECK_FUNCS(bcopy mkfifo statfs statvfs door) AC_CHECK_FUNCS(sysinfo setsid strdup strrchr strerror snprintf sysconf) -@@ -691,30 +631,27 @@ AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN)) +@@ -691,30 +630,27 @@ AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN)) AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create)) AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create)) @@ -354,7 +364,7 @@ index 64b2a13..09821a5 100644 dnl ###################################################################### -@@ -995,7 +932,7 @@ AC_MSG_RESULT( ) +@@ -995,7 +931,7 @@ AC_MSG_RESULT( ) AC_MSG_RESULT( Summary of options...) @@ -363,7 +373,7 @@ index 64b2a13..09821a5 100644 AC_MSG_RESULT( -> Configured with PCRE libraries) else AC_MSG_RESULT( -> No PCRE library support - reverting to POSIX builtins) -@@ -1003,11 +940,11 @@ fi +@@ -1003,11 +939,11 @@ fi if test $WITH_SQL = 1; then @@ -377,7 +387,7 @@ index 64b2a13..09821a5 100644 AC_MSG_RESULT( -> Configured with Postgres libraries) fi -@@ -1016,14 +953,14 @@ else +@@ -1016,14 +952,14 @@ else fi if test $WITH_GVC = 1; then diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch new file mode 100644 index 000000000000..2874a9439370 --- /dev/null +++ b/net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch @@ -0,0 +1,12 @@ +diff --git a/pub/regex.c b/pub/regex.c +index ba15918..dcaa9b4 100644 +--- a/pub/regex.c ++++ b/pub/regex.c +@@ -40,6 +40,7 @@ + + /* We need this for `regex.h', and perhaps for the Emacs include files. */ + #include ++#include + #include "gnuregex.h" + + /* The `emacs' switch turns on certain matching commands -- cgit v1.2.3-65-gdbad