fix path to ip (bug #486688), drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x1A5D023975B0583D!

diff --git a/net-misc/ucarp/ChangeLog b/net-misc/ucarp/ChangeLog
index 422b5d67dde6ba147030e1203a5a2d6936a6043b..54525ea2529e360f553eb8fd3c5d5aa1a0f6b13a 100644 (file)
--- a/net-misc/ucarp/ChangeLog
+++ b/net-misc/ucarp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ucarp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ChangeLog,v 1.24 2014/08/10 20:48:37 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ChangeLog,v 1.25 2014/11/28 15:54:55 dev-zero Exp $
+
+*ucarp-1.5.2-r4 (28 Nov 2014)
+
+  28 Nov 2014; Tiziano Müller <dev-zero@gentoo.org>
+  +files/vip-down-default.sh-r1, +files/vip-up-default.sh-r1,
+  +ucarp-1.5.2-r4.ebuild, -ucarp-1.5.2-r1.ebuild, -ucarp-1.5.2.ebuild:
+  fix path to ip (bug #486688), drop old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ucarp-1.3.ebuild,
   ucarp-1.5.2-r1.ebuild, ucarp-1.5.2-r3.ebuild, ucarp-1.5.2.ebuild:

diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index 312365f2e2d183f06be3cb5967eb08759472c9a7..45cb5d22259c2dc235a52c0007fd8eeba131dd93 100644 (file)
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -5,19 +5,32 @@ AUX ucarp.8 6311 SHA256 18a7178c1362d514d8bacb56eb4c89d3987f936397a1dec72376e161
 AUX ucarp.confd 880 SHA256 234ce139aef7b7c24ad7ab7d9901c65e602180bc7bbdba06bb36ffa9379fcfab SHA512 e72594f6292dcc4e17c13c07f12d5cd9ef791ea91ee2c22d5023d0aa574990b6ec6c6714dc45d678ba70ec8395790cd80272a8a57adbd8c735f296e580a298a1 WHIRLPOOL b2b6cdcc7edcc8f73c052e75ce835216b1c06fa2214828a180d20dac7b0189e602f2987c8274e01bf7741b251c17204e3f959c495df535d6eabd2292a5fcb986
 AUX ucarp.initd-r1 2013 SHA256 12dc534631477e9ca8c680ae3b2aa5fda4a7e5b2e4b13ebb9180d933b066b0fb SHA512 59a9f9ff9ea550015f305327a26e21001464d4337d322f7357c0ad38a8296656afb931e4ebf07f300ab496a7eb3a58af84aa89e8cef2f3bd338a44dda175e7ad WHIRLPOOL ac6f9656d5c40b92e5375c9798e0d26800bb1f8352e95de91fb348ebfe8615d0998b1a713d5c7205677da5ec9a3cd8222d550faec942caf426c8c72d8b78b20b
 AUX vip-down-default.sh 119 SHA256 864b62a05eadf0b1bcd097d31803ba019ad5e6e8e3776bd38c56e073ab4b7f00 SHA512 026988d259ab07568995e0609ee0b22245abcf26c65e7c3ddeea8efc801a78eb2796e7423c52731b8070db99e410db4de8217d0a3b7b8681d399fef25c64e56f WHIRLPOOL 1e77c2af43769fbbb0de7f9d5f1baffe9186b635710c9fd59f46b39a36f5926334460942be3e9963c05dc256adbe87fbef6ae26d7705a53850747c9853bab346
+AUX vip-down-default.sh-r1 118 SHA256 7b822d0a641d3da7f108c3f73794d935d1b4670bb6f3056587be375182f7d7c1 SHA512 ddbee9c02601d32f6660b1f769b0cc87595c6417a8ade66f31d0815fa21d54291809f004ee4ce36d097789b6e5f5a0aaba77426bef54c2a824e6af334baf904b WHIRLPOOL 4248fd0d9d7c3efcd9ea2190b1c63a7f8492e6e654536ef89895d293070982b86fa3ba91e943f020c73058808c4c2cbdd85b1579b6c9ea9dde37c7369583b9bf
 AUX vip-up-default.sh 132 SHA256 41cdfdf20f802dcdf7bed9206752d9f232fdc47891ee5103a10a8344131a555f SHA512 4db8a047c39671578d0fa0e0dfadf3ce6e4f5881a85811c5c8e986f26c97b5de64cc58578cd77ba9ee93e2c6659b178c69575d3006934da56736441c30c703ce WHIRLPOOL 0ee0c3d448244ce358a99667b5157d9b567d6a2c947ab5b2bee3eca4534a19be3e1d1c63e0d881026155dbf8b86b0e9a4192274ac28d6f10a0af3f39d42ce365
+AUX vip-up-default.sh-r1 131 SHA256 b448dd2d8e22a1f9bc7ce349abda20a5730c12f9fc8ee659d3d302de09fdfa85 SHA512 d00a2acaa44567f936e029af96a841bf815b75e18f5d2563800e996acdea68ef3265e7ea7b67e7cba3fe671e7809ec905e9cc39ad5fe2c807170cfa1fa6595ff WHIRLPOOL 344292b6c302d4bbee0aa71d975f42661bc319aaf33f6ea82a611a4dd081a7d7ffd09ee1dce3bac9f13d4ad902abff8c5112437d59770c47b1541a50c72507bf
 DIST ucarp-1.3.tar.gz 226575 SHA256 c295479da930cf5627ac0d6af45dac3934fa7633f40c163a86b1fd28feb93aba SHA512 5a601d6c7edb87692847d0485dc223b7ccc738a417320875894f68d67ae38d23679e70fafd97dbf646b8418de2b09d393fcded532419cc1436e5fe8758c6cc32 WHIRLPOOL 0944024b091240f14eb9d2707ad7b62ff36bf5483e2c0dac30027f75d6ba53994be7ce8ac7b7f7ecc8dc38b152234da9ff22985e72a1ed5a12943d306d649b68
 DIST ucarp-1.5.2.tar.gz 429089 SHA256 f3cc77e28481fd04f62bb3d4bc03104a97dd316c80c0ed04ad7be24b544112f3 SHA512 568ff2061e59d314c72a160ccb42eb099bf7cdf04bc30f405b5b62322dff3ceb4fa037c2b430fdb4cee25f0dcacf9309a15bd814b4b70b640840400bda20b253 WHIRLPOOL b763e7c7023f1364e735baf2df2855bd6bbbbd937267c1a411da22b2ad109b01807f8f7c798662ed0e86f1137a1c8a9ed601eb2a3242a444ba5560d8f47bc285
 EBUILD ucarp-1.3.ebuild 715 SHA256 ddfccbf5fff420008ff62d8e19fac020bcd89e7dd09324c7f1fdff6fdfe3c0c2 SHA512 a50e891827bd13270cc938ca271d711ceccb6d63f1b78df9e2611493873b572bbd62fa5587c8da77145e682cce84a98ce2ea0d73e7baca03e98998046ad606f6 WHIRLPOOL 332839251357353f2f639a4f28e0996f5698828828ff148176d9fcd0355390f9ea3957f63181ca777bff65ed9da6ac2824b4445fcd7602a6f7baa3d9979d2767
-EBUILD ucarp-1.5.2-r1.ebuild 808 SHA256 7722fea0467d9cbda97572142525448c2a35971049fa1f865dc913d3fc4f4336 SHA512 fd70bd3da74120367149f395c7992eb063499af68e1c8b9b83615d7dcfce4c183695dc955ed997a98f42f378843036fd1305dc16ed4d93ef5017febfe216eb41 WHIRLPOOL 2bc2af977b4704c88bba2f0581f33623ad68b6df967aaddd175c3f4cbe3a9631cccc963d345cc96efb8a121a9435397fdc4b4a7068fe709df4e2eaeaef8ec16b
 EBUILD ucarp-1.5.2-r3.ebuild 1358 SHA256 d65c50a5e78d837785f9f8d5b0726056fcacd41944686c7760cc3d166dbc00ca SHA512 8a77a01d165d37d676cca051848eb89f846dcf9b301d8ef0a41243253242e43c72adf85722c3645f5414e14db98c2b7da10c2f1b98917c2d138509f18e700a45 WHIRLPOOL c16da1d5ff0a4779dda3af3711799377fc31d45506ef8d9649dbf7f7df64c6cb13d5e0b5cd13cdd3caa446ff830b3255e5b82fb3b80f6d1eb8be5de29390a3e6
-EBUILD ucarp-1.5.2.ebuild 708 SHA256 e80000985e1c57ee40ac3d62b9783727d8636be11df4cd30fc4f5e24110c2715 SHA512 ce6123040dda10c175266253cef153068e9372bebc5dd7718b203d1ef802ab243376e75237b07a01d417f81f1603800fa220d54e3d175d393567dd4178a69f53 WHIRLPOOL 8e26a915ea45c773e6b17a3599c687a0abfb221f805fef18d6621f7b644134fa1f5f1db452d1567e9990cebe532c5d2a18b3ac9230545ce6ed6c8c19ab2cd873
-MISC ChangeLog 3893 SHA256 38fdecb9c0f63d171cdb7e31348ae83023d415d4fec31dcbb231d07c3e9b50a2 SHA512 b4c8a9c7b1777a308110fd05f26fe15d5c301ca2556f79c68ff6780730c9f655aea2e85f2404f607b117aec2a271ba6d044886b64816c5ce2d3a114d08b45c60 WHIRLPOOL b722505f72c0e40afc59c4f8f18f52623a946608a49981b8be4a1fce40bbd86e66642afe8d1b4853c5245b565207b8d2da31c51b0c181ec1f832027e30c1158d
+EBUILD ucarp-1.5.2-r4.ebuild 1407 SHA256 3bb7c94d8acf53dfff2759071cb98d1ad79dc8cfc521789b4bccfb8bb918200c SHA512 55f6b95ccf197917d2ed6d28f5e7860fc735e34cb76d0ef486539e9d3b276825a4b379f248c4d3f1b83ea0f952ee2aef75534c0f89a0650287ca3127ab453b3e WHIRLPOOL 504a40aeb3808942adf1a3b8b635b826dc5c663649ac637adba1aa12ca8d93245b87ce86f2a6441db9561ccb524acdeb3bf0c0556b7b2d7b4a00b5e9e601307f
+MISC ChangeLog 4154 SHA256 57df0f99e228a0991551dcb1c4d0ba2a6968bccc2b780a92c6e8ba7f534c957b SHA512 1c91eab0c016d367dc2d06a1238670bb0f6d74c73c26d198829502ab922c22b2bef6c3f8df62725bbd743b2b2fe6d2e88bf7ac82a1b74e85aabf390841331d61 WHIRLPOOL e9839248600791521c292cbcc08b82a8413b06f16b9b7497c771f6c1391faaec3c0ffd1f1a1acca6a1ce4015e3bc066872440680d5ee96e11ee9c102f83e6b41
 MISC metadata.xml 160 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9 SHA512 83001424d846619d2551025541359bae52ff22cfbbce0d2beef47b085c937ee44eeb267493486451403905151e3a66db2f5fb1a1d072bf03e598146df9af02e8 WHIRLPOOL 1d4572f178726ad1e060380478c630fc46fb641eed12408419df7bbf3b9331a92514bb970e798877e01313571eb7af5aaee9b98182ea93a4a1d7c644fe2598b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn2qYACgkQcaHudmEf86puhwCffL5NFe4ydED+Wb8uLH3Jvnps
-pUIAn18uNmA7+uH3Lp7EDYRuwkpUq916
-=w2z0
+iQJ8BAEBCABmBQJUeJrQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
+QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9CIUP/j6qaSWw9bHzjfVGl/SIDN7d
+Z46P2bmJL2Rtb3vAjRvJofLSM6lzdTeorGd6SAduP6JQGv6UAtf0L+5FnNkX+VFJ
+nsilxAM9b6JzKVwOsByak+H/HI+tE6ckNeQDFatiO/Y1EOia+9IcGiokeapMWGRt
+IrgMf3W2vWPnI/8wWBFe2B3sjMWOKRVsC/yDGAsDefXkx6URuSf0uN3z4Cf4RH3D
+L7kDOWdU0i7QL0FiiCKh0JCPyYwNZ4MtD1Ua1hhr1M2rBiPDAc2/WiJj/WpM0wDp
+xeXPWb2UBDC3CcFheAxZbQWGqW3Wq6ZhaXXli7BQOwZr7sO13wdFI5qv9k+IJrBk
+PKY+Sr2NbVdXivTLMkYYPGNYY77Kecxf4RNHxojB1+I3MkrC9MlIM/R3u3cWbcQd
+XwTmBnDamoqohdT7cEdob+eP1FPlebtCwzxHcQmNGO8u5thH5YnemzFdyMw3keLb
+CNgf8HBTNiwbrwkQSjfq6AXVU2Kxp2/gEi9aTDnOIkpgRZ5di09QivfMKrHki6Tq
+bi/6TtLXNYOJfi78gZq6oT4YXFNACx+pXNBFsF+eBEagerrmm4mrgxQapcZ+61Wo
+Ls2sth6kExc/QsNzN2HlUCNP1vZLh9eC8cUyWAMOC/G2LV+nQ5tM705jhudDu1/v
+p1oBw2nHfozV8EJWxnCr
+=ARkK
 -----END PGP SIGNATURE-----

diff --git a/net-misc/ucarp/files/vip-down-default.sh-r1 b/net-misc/ucarp/files/vip-down-default.sh-r1
new file mode 100644 (file)
index 0000000..5e1862b
--- /dev/null
+++ b/net-misc/ucarp/files/vip-down-default.sh-r1
@@ -0,0 +1,7 @@
+#! /bin/sh
+exec 2> /dev/null
+
+/bin/ip addr del "$2"/"$3" dev "$1"
+
+# or alternatively:
+# /sbin/ifconfig "$1":254 down

diff --git a/net-misc/ucarp/files/vip-up-default.sh-r1 b/net-misc/ucarp/files/vip-up-default.sh-r1
new file mode 100644 (file)
index 0000000..4b44daf
--- /dev/null
+++ b/net-misc/ucarp/files/vip-up-default.sh-r1
@@ -0,0 +1,7 @@
+#! /bin/sh
+exec 2> /dev/null
+
+/bin/ip addr add "$2"/"$3" dev "$1"
+
+# or alternatively:
+# /sbin/ifconfig "$1":254 "$2" netmask "$3"

diff --git a/net-misc/ucarp/ucarp-1.5.2-r1.ebuild b/net-misc/ucarp/ucarp-1.5.2-r1.ebuild
deleted file mode 100644 (file)
index 301f3b0..0000000
--- a/net-misc/ucarp/ucarp-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-1.5.2-r1.ebuild,v 1.4 2014/08/10 20:48:37 slyfox Exp $
-
-EAPI="4"
-
-inherit base
-
-DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
-HOMEPAGE="http://www.ucarp.org"
-SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-       nls? ( sys-devel/gettext )"
-
-DOCS=( "README" "NEWS" "AUTHORS" "ChangeLog"
-       "examples/linux/vip-up.sh" "examples/linux/vip-down.sh" )
-
-src_configure() {
-       econf $(use_enable nls)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       dodoc "${DOCS[@]}"
-       doman "${FILESDIR}"/ucarp.8
-}

diff --git a/net-misc/ucarp/ucarp-1.5.2-r4.ebuild b/net-misc/ucarp/ucarp-1.5.2-r4.ebuild
new file mode 100644 (file)
index 0000000..d0039e0
--- /dev/null
+++ b/net-misc/ucarp/ucarp-1.5.2-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-1.5.2-r4.ebuild,v 1.1 2014/11/28 15:54:55 dev-zero Exp $
+
+EAPI="5"
+
+DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
+HOMEPAGE="http://www.ucarp.org"
+SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )"
+
+src_configure() {
+       econf $(use_enable nls)
+}
+
+src_install() {
+       default
+
+       doman "${FILESDIR}"/ucarp.8
+
+       exeinto /usr/libexec/ucarp
+       newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh
+       newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh
+
+       keepdir /etc/ucarp
+
+       newinitd "${FILESDIR}"/ucarp.initd-r1 ucarp
+       newconfd "${FILESDIR}"/ucarp.confd ucarp
+}
+
+pkg_postinst() {
+       elog "The provided init script needs to be configured first."
+       elog "Edit /etc/conf.d/ucarp to suite your environment."
+       elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
+       elog "or whatever file you have set \$UCARP_PASSFILE to."
+
+       elog "If you need more than one instance of ucarp running, simply symlink"
+       elog "the init script and create a copy of the init script configuration"
+       elog "which corresponds to the name of the init script."
+}

diff --git a/net-misc/ucarp/ucarp-1.5.2.ebuild b/net-misc/ucarp/ucarp-1.5.2.ebuild
deleted file mode 100644 (file)
index c2aab2b..0000000
--- a/net-misc/ucarp/ucarp-1.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-1.5.2.ebuild,v 1.3 2014/08/10 20:48:37 slyfox Exp $
-
-EAPI="2"
-
-inherit base
-
-DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
-HOMEPAGE="http://www.ucarp.org"
-SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-       nls? ( sys-devel/gettext )"
-
-DOCS=( "README" "NEWS" "AUTHORS" "ChangeLog"
-       "examples/linux/vip-up.sh" "examples/linux/vip-down.sh" )
-
-src_configure() {
-       econf $(use_enable nls)
-}