[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 8da0fc9360d027258c3a9a727001c10de50b63b0
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jan 17 04:24:17 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jan 17 04:26:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da0fc93
net-misc/cfengine: update a couple more ED/EROOT instances
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 53c7b95c86ad..e9cd762ac986 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -85,7 +85,7 @@ src_install() {
emake DESTDIR="${D}" install
# fix ifconfig path in provided promises
- find "${D}"/usr/share -name "*.cf" | xargs sed -i
"s,/sbin/ifconfig,$(which ifconfig),g"
+ find "${ED}"/usr/share -name "*.cf" | xargs sed -i
"s,/sbin/ifconfig,$(which ifconfig),g"
# Evil workaround for now..
mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
@@ -135,7 +135,7 @@ pkg_postinst() {
for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name
'cf-servd'); do
found=1
rm "$fname"
- ln -s "${EROOT}"/etc/init.d/cf-serverd $(echo "$fname" | sed
's:cf-servd:cf-serverd:')
+ ln -s /etc/init.d/cf-serverd $(echo "$fname" | sed
's:cf-servd:cf-serverd:')
done
if [ "${found}" -eq 1 ]; then
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 4ab520202ec5681eee7856fbb308001e25ff67c4
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 23:43:51 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 23:56:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab52020
net-misc/cfengine: update EAPI 5 -> 7
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 3ac2c4c22e6a..c05b9132fce6 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
-inherit autotools epatch
+inherit autotools
MY_PV="${PV//_beta/b}"
MY_PV="${MY_PV/_p/p}"
@@ -39,9 +39,11 @@ REQUIRED_USE="^^ ( qdbm tokyocabinet )"
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/${P}-ifconfig.patch"
+ "${FILESDIR}/${P}-sysmacros.patch"
+ )
default
- epatch "${FILESDIR}/${P}-ifconfig.patch"
- epatch "${FILESDIR}/${P}-sysmacros.patch"
eautoreconf
}
@@ -143,7 +145,7 @@ pkg_postinst() {
}
pkg_config() {
- if [ "${ROOT}" == "/" ]; then
+ if [[ -z ${ROOT} ]]; then
if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
einfo "Generating keys for localhost."
/usr/sbin/cf-key
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 146956e90247ed3cf5237e0254a8ceab4ebb519c
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 23:35:56 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 23:56:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146956e9
net-misc/cfengine: update DESCRIPTION
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 7ade88aede8b..afb6f132a8a7 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ 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"
+DESCRIPTION="An suite of programs for configuring and maintaining Unix-like
computers"
HOMEPAGE="http://www.cfengine.org/;
SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
masterfiles? (
http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz
-> ${PN}-masterfiles-${MY_PV}.tar.gz )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 54f8eabb4b5621aef51c2d7d6d2f95601c74442b
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 23:46:04 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 23:56:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f8eabb
net-misc/cfengine: fix ED/EROOT usage
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index c05b9132fce6..53c7b95c86ad 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -88,12 +88,12 @@ src_install() {
find "${D}"/usr/share -name "*.cf" | xargs sed -i
"s,/sbin/ifconfig,$(which ifconfig),g"
# Evil workaround for now..
- mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+ mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
dodoc AUTHORS
if ! use examples; then
- rm -rf "${D}"/usr/share/doc/${PF}/example*
+ rm -rf "${ED}"/usr/share/doc/${PF}/example*
fi
# Create cfengine working directory
@@ -132,10 +132,10 @@ pkg_postinst() {
# Fix old cf-servd, remove it after some releases.
local found=0
- for fname in $(find /etc/runlevels/ -type f -or -type l -name
'cf-servd'); do
+ for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name
'cf-servd'); do
found=1
- rm $fname
- ln -s /etc/init.d/cf-serverd $(echo $fname | sed
's:cf-servd:cf-serverd:')
+ rm "$fname"
+ ln -s "${EROOT}"/etc/init.d/cf-serverd $(echo "$fname" | sed
's:cf-servd:cf-serverd:')
done
if [ "${found}" -eq 1 ]; then
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: de78c4ef2705e577087beea85620a220b8b94779
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 23:37:00 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 23:56:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de78c4ef
net-misc/cfengine: install relative symlinks
Signed-off-by: Mike Gilbert gentoo.org>
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index afb6f132a8a7..50988ffa1943 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -103,7 +103,7 @@ src_install() {
# binaries here. This is the default search location for the
# binaries.
for bin in promises agent monitord serverd execd runagent key; do
- dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
+ dosym ../../../usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
done
if use masterfiles; then
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: aa3e8e1d7b0c74a382153d0173d95c0b2c98645a Author: Mike Gilbert gentoo org> AuthorDate: Sun Jan 16 23:38:20 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jan 16 23:56:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3e8e1d net-misc/cfengine: add slot-operator for postgres Signed-off-by: Mike Gilbert gentoo.org> net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild index 50988ffa1943..3ac2c4c22e6a 100644 --- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild +++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild @@ -22,7 +22,7 @@ IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet DEPEND="acl? ( virtual/acl ) mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) + postgres? ( dev-db/postgresql:= ) selinux? ( sys-libs/libselinux ) tokyocabinet? ( dev-db/tokyocabinet ) qdbm? ( dev-db/qdbm )
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 4eae2251c7f890f73295952e29d4f2de9c0c0e26
Author: Sam James gentoo org>
AuthorDate: Wed Aug 18 14:12:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 18 14:27:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eae2251
net-misc/cfengine: add missing subslot dep (mainly libnsl)
Signed-off-by: Sam James gentoo.org>
net-misc/cfengine/{cfengine-3.6.2.ebuild => cfengine-3.6.2-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
similarity index 99%
rename from net-misc/cfengine/cfengine-3.6.2.ebuild
rename to net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index 9564bdf6446..7ade88aede8 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -29,8 +29,8 @@ DEPEND="acl? ( virtual/acl )
libvirt? ( app-emulation/libvirt )
xml? ( dev-libs/libxml2:2 ) \
dev-libs/openssl:=
- dev-libs/libpcre
- net-libs/libnsl"
+ dev-libs/libpcre:=
+ net-libs/libnsl:="
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: f53cc0743dae659f37d839811afb73470a87bff8
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jun 21 22:27:18 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 22 18:18:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53cc074
net-misc/cfengine: use binding := for dev-libs/openssl
No revbump given currently does not seem to build wrt bug #791619
Acked-by: David Seifert gentoo.org>
Signed-off-by: Ionen Wolkens gentoo.org>
Signed-off-by: Sam James gentoo.org>
net-misc/cfengine/cfengine-3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index 2bdad3a9ba8..9564bdf6446 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -28,7 +28,7 @@ DEPEND="acl? ( virtual/acl )
qdbm? ( dev-db/qdbm )
libvirt? ( app-emulation/libvirt )
xml? ( dev-libs/libxml2:2 ) \
- dev-libs/openssl
+ dev-libs/openssl:=
dev-libs/libpcre
net-libs/libnsl"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/
commit: c381454b18492eddd76c4810b425948ed75f6b9a
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Sep 18 16:02:00 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Sep 20 14:38:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c381454b
net-misc/cfengine: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/17589
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Conrad Kostecki gentoo.org>
net-misc/cfengine/files/511666-segfault.patch | 20 ---
net-misc/cfengine/files/admit-noclass-520696.patch | 15
.../files/cfengine-2.2.10-lsbrelease.patch | 24 -
.../cfengine-2.2.10-snprintf_buffer_overflow.patch | 11 --
net-misc/cfengine/files/cfengine-3.4.5-acl.patch | 30
.../cfengine/files/cfengine-3.4.5-ifconfig.patch | 42 --
.../cfengine/files/cfengine-3.5.3-ifconfig.patch | 42 --
net-misc/cfengine/files/cfenvd.rc6 | 17 -
net-misc/cfengine/files/cfexecd.rc6| 17 -
net-misc/cfengine/files/cfservd.rc6| 17 -
10 files changed, 235 deletions(-)
diff --git a/net-misc/cfengine/files/511666-segfault.patch
b/net-misc/cfengine/files/511666-segfault.patch
deleted file mode 100644
index ea3ae968625..000
--- a/net-misc/cfengine/files/511666-segfault.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix a bug involving CheckFriendReliability (see bug #482439)
-
-Index: cfengine2-2.2.9/src/instrument.c
-===
cfengine2-2.2.9.orig/src/instrument.c 2009-03-06 21:25:59.0
+
-+++ cfengine2-2.2.9/src/instrument.c 2009-03-06 21:26:31.0 +
-@@ -716,11 +716,11 @@
- key.data = timekey;
- key.size = strlen(timekey)+1;
-
-- if ((errno = dbp->get(dbp,NULL,,,0)) != 0)
-+ if ((errno = dbpent->get(dbpent,NULL,,,0)) != 0)
- {
- if (errno != DB_NOTFOUND)
- {
--dbp->err(dbp,errno,NULL);
-+dbpent->err(dbpent,errno,NULL);
- exit(1);
- }
- }
diff --git a/net-misc/cfengine/files/admit-noclass-520696.patch
b/net-misc/cfengine/files/admit-noclass-520696.patch
deleted file mode 100644
index 1e5d8594aae..000
--- a/net-misc/cfengine/files/admit-noclass-520696.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix a bug with admit/grant that let cfengine2 fails when the class
-of a cfengine fragment does not exist and more than a host or IP
-ranges are specified for a path (see #520696)
-
a/src/install.c
-+++ b/src/install.c
-@@ -6561,7 +6561,7 @@
- if (!IsDefinedClass(classes))
-{
-Debug1("Not installing Auth path, no match\n");
-- InitializeAction();
-+// InitializeAction();
-return;
-}
-
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
deleted file mode 100644
index 6f8dfa04d8f..000
--- a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Newer GCC mis-compiles the lsb_release reader function.
-
-Signed-off-by: Robin H. Johnson
-
cfengine-2.2.10/src/misc.c 2009-02-10 21:55:36.0 -0800
-+++ cfengine-2.2.10/src/misc.c 2020-01-06 17:58:07.049226386 -0800
-@@ -1187,6 +1187,7 @@ if ((fp = cfpopen(VBUFF, "r")) == NULL)
-
- if (ReadLine(VBUFF, CF_BUFSIZE, fp))
-{
-+ Debug4("(%s)",VBUFF);
-char * buffer = VBUFF;
-strsep(, ":");
-
-@@ -1198,7 +1199,8 @@ if (ReadLine(VBUFF, CF_BUFSIZE, fp))
-info = buffer;
-while((*buffer != '\0') && !isspace(*buffer))
- {
-- *buffer = tolower(*buffer++);
-+ *buffer = tolower(*buffer);
-+ buffer++;
- }
-
-*buffer = '\0';
diff --git
a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
deleted file mode 100644
index 80a3a542974..000
--- a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/src/instrument.c.old 2010-10-15 22:20:58.014091858 +0200
-+++ b/src/instrument.c 2010-10-15 22:21:34.132271440 +0200
-@@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, , , D
-
-tthen = (time_t)then;
-
-- snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime());
-+ snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime());
-datebuf[strlen(datebuf)-9] = '\0'; /* Chop off second
and year */
-
-snprintf(addr,15,"%s",hostname+1);
diff --git a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
b/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
deleted file mode 100644
index 815f257c36f..000
--- a/net-misc/cfengine/files/cfengine-3.4.5-acl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 09db29821c884bf41c3ff8da5557ee2f5b51705b
Author: Aaron Bauman gentoo org>
AuthorDate: Thu Sep 17 01:41:30 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Thu Sep 17 01:42:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09db2982
net-misc/cfengine: drop old 2.x ebuilds
* These are blocking dev-libs/openssl-1.x cleanup
Bug: https://bugs.gentoo.org/741620
Signed-off-by: Aaron Bauman gentoo.org>
net-misc/cfengine/Manifest | 1 -
net-misc/cfengine/cfengine-2.2.10-r5.ebuild | 115 ---
net-misc/cfengine/cfengine-2.2.10-r6.ebuild | 116
3 files changed, 232 deletions(-)
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index f671fe6f47b..9c943e341df 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,3 +1,2 @@
-DIST cfengine-2.2.10.tar.gz 2690333 BLAKE2B
a6e0027fc290a46730327f3fc4bf382add421f37759d6972b3f99de92417e77d8c5ff649aa376d216abde017e49072d3bd98aed60a109cb57b9e5920a358923a
SHA512
861af25f32248e115512790357cb4739b16bee9d19db33cc1b93ab2091d020991770970fc916796a5894c978ee6a5956100d2f714efb6e97e9e9a9ea88f64dea
DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B
bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df
SHA512
b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840df4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B
df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7
SHA512
ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
diff --git a/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
deleted file mode 100644
index 22bdd71cfd9..000
--- a/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/;
-SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="vim-syntax"
-
-RDEPEND=">=sys-libs/db-4:=
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
- # https://bugs.gentoo.org/339808
- eapply "${FILESDIR}/admit-noclass-520696.patch" \
- "${FILESDIR}/511666-segfault.patch" \
- "${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
-
- # 2048 causes crashes on some 32-bit hardened kernels, and the warning
- # messages say to turn it back down.
- if use x86; then
- sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
- fi
-}
-
-src_configure() {
- # Enforce /var/cfengine for historical compatibility
- econf \
- --disable-static \
- --with-workdir=/var/cfengine \
- --with-berkeleydb=/usr
-
- # Fix Makefile to skip doc,inputs, & contrib install to wrong locations
- sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
- -e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
- -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
- # Fix man pages
- sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
-}
-
-src_install() {
- newinitd "${FILESDIR}"/cfservd.rc6 cfservd
- newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
- newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
-
- emake DESTDIR="${D}" install
-
- # Remove static library and libtool file as they are not needed
- rm "${ED}"/usr/$(get_libdir)/*.la || die
-
- dodoc AUTHORS ChangeLog README TODO INSTALL
-
- # Manually install doc and inputs
- doman doc/*.8
- doinfo doc/*.info*
- docinto examples
- dodoc inputs/*.example
-
- # Create cfengine working directory
- dodir /var/cfengine
- fperms 700 /var/cfengine
- keepdir /var/cfengine/bin
- keepdir /var/cfengine/inputs
- keepdir /var/cfengine/modules
-}
-
-pkg_postinst() {
- # 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.
-
- cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
-
- einfo
- einfo "NOTE: The cfportage module has been deprecated in favor of the"
- einfo " upstream 'packages' action."
- einfo
- einfo "Init
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: c32baff6249e844a97256adb7a4f77bdf0670eb6
Author: Aaron Bauman gentoo org>
AuthorDate: Wed Sep 16 23:42:43 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Sep 16 23:42:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32baff6
net-misc/cfengine: drop old EAPI=4
* This drops the EAPI=4 ebuild which was the only stable. All of the
versions in the repo are severely outdated and were not considered
LTS.
Signed-off-by: Aaron Bauman gentoo.org>
net-misc/cfengine/Manifest | 1 -
net-misc/cfengine/cfengine-3.3.9.ebuild | 129
net-misc/cfengine/metadata.xml | 2 -
3 files changed, 132 deletions(-)
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 3f55527d4bf..f671fe6f47b 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,4 +1,3 @@
DIST cfengine-2.2.10.tar.gz 2690333 BLAKE2B
a6e0027fc290a46730327f3fc4bf382add421f37759d6972b3f99de92417e77d8c5ff649aa376d216abde017e49072d3bd98aed60a109cb57b9e5920a358923a
SHA512
861af25f32248e115512790357cb4739b16bee9d19db33cc1b93ab2091d020991770970fc916796a5894c978ee6a5956100d2f714efb6e97e9e9a9ea88f64dea
-DIST cfengine-3.3.9.tar.gz 1256138 BLAKE2B
15a71f5de94f55df9a117331029b81385a8196a5602db5775154527eb1ec63dcf15d55c89b34706e8448baaa6ed8f64e24bc8c7d6b3c56deedd55d5b606c
SHA512
9d64667d001daa2db506abf97ecde43e6b6ac672d3ca6dba4c5e68b742b72f2c7cee65c2f5ab82a12cf0f9b385f48fb0d2bb9eae7fe2ff57b187c725238faf1f
DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B
bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df
SHA512
b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840df4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B
df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7
SHA512
ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild
b/net-misc/cfengine/cfengine-3.3.9.ebuild
deleted file mode 100644
index a671fd89e08..000
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-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://cfengine.com/source-code/download?file=${MY_P}.tar.gz ->
${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ppc ~s390 ~sparc x86"
-
-IUSE="examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet
vim-syntax"
-
-DEPEND=">=sys-libs/db-4
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- selinux? ( sys-libs/libselinux )
- tokyocabinet? ( dev-db/tokyocabinet )
- qdbm? ( dev-db/qdbm )
- libvirt? ( app-emulation/libvirt )
- >=dev-libs/openssl-0.9.7
- dev-libs/libpcre
- net-libs/libnsl"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- # Enforce /var/cfengine for historical compatibility
- econf \
- --enable-fhs \
- --docdir=/usr/share/doc/${PF} \
- --with-workdir=/var/cfengine \
- --with-pcre \
- $(use_with qdbm) \
- $(use_with tokyocabinet) \
- $(use_with postgres postgresql) \
- $(use_with mysql) \
- $(use_with libvirt) \
- $(use_enable selinux)
-
- # Fix Makefile to skip inputs, see below "examples"
- #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
- # We install the documentation through portage
- sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-}
-
-src_install() {
- newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
- newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
- newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
-
- emake DESTDIR="${D}" install
-
- # Evil workaround for now..
- mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
-
- dodoc AUTHORS
-
- if ! use examples; then
- rm -rf "${D}"/usr/share/doc/${PF}/example*
- 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 7d23e823cd321f7acbf3184a71e423e77c6b5364
Author: Aaron Bauman gentoo org>
AuthorDate: Wed Sep 16 23:29:44 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Sep 16 23:29:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d23e823
net-misc/cfengine: drop older versions
Closes: https://bugs.gentoo.org/690916
Signed-off-by: Aaron Bauman gentoo.org>
net-misc/cfengine/Manifest | 2 -
net-misc/cfengine/cfengine-3.4.5.ebuild | 144
net-misc/cfengine/cfengine-3.5.3.ebuild | 141 ---
3 files changed, 287 deletions(-)
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 7144124d690..3f55527d4bf 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,6 +1,4 @@
DIST cfengine-2.2.10.tar.gz 2690333 BLAKE2B
a6e0027fc290a46730327f3fc4bf382add421f37759d6972b3f99de92417e77d8c5ff649aa376d216abde017e49072d3bd98aed60a109cb57b9e5920a358923a
SHA512
861af25f32248e115512790357cb4739b16bee9d19db33cc1b93ab2091d020991770970fc916796a5894c978ee6a5956100d2f714efb6e97e9e9a9ea88f64dea
DIST cfengine-3.3.9.tar.gz 1256138 BLAKE2B
15a71f5de94f55df9a117331029b81385a8196a5602db5775154527eb1ec63dcf15d55c89b34706e8448baaa6ed8f64e24bc8c7d6b3c56deedd55d5b606c
SHA512
9d64667d001daa2db506abf97ecde43e6b6ac672d3ca6dba4c5e68b742b72f2c7cee65c2f5ab82a12cf0f9b385f48fb0d2bb9eae7fe2ff57b187c725238faf1f
-DIST cfengine-3.4.5.tar.gz 4671628 BLAKE2B
d6964631ef6a6ba2fab661c5d0b287f8a5fb8ffc747bd8963133fe0b24d5969f57bed02d059bbee83a042b3c5912fa05aec591262d94e17fd081c0167a154959
SHA512
3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f
-DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B
e7e4fe1194563cc9e72e4262c934f7ce73c0a74749b131a424201445b954492d90dfc6a8b0530d5f9bcd2852b41b32ed25dc43e70b525dafc9c4a111b7c4990f
SHA512
20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18
DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B
bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df
SHA512
b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840df4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B
df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7
SHA512
ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild
b/net-misc/cfengine/cfengine-3.4.5.ebuild
deleted file mode 100644
index f3399734b57..000
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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://cfengine.com/source-code/download?file=${MY_P}.tar.gz ->
${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
-
-IUSE="acl examples html libvirt mysql postgres +qdbm selinux tests tokyocabinet
-vim-syntax xml"
-
-DEPEND=">=sys-libs/db-4
- acl? ( virtual/acl )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- selinux? ( sys-libs/libselinux )
- tokyocabinet? ( dev-db/tokyocabinet )
- qdbm? ( dev-db/qdbm )
- libvirt? ( app-emulation/libvirt )
- xml? ( dev-libs/libxml2:2 ) \
- dev-libs/openssl
- dev-libs/libpcre
- net-libs/libnsl"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-REQUIRED_USE="^^ ( qdbm tokyocabinet )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- epatch "${FILESDIR}/${P}-acl.patch"
- epatch "${FILESDIR}/${P}-ifconfig.patch"
-
- eautoreconf
-}
-
-src_configure() {
- # Enforce /var/cfengine for historical compatibility
- econf \
- --enable-fhs \
- --docdir=/usr/share/doc/${PF} \
- --with-workdir=/var/cfengine \
- --with-pcre \
- $(use_with acl libacl) \
- $(use_with qdbm) \
- $(use_with tokyocabinet) \
- $(use_with postgres postgresql) \
- $(use_with mysql) \
- $(use_with libvirt) \
- $(use_enable selinux)
-
- # Fix Makefile to skip inputs, see below "examples"
- #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
- # We install the documentation through
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/, net-misc/cfengine/files/
commit: 4edd04b727e428dbe617c8a56d304ca23e00cf79
Author: Robin H. Johnson gentoo org>
AuthorDate: Tue Jan 7 02:03:21 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Tue Jan 7 02:03:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4edd04b7
net-misc/cfengine: string parsing fix for infra
Signed-off-by: Robin H. Johnson gentoo.org>
net-misc/cfengine/cfengine-2.2.10-r6.ebuild| 116 +
.../files/cfengine-2.2.10-lsbrelease.patch | 24 +
2 files changed, 140 insertions(+)
diff --git a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
new file mode 100644
index 000..87d5fa9341e
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/;
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="vim-syntax"
+
+RDEPEND=">=sys-libs/db-4:=
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+ # https://bugs.gentoo.org/339808
+ eapply "${FILESDIR}/admit-noclass-520696.patch" \
+ "${FILESDIR}/511666-segfault.patch" \
+ "${FILESDIR}/${P}-snprintf_buffer_overflow.patch" \
+ "${FILESDIR}/${PN}-2.2.10-lsbrelease.patch"
+
+ # 2048 causes crashes on some 32-bit hardened kernels, and the warning
+ # messages say to turn it back down.
+ if use x86; then
+ sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
+ fi
+}
+
+src_configure() {
+ # Enforce /var/cfengine for historical compatibility
+ econf \
+ --disable-static \
+ --with-workdir=/var/cfengine \
+ --with-berkeleydb=/usr
+
+ # Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+ sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
+ -e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
+ -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+ # Fix man pages
+ sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+ newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+ newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
+
+ emake DESTDIR="${D}" install
+
+ # Remove static library and libtool file as they are not needed
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+ dodoc AUTHORS ChangeLog README TODO INSTALL
+
+ # Manually install doc and inputs
+ doman doc/*.8
+ doinfo doc/*.info*
+ docinto examples
+ dodoc inputs/*.example
+
+ # Create cfengine working directory
+ dodir /var/cfengine
+ fperms 700 /var/cfengine
+ keepdir /var/cfengine/bin
+ keepdir /var/cfengine/inputs
+ keepdir /var/cfengine/modules
+}
+
+pkg_postinst() {
+ # 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.
+
+ cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
+
+ einfo
+ einfo "NOTE: The cfportage module has been deprecated in favor of the"
+ einfo " upstream 'packages' action."
+ einfo
+ einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
+ einfo
+ einfo "To run cfengine out of cron every half hour modify your crontab:"
+ einfo "0,30 * * * */usr/sbin/cfexecd -F"
+ einfo
+
+ elog "You MUST generate the keys for cfengine by running:"
+ elog "emerge --config ${CATEGORY}/${PN}"
+}
+
+pkg_config() {
+ if [[ -z ${ROOT} ]]; then
+ if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]];
then
+ einfo "Generating keys for localhost."
+ "${EPREFIX}"/usr/sbin/cfkey
+ fi
+ else
+ die "cfengine cfkey does not support any value of ROOT other
than /."
+ fi
+}
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
new file mode 100644
index 000..6f8dfa04d8f
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
@@ -0,0 +1,24 @@
+Newer GCC mis-compiles the lsb_release reader function.
+
+Signed-off-by: Robin H. Johnson
+
+--- cfengine-2.2.10/src/misc.c 2009-02-10 21:55:36.0 -0800
cfengine-2.2.10/src/misc.c 2020-01-06
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/, net-misc/cfengine/files/
commit: 929c4f7fc061017b6c5aba9ec43ec23961d293bd
Author: Michał Górny gentoo org>
AuthorDate: Fri Oct 4 19:07:12 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Oct 4 19:07:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929c4f7f
net-misc/cfengine: Bump 2.2.10 to EAPI 7
Signed-off-by: Michał Górny gentoo.org>
net-misc/cfengine/cfengine-2.2.10-r5.ebuild| 115 +
.../cfengine-2.2.10-snprintf_buffer_overflow.patch | 4 +-
2 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
new file mode 100644
index 000..22bdd71cfd9
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/;
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="vim-syntax"
+
+RDEPEND=">=sys-libs/db-4:=
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+ # https://bugs.gentoo.org/339808
+ eapply "${FILESDIR}/admit-noclass-520696.patch" \
+ "${FILESDIR}/511666-segfault.patch" \
+ "${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
+
+ # 2048 causes crashes on some 32-bit hardened kernels, and the warning
+ # messages say to turn it back down.
+ if use x86; then
+ sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
+ fi
+}
+
+src_configure() {
+ # Enforce /var/cfengine for historical compatibility
+ econf \
+ --disable-static \
+ --with-workdir=/var/cfengine \
+ --with-berkeleydb=/usr
+
+ # Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+ sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
+ -e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
+ -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+ # Fix man pages
+ sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+ newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+ newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
+
+ emake DESTDIR="${D}" install
+
+ # Remove static library and libtool file as they are not needed
+ rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+ dodoc AUTHORS ChangeLog README TODO INSTALL
+
+ # Manually install doc and inputs
+ doman doc/*.8
+ doinfo doc/*.info*
+ docinto examples
+ dodoc inputs/*.example
+
+ # Create cfengine working directory
+ dodir /var/cfengine
+ fperms 700 /var/cfengine
+ keepdir /var/cfengine/bin
+ keepdir /var/cfengine/inputs
+ keepdir /var/cfengine/modules
+}
+
+pkg_postinst() {
+ # 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.
+
+ cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
+
+ einfo
+ einfo "NOTE: The cfportage module has been deprecated in favor of the"
+ einfo " upstream 'packages' action."
+ einfo
+ einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
+ einfo
+ einfo "To run cfengine out of cron every half hour modify your crontab:"
+ einfo "0,30 * * * */usr/sbin/cfexecd -F"
+ einfo
+
+ elog "You MUST generate the keys for cfengine by running:"
+ elog "emerge --config ${CATEGORY}/${PN}"
+}
+
+pkg_config() {
+ if [[ -z ${ROOT} ]]; then
+ if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]];
then
+ einfo "Generating keys for localhost."
+ "${EPREFIX}"/usr/sbin/cfkey
+ fi
+ else
+ die "cfengine cfkey does not support any value of ROOT other
than /."
+ fi
+}
diff --git
a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
index dee9b797f6a..80a3a542974 100644
--- a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
+++ b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
@@ -1,5 +1,5 @@
src/instrument.c.old 2010-10-15 22:20:58.014091858 +0200
-+++ src/instrument.c 2010-10-15 22:21:34.132271440 +0200
+--- a/src/instrument.c.old 2010-10-15 22:20:58.014091858
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 0038606ea706c7dc8466a35401cc705e7ec36837
Author: Michał Górny gentoo org>
AuthorDate: Fri Oct 4 19:07:30 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Oct 4 19:07:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0038606e
net-misc/cfengine: Drop old (EAPI=2)
Signed-off-by: Michał Górny gentoo.org>
net-misc/cfengine/cfengine-2.2.10-r4.ebuild | 113
1 file changed, 113 deletions(-)
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
deleted file mode 100644
index 0c4a8b4c552..000
--- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/;
-SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
-IUSE="vim-syntax"
-
-RDEPEND=">=sys-libs/db-4
- >=dev-libs/openssl-0.9.7
- app-portage/portage-utils
- net-libs/libnsl"
-DEPEND="${RDEPEND}
- virtual/yacc
- sys-devel/flex"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-src_prepare() {
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
- # https://bugs.gentoo.org/339808
- epatch "${FILESDIR}/admit-noclass-520696.patch" \
- "${FILESDIR}/511666-segfault.patch" \
- "${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
-
- # 2048 causes crashes on some 32-bit hardened kernels, and the warning
- # messages say to turn it back down.
- use x86 && sed -ie "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h
-}
-
-src_configure() {
- # Enforce /var/cfengine for historical compatibility
- econf \
- --with-workdir=/var/cfengine \
- --with-berkeleydb=/usr
-
- # Fix Makefile to skip doc,inputs, & contrib install to wrong locations
- sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile
- sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
- sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
-
- # Fix man pages
- sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
-}
-
-src_install() {
- newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
- newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
- newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
-
- make DESTDIR="${D}" install || die
-
- # Remove static library and libtool file as they are not needed
- rm "${D}"/usr/$(get_libdir)/*.la
- rm "${D}"/usr/$(get_libdir)/*.a
-
- dodoc AUTHORS ChangeLog README TODO INSTALL
-
- # Manually install doc and inputs
- doman doc/*.8
- docinto examples
- doinfo doc/*.info*
- dodoc inputs/*.example
-
- # Create cfengine working directory
- mkdir -p "${D}"/var/cfengine
- fperms 700 /var/cfengine
- keepdir /var/cfengine/bin
- keepdir /var/cfengine/inputs
- dodir /var/cfengine/modules
-}
-
-pkg_postinst() {
- # 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.
-
- cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
-
- einfo
- einfo "NOTE: The cfportage module has been deprecated in favor of the"
- einfo " upstream 'packages' action."
- einfo
- einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
- einfo
- einfo "To run cfengine out of cron every half hour modify your crontab:"
- einfo "0,30 * * * */usr/sbin/cfexecd -F"
- einfo
-
- elog "You MUST generate the keys for cfengine by running:"
- elog "emerge --config ${CATEGORY}/${PN}"
-}
-
-pkg_config() {
- if [ "${ROOT}" == "/" ]; then
- if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
- einfo "Generating keys for localhost."
- /usr/sbin/cfkey
- fi
- else
- die "cfengine cfkey does not support any value of ROOT other
than /."
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: dbf24617b031c462efeaf1fda1e14248c69c42dd
Author: Robin H. Johnson gentoo org>
AuthorDate: Wed Nov 14 16:25:44 2018 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Wed Nov 14 16:26:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf24617
net-misc/cfengine: add net-libs/libnsl dep per glibc upgrade
See: https://bugs.gentoo.org/show_bug.cgi?id=636158
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Robin H. Johnson gentoo.org>
net-misc/cfengine/cfengine-2.2.10-r4.ebuild | 5 +++--
net-misc/cfengine/cfengine-3.3.9.ebuild | 5 +++--
net-misc/cfengine/cfengine-3.4.5.ebuild | 5 +++--
net-misc/cfengine/cfengine-3.5.3.ebuild | 5 +++--
net-misc/cfengine/cfengine-3.6.2.ebuild | 5 +++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
index a2f6f9d7afc..0c4a8b4c552 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -17,7 +17,8 @@ IUSE="vim-syntax"
RDEPEND=">=sys-libs/db-4
>=dev-libs/openssl-0.9.7
- app-portage/portage-utils"
+ app-portage/portage-utils
+ net-libs/libnsl"
DEPEND="${RDEPEND}
virtual/yacc
sys-devel/flex"
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild
b/net-misc/cfengine/cfengine-3.3.9.ebuild
index 907365bda35..7588c8da106 100644
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -26,7 +26,8 @@ DEPEND=">=sys-libs/db-4
qdbm? ( dev-db/qdbm )
libvirt? ( app-emulation/libvirt )
>=dev-libs/openssl-0.9.7
- dev-libs/libpcre"
+ dev-libs/libpcre
+ net-libs/libnsl"
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild
b/net-misc/cfengine/cfengine-3.4.5.ebuild
index c377a81c5a5..074d4d8593a 100644
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -31,7 +31,8 @@ DEPEND=">=sys-libs/db-4
libvirt? ( app-emulation/libvirt )
xml? ( dev-libs/libxml2:2 ) \
dev-libs/openssl
- dev-libs/libpcre"
+ dev-libs/libpcre
+ net-libs/libnsl"
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild
b/net-misc/cfengine/cfengine-3.5.3.ebuild
index 8f39bfb0f9b..1afbf48c234 100644
--- a/net-misc/cfengine/cfengine-3.5.3.ebuild
+++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -29,7 +29,8 @@ DEPEND="acl? ( virtual/acl )
libvirt? ( app-emulation/libvirt )
xml? ( dev-libs/libxml2:2 ) \
dev-libs/openssl
- dev-libs/libpcre"
+ dev-libs/libpcre
+ net-libs/libnsl"
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index 75f021ada08..fd0b75a9d5c 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -30,7 +30,8 @@ DEPEND="acl? ( virtual/acl )
libvirt? ( app-emulation/libvirt )
xml? ( dev-libs/libxml2:2 ) \
dev-libs/openssl
- dev-libs/libpcre"
+ dev-libs/libpcre
+ net-libs/libnsl"
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/
commit: a1c0851a496509240d8292e3d080b4eb97cd4851
Author: Chris Rorvick rorvick com>
AuthorDate: Sat Jan 20 12:13:26 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Apr 12 07:45:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c0851a
net-misc/cfengine: find ifconfig(8) in /bin/.
The ebuild applies a patch intending to look for ifconfig(8) in
/bin/ after not finding it in /sbin/. The patch is obviously wrong,
though, and is instead requiring ifconfig to be found in *both*
locations.
Closes: http://bugs.gentoo.org/645106
Closes: https://github.com/gentoo/gentoo/pull/6913
net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
index ae0f491347f..a31b3513ded 100644
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
+++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
@@ -5,7 +5,7 @@
}
#else
-if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL || (pp =
cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
++if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp =
cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
{
Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
return;
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 3a823afb6df5b7ea895f5275e9343074c2e5c5ae Author: Patrice Clement gentoo org> AuthorDate: Thu Apr 12 07:44:29 2018 + Commit: Patrice Clement gentoo org> CommitDate: Thu Apr 12 07:45:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a823afb net-misc/cfengine: remove maintainer. Acked-By: Christian Ruppert gentoo.org> Package-Manager: Portage-2.3.28, Repoman-2.3.9 net-misc/cfengine/metadata.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml index 86fa96098b0..3c6b17c9adc 100644 --- a/net-misc/cfengine/metadata.xml +++ b/net-misc/cfengine/metadata.xml @@ -1,11 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - id...@gentoo.org - Christian Ruppert - cfengine 2.x only - sysad...@gentoo.org Gentoo Sysadmin Project
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 4a5cc66b00ea2a305b725ba6a21d89e140c12a7d
Author: Chris Rorvick rorvick com>
AuthorDate: Wed May 24 14:13:43 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 4 22:51:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5cc66b
net-misc/cfengine: protect masterfiles.
Files in /var/cfengine/masterfiles are really configuration. Add this
directory to CONFIG_PROTECT.
net-misc/cfengine/cfengine-3.6.2.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index eb302d86ac2..75f021ada08 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -110,6 +110,9 @@ src_install() {
insinto /var/cfengine
doins -r "${WORKDIR}/masterfiles"
fi
+
+ dodir /etc/env.d
+ echo 'CONFIG_PROTECT=/var/cfengine/masterfiles'
>"${ED}/etc/env.d/99${PN}" || die
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: ff602efd2aaf20763713fa4aecc69481f6f21f8e
Author: Chris Rorvick rorvick com>
AuthorDate: Wed May 24 14:09:43 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 4 22:51:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff602efd
net-misc/cfengine: add masterfiles.
The masterfiles were moved into a separate tarball in CFEngine 3.6. Add
a new local `masterfiles' USE flag for optionally installing them.
Closes: https://github.com/gentoo/gentoo/pull/4752
net-misc/cfengine/Manifest | 1 +
net-misc/cfengine/cfengine-3.6.2.ebuild | 17 +++--
net-misc/cfengine/metadata.xml | 1 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 1f35884a626..8a571ace5eb 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -3,3 +3,4 @@ DIST cfengine-3.3.9.tar.gz 1256138 SHA256
54b44dd1c7a77a7ec4e4dea9542ac4d79cb689
DIST cfengine-3.4.5.tar.gz 4671628 SHA256
542808b9f532e77d66dca19e83bdc1f995d7d0066b940a39bdd5db9a71680011 SHA512
3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f
WHIRLPOOL
9e7516bfeffc1fae87eeb67f51207f056b0644a6d51e7b1da8d4f1eb27e581781af3f5f56bb98ed405909b2497eea3668df5bb78ece447dac528d7b18fdcd90f
DIST cfengine-3.5.3.tar.gz 1542468 SHA256
0e2d13ba1d75f826bf15411912ce21075734796a35e8fb8ecf545d70d60f41e1 SHA512
20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18
WHIRLPOOL
2434abd1b6228e87fb848ea013dafca7d1e62dfeaa3ddafd534d663f69eb8b84221f452f8d288571352b641efbde0d1e65f6377d74f7cfa7678267f548036c7b
DIST cfengine-3.6.2.tar.gz 1966966 SHA256
0e0195c1998fc261d4ef2e47e9cc50b273d204bc8b221d469bb83071933c4a09 SHA512
b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840df4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
WHIRLPOOL
989a7853b74848a69d4323f0e10ab05a7522132b6b52362b02d40e95a361ef85b74bef3e3263942376c3f6f4a29c3174967a3ca00fc5acef774537af14ce6352
+DIST cfengine-masterfiles-3.6.2.tar.gz 119594 SHA256
0c98e5099dc0358517d25c51173940afbeb4861bf5789a00e8068ceb23f4354d SHA512
ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
WHIRLPOOL
6cd57198d4437104add7135e251a7fcfc10132420bff2cc040817e3d5bd782f26a0a3109aef8fd4758d632cc6288f0d49d403a1be83292b51aedd2e9e47335e2
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index 025728ee43e..eb302d86ac2 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -12,13 +12,14 @@ 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://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
-> ${MY_P}.tar.gz"
+SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz
-> ${MY_P}.tar.gz
+ masterfiles? (
http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz
-> ${PN}-masterfiles-${MY_PV}.tar.gz )"
LICENSE="GPL-3"
SLOT="3"
KEYWORDS="~amd64 ~x86"
-IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet
vim-syntax xml"
+IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux
tokyocabinet vim-syntax xml"
DEPEND="acl? ( virtual/acl )
mysql? ( virtual/mysql )
@@ -44,6 +45,13 @@ src_prepare() {
eautoreconf
}
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+ if use masterfiles; then
+ unpack ${PN}-masterfiles-${MY_PV}.tar.gz
+ fi
+}
+
src_configure() {
# Enforce /var/cfengine for historical compatibility
@@ -97,6 +105,11 @@ src_install() {
for bin in promises agent monitord serverd execd runagent key; do
dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
done
+
+ if use masterfiles; then
+ insinto /var/cfengine
+ doins -r "${WORKDIR}/masterfiles"
+ fi
}
pkg_postinst() {
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index fb9078d2d2d..86fa96098b0 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -13,6 +13,7 @@
Install HTML documentation
Enable support for virtual machine
management through app-emulation/libvirt
+ Install the Masterfiles Policy
Framework
Use dev-db/qdbm as database
backend
Install test files
Use dev-db/tokyocabinet as
database backend
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/files/, net-misc/cfengine/
commit: d83856cd70eaa3c6cec3902b0e301dda1f39
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Oct 20 22:18:29 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Oct 20 22:22:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83856cd
net-misc/cfengine: compile-fix for glibc-2.25
Closes: https://bugs.gentoo.org/612658
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Robin H. Johnson gentoo.org>
net-misc/cfengine/cfengine-3.6.2.ebuild | 1 +
.../cfengine/files/cfengine-3.6.2-sysmacros.patch | 19 +++
2 files changed, 20 insertions(+)
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index a4e5ae6c7db..025728ee43e 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
default
epatch "${FILESDIR}/${P}-ifconfig.patch"
+ epatch "${FILESDIR}/${P}-sysmacros.patch"
eautoreconf
}
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
new file mode 100644
index 000..7aa8e277925
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch
@@ -0,0 +1,19 @@
+Fixes compile on glibc-2.25
+
+Fixes: https://bugs.gentoo.org/612658
+--- cfengine-3.6.2.orig/libutils/platform.h2014-09-25 04:53:31.0
-0700
cfengine-3.6.2/libutils/platform.h 2017-10-20 15:11:15.676360363 -0700
+@@ -360,12 +360,13 @@ void globfree(glob_t *pglob);
+
+ #ifdef __linux__
+ # if defined(__GLIBC__) || defined(__BIONIC__)
+ # include
+ # include
+ # include
++# include
+ # else
+ # include
+ # include
+ # include
+ # endif
+ #endif
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: 31f712e7790d8f6c498a29409bf04f3c53bda8e3
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Aug 10 17:26:21 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Aug 10 17:26:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f712e7
net-misc/cfengine: cleaner REQUIRED_USE syntax.
Package-Manager: portage-2.3.6
net-misc/cfengine/cfengine-2.2.10-r4.ebuild | 2 +-
net-misc/cfengine/cfengine-3.3.9.ebuild | 7 ++-
net-misc/cfengine/cfengine-3.4.5.ebuild | 7 ++-
net-misc/cfengine/cfengine-3.5.3.ebuild | 7 ++-
net-misc/cfengine/cfengine-3.6.2.ebuild | 7 ++-
5 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
index c45cf6eb234..a2f6f9d7afc 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild
b/net-misc/cfengine/cfengine-3.3.9.ebuild
index ad9bc45b5ec..907365bda35 100644
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -30,10 +30,7 @@ DEPEND=">=sys-libs/db-4
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-REQUIRED_USE="qdbm? ( !tokyocabinet )
- tokyocabinet? ( !qdbm )
- !tokyocabinet? ( qdbm )
- !qdbm? ( tokyocabinet )"
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild
b/net-misc/cfengine/cfengine-3.4.5.ebuild
index 756554953c2..c377a81c5a5 100644
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -35,10 +35,7 @@ DEPEND=">=sys-libs/db-4
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-REQUIRED_USE="qdbm? ( !tokyocabinet )
- tokyocabinet? ( !qdbm )
- !tokyocabinet? ( qdbm )
- !qdbm? ( tokyocabinet )"
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild
b/net-misc/cfengine/cfengine-3.5.3.ebuild
index ff3b6cb7a28..8f39bfb0f9b 100644
--- a/net-misc/cfengine/cfengine-3.5.3.ebuild
+++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -33,10 +33,7 @@ DEPEND="acl? ( virtual/acl )
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-REQUIRED_USE="qdbm? ( !tokyocabinet )
- tokyocabinet? ( !qdbm )
- !tokyocabinet? ( qdbm )
- !qdbm? ( tokyocabinet )"
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild
b/net-misc/cfengine/cfengine-3.6.2.ebuild
index 3d85b439dd0..a4e5ae6c7db 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -33,10 +33,7 @@ DEPEND="acl? ( virtual/acl )
RDEPEND="${DEPEND}"
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-REQUIRED_USE="qdbm? ( !tokyocabinet )
- tokyocabinet? ( !qdbm )
- !tokyocabinet? ( qdbm )
- !qdbm? ( tokyocabinet )"
+REQUIRED_USE="^^ ( qdbm tokyocabinet )"
S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
commit: d9aa63502bcaa1f3abf8cb21011e0d8f2a962b4c Author: Marc Schiffbauer gentoo org> AuthorDate: Thu Dec 29 21:02:23 2016 + Commit: Marc Schiffbauer gentoo org> CommitDate: Thu Dec 29 21:06:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9aa6350 net-misc/cfengine: removed myself as maintainer net-misc/cfengine/metadata.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml index a5b3d7e..fb9078d 100644 --- a/net-misc/cfengine/metadata.xml +++ b/net-misc/cfengine/metadata.xml @@ -6,11 +6,6 @@ Christian Ruppert cfengine 2.x only - - msch...@gentoo.org - Marc Schiffbauer - cfengine 2.x only - sysad...@gentoo.org Gentoo Sysadmin Project
