X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 7B502DC188F for ; Fri, 11 Dec 2015 10:45:44 +0000 (UTC) Received: from smtp.core-hosting.net (ns1.core-hosting.net [95.130.13.75]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 1A7D1DC1731 for ; Fri, 11 Dec 2015 10:45:44 +0000 (UTC) Received: from tiptop.internal (unknown [109.203.51.220]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by smtp.core-hosting.net (Postfix) with ESMTPSA id CB3F0AA3C07 for ; Fri, 11 Dec 2015 11:45:42 +0100 (CET) Date: Fri, 11 Dec 2015 11:43:44 +0100 From: Olivier To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] testing/cfengine: Update to 3.7.2 Message-ID: <20151211114344.51fb4648@tiptop.internal> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/E6HpkOW6tl=gI2o7WhBK+Sn"; protocol="application/pgp-signature" X-Virus-Scanned: ClamAV using ClamSMTP --Sig_/E6HpkOW6tl=gI2o7WhBK+Sn Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable =46rom d41d6bbbe171d910a93d492e64e7dc099b2381de Mon Sep 17 00:00:00 2001 From: Olivier Mauras Date: Fri, 11 Dec 2015 11:18:19 +0100 Subject: [PATCH 2/2] testing/cfengine: Update to 3.7.2 --- testing/cfengine/APKBUILD | 73 +++++++++++++++++++++++++++++= ++++ unmaintained/cfengine/APKBUILD | 48 ---------------------- unmaintained/cfengine/alpinelinux.patch | 72 -----------------------------= --- 3 files changed, 73 insertions(+), 120 deletions(-) create mode 100644 testing/cfengine/APKBUILD delete mode 100644 unmaintained/cfengine/APKBUILD delete mode 100644 unmaintained/cfengine/alpinelinux.patch diff --git a/testing/cfengine/APKBUILD b/testing/cfengine/APKBUILD new file mode 100644 index 0000000..2fafcb6 --- /dev/null +++ b/testing/cfengine/APKBUILD @@ -0,0 +1,73 @@ +# Contributor: Natanael Copa +# Maintainer: +pkgname=3Dcfengine +pkgver=3D3.7.2 +pkgrel=3D0 +pkgdesc=3D"A systems administration tool for networks" +url=3D"http://www.cfengine.org/" +arch=3D"all" +license=3D"GPLv3" +depends=3D"" +depends_dev=3D"" +makedepends=3D"$depends_dev lmdb-dev openssl-dev bison flex-dev + acl-dev pcre-dev linux-headers" +install=3D"" +subpackages=3D"$pkgname-doc $pkgname-masterfiles" +source=3D"https://cfengine-package-repos.s3.amazonaws.com/tarballs/$pkgnam= e-$pkgver.tar.gz + https://cfengine-package-repos.s3.amazonaws.com/tarballs/$pkgname-masterf= iles-$pkgver.tar.gz" + +_builddir=3D"$srcdir"/cfengine-${pkgver%_p*} +_builddirmasterfiles=3D"$srcdir"/cfengine-masterfiles-${pkgver%_p*} +prepare() { + local i + cd "$_builddir" + update_config_sub || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + + # Also extract masterfiles + cd $srcdir + tar xf $pkgname-masterfiles-$pkgver.tar.gz +} + +build() { + cd "$_builddir" + ./configure \ + --build=3D$CBUILD \ + --host=3D$CHOST \ + --with-pic \ + --prefix=3D/usr \ + --enable-fhs \ + --localstatedir=3D/var \ + --mandir=3D/usr/share/man \ + --with-lmdb \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make install DESTDIR=3D"$pkgdir" || return 1 +} + +masterfiles() { + pkgdesc=3D"Cfengine default masterfiles" + arch=3D"noarch" + depends=3D"cfengine" + cd "$_builddirmasterfiles" + ./configure \ + --prefix=3D/var/lib/cfengine \ + || return 1 + #make install DESTDIR=3D"$pkgdir/../$pkgname-masterfiles" || return 1 + make install DESTDIR=3D"$subpkgdir" || return 1 +} + +md5sums=3D"aff92abe87a5424680afd285d0384bef cfengine-3.7.2.tar.gz +48335259f199c87c2d7652ed8405f21c cfengine-masterfiles-3.7.2.tar.gz" +sha256sums=3D"aad9ae260864acbdf2aa441c208365460f9a8ecaa53618bbdb465e37aef4= ade5 cfengine-3.7.2.tar.gz +ed2026d0deca24e9094ec1d0e84a9488eebd470cc23fec940eadbb7106515bc5 cfengine= -masterfiles-3.7.2.tar.gz" +sha512sums=3D"8b4d0dac81cb3734489e3e1d60a034c3074d710f35a6c2ab35cffe9c066a= 63c3214b062ef4116ff3ef46461c8ce53ebb02c6513cb49f9edf2c9a81f4679066e6 cfeng= ine-3.7.2.tar.gz +e2a6ceba4db90e6b2cd4f30fc2c276012660aca8a76fbd5bbc3debd8e6226cd5f8f270f593= 6b38e1ccd36cee706fd697bfde5c96739bde38d8c11f4ef3f0f86b cfengine-masterfile= s-3.7.2.tar.gz" diff --git a/unmaintained/cfengine/APKBUILD b/unmaintained/cfengine/APKBUILD deleted file mode 100644 index 4f34cc8..0000000 --- a/unmaintained/cfengine/APKBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Contributor: Franz Bettag -# Maintainer: -pkgname=3Dcfengine -pkgver=3D3.4.4 -pkgrel=3D0 -pkgdesc=3D"CFEngine Configuration Management" -url=3D"http://cfengine.com/" -arch=3D"all" -license=3D"GPLv3" -depends=3D"" -makedepends=3D"tokyocabinet-dev openssl-dev pcre-dev acl-dev" -install=3D"" -subpackages=3D"$pkgname-doc" -source=3D"$pkgname-$pkgver.tar.gz::http://cfengine.com/source-code/downloa= d?file=3D$pkgname-$pkgver.tar.gz - alpinelinux.patch" - -_builddir=3D"$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - ./configure --prefix=3D/usr \ - --localstatedir=3D/var \ - --enable-fhs \ - || return 1 - - make all || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR=3D"$pkgdir" install || return 1 -} - -md5sums=3D"81d574a6d68f3f0a91f0803349a8b8f5 cfengine-3.4.4.tar.gz -29767a17f46a943bdaebcf8aa0631da9 alpinelinux.patch" -sha256sums=3D"6572609851724ec8fc58c60474742e5907989462020e6c246111c2731adb= 6a37 cfengine-3.4.4.tar.gz -e294dc92633b2c90cb8f02d86d2269af9150a1333b4134cf9dd1f03500f9da17 alpineli= nux.patch" -sha512sums=3D"986070122a0a0d3e15f50181700cbf230c8a91a5458f0b998d32bf10fdac= da016e565ec710e589341bc094dd44dcd5da77abfbf90263b6ed51898e0ddbefde21 cfeng= ine-3.4.4.tar.gz -0d182dba55bc65a8680747d91615369795d5b6dad8ace4b3c8f5cc394ea2592c892729f142= 009cc3f92aea7d6b63a0575a22565fddf1a9066397a3c0ecd70172 alpinelinux.patch" diff --git a/unmaintained/cfengine/alpinelinux.patch b/unmaintained/cfengin= e/alpinelinux.patch deleted file mode 100644 index 40c95aa..0000000 --- a/unmaintained/cfengine/alpinelinux.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/masterfiles/libraries/cfengine_stdlib.cf b/masterfiles/librar= ies/cfengine_stdlib.cf -index 13d554f..24529e8 100644 ---- a/masterfiles/libraries/cfengine_stdlib.cf -+++ b/masterfiles/libraries/cfengine_stdlib.cf -@@ -2047,6 +2047,31 @@ package_update_command =3D> "/usr/bin/pacman -S --n= oconfirm --noprogressbar --need -=20 - ## -=20 -+body package_method alpinelinux -+{ -+ package_changes =3D> "individual"; -+ -+ package_list_command =3D> "/sbin/apk info -v"; -+ -+ # Remember to escape special characters like | -+ -+ package_list_name_regex =3D> "([^\s]+)-.*"; -+ package_list_version_regex =3D> "[^\s]+-([^\s]+).*"; -+ -+ package_name_regex =3D> "([^\s]+)-.*"; -+ package_version_regex =3D> "[^\s]+-([^\s]+).*"; -+ -+ package_installed_regex =3D> ".*"; -+ -+ package_name_convention =3D> "$(name)-$(version)"; -+ -+ -+ package_add_command =3D> "/sbin/apk add"; -+ package_delete_command =3D> "/sbin/apk del"; -+} -+ -+## -+ - # Single bundle for all the similar managers simplifies promises -=20 - body package_method generic -@@ -2186,6 +2211,18 @@ archlinux:: - package_add_command =3D> "/usr/bin/pacman -S --noconfirm --noprogressbar= --needed"; - package_delete_command =3D> "/usr/bin/pacman -Rs --noconfirm"; - package_update_command =3D> "/usr/bin/pacman -S --noconfirm --noprogress= bar --needed"; -+ -+alpinelinux:: -+ package_changes =3D> "individual"; -+ package_list_command =3D> "/sbin/apk info -v"; -+ package_list_name_regex =3D> "([^\s]+)-.*"; -+ package_list_version_regex =3D> "[^\s]+-([^\s]+).*"; -+ package_name_regex =3D> "([^\s]+)-.*"; -+ package_version_regex =3D> "[^\s]+-([^\s]+).*"; -+ package_installed_regex =3D> ".*"; -+ package_name_convention =3D> "$(name)-$(version)"; -+ package_add_command =3D> "/sbin/apk add"; -+ package_delete_command =3D> "/sbin/apk del"; - } -=20 - ## -diff --git a/src/sysinfo.c b/src/sysinfo.c -index 557f449..56046ba 100644 ---- a/src/sysinfo.c -+++ b/src/sysinfo.c -@@ -819,6 +819,12 @@ void OSClasses(void) - SetFlavour("UnitedLinux"); - } -=20 -+ if (cfstat("/etc/alpine-release", &statbuf) !=3D -1) -+ { -+ CfOut(cf_verbose, "", "This appears to be an AlpineLinux system.\= n"); -+ SetFlavour("alpinelinux"); -+ } -+ - if (cfstat("/etc/gentoo-release", &statbuf) !=3D -1) - { - CfOut(cf_verbose, "", "This appears to be a gentoo system.\n"); --=20 2.6.3 --Sig_/E6HpkOW6tl=gI2o7WhBK+Sn Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWaqjgAAoJEJXQwVHPrdN8JdUQAIKqavfwyaDFro0d3FXa5w3G tsNGcawq8byaM7ahFMRGW1pdtsBHQMqr9lCbSQRyxt0ig9pXFUo9JXT4i9JaC94S 0/h+T8nppkyJyQjcvKpCBBYGUnatnVAappPtrNMdV76agGSouz3alD5I80R0OO3y BGnkp1hHq+kF8y0+h3ZMli4Hnl+52nh7dfaKSS0lSJoSSwv7DB4C3+x2Sf3iAZND 3Cc0Bw6/9TZJS9jpi7X2OEGjrHilPVMPy4de5UElAMCuplj3CKuSc7tUWrIu0RR3 DnUZd2ZTT3Ygzk6x7PvwRnpQkklzoVE4/V7OHistUwu3te4LuoQYHy1B+aOngOkd urXT6Io3QC/u2+4MrXF2aLGR0Ts94LcLl5nw2UNcIEJNDA8Kl5BBHkIiIhA5UeFW d9/HokSKLJyyvDBwC+3J9zIQNCFcYNE8ndsX7uSz34aOF+0Q0QcgqlAtEfc+0JBK OFe17nJ+314iNdJx191QEwD9VLYBwmdZTbL4dKJZuX03ZEKSzlIlzq6Y0HXrHWva XyAzoNNu8KkQWV0deyKl2p0bE80eF7s6RqQlkNxpBmL13W68jFRGW6XFD5gi94+R wTEP80sGCo5RIn9NlaLG81b0n7T/anFjtLV9khOgVTUBdMh+mIt2I2gjGiMI9Bez CMd8Rw+QB8bm6BG92xxN =Xdfy -----END PGP SIGNATURE----- --Sig_/E6HpkOW6tl=gI2o7WhBK+Sn-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---