Proxy commit: making ssl optional, general cleaning.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 123 insertions, 7 deletions

diff --git a/sys-cluster/csync2/ChangeLog b/sys-cluster/csync2/ChangeLog
index c1e9956008ad..6160fe8a0951 100644
--- a/sys-cluster/csync2/ChangeLog
+++ b/sys-cluster/csync2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/csync2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.30 2010/06/21 10:08:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.31 2010/06/22 08:41:05 xarthisius Exp $
+
+*csync2-1.34-r2 (22 Jun 2010)
+
+  22 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +csync2-1.34-r2.ebuild:
+  Proxy commit: making ssl optional, general cleaning.
 
   21 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   Adding Ultrabug as maintainer.
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 780a6f569c9c..1b89a7ea3be6 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -7,15 +7,16 @@ AUX csync2.xinetd 388 RMD160 d1d6cd433c34356b649936958a43b16f247e7cd9 SHA1 60fd6
 DIST csync2-1.34-pure-gnutls.patch.bz2 32879 RMD160 281e393fd9cd831467dc0219c5fd3599d82a7659 SHA1 7f392f575af1080f4417e4ae46418f43ac57dbc1 SHA256 292121b82711b2988f7b98d0fa488262b6bb453aed4bc331a0673802b1ba5846
 DIST csync2-1.34.tar.gz 222765 RMD160 d79ddf0e608934d40f0095dde8aa5785c6094d84 SHA1 59b95388d378b659d64d17f7b736068dec7bf7ed SHA256 32b250dd4a0353f71015c5c3961174b975dd5e799e4a084e8f6d00792bd8c833
 EBUILD csync2-1.34-r1.ebuild 2527 RMD160 b2d909be4502e48e322b1dea6d49f0f3bb6aa44c SHA1 aab3bba333c074fa956b857bdee4864d9a365df5 SHA256 22ee6a796b81c83e88331be3d6b5427c087192646660d97e643a3a504fde4a54
+EBUILD csync2-1.34-r2.ebuild 2758 RMD160 f51152f7524e604c8c1586ffac85bf5eac4b08e3 SHA1 0c9156aaed7e3f7a451edbc86d340c72b13e22d8 SHA256 395151893101113bd8cf9aae18fbff82486337efb83ef86c486dc03b4134115d
 EBUILD csync2-1.34.ebuild 2576 RMD160 4a6f158e282f8f92961e8ee3f453431dfd491568 SHA1 f637817e135cb18e528426c582aab583809c77f0 SHA256 e5d0c5a43df02e3b6e3e81e9dc0bd857c0104cec3a6246ca2133a3f715742883
-MISC ChangeLog 4646 RMD160 40d74e1fcde5d8e710ba9d12899fd64d847c294e SHA1 0ddfe1c2dfa5cfabf5ba727685a1ede3028377a7 SHA256 7b888cb183a849be702769757dbf969227a12540292e099fa69ae5c0a8fcf896
+MISC ChangeLog 4813 RMD160 b2f1210e0ef34b8667317b50cdf8d6c456eeac23 SHA1 3dbb8959bf38add3694d3428f5df817d02311b3c SHA256 0e3beb99d227af71b650a38af4b710cf283c556cb954c642b1550e077c7ab217
 MISC metadata.xml 429 RMD160 1f6bbf4a59c7b588b3974427946a04bd5bb167e9 SHA1 1ca95a8397edc1c2cdc32b0d4342a3c4ac60bde8 SHA256 1f4d676e98c2ed2555bed72e1e0858e1fcdc975b1834a7b18ec815b238e0c2a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkwfOiEACgkQIiMqcbOVdxQQ7gP/cR5ESrcUleXwTVFzEob4D6J3
-ID56MKy91fOZx6uDLaN7Ee3037smEf+NLTeWrka59VE7GewFaG54JXMXo6t+Pd9K
-uJaTxiA+AukGhnHT57Ywl6pHbTXpB14gT+mxBgxuNewjB02JvagtJGNVXLVqWt3s
-gC0IiixDUm/8VzuZnjI=
-=eBef
+iJwEAQECAAYFAkwgdysACgkQIiMqcbOVdxTO6gP/cAA7prMrCd9sQwBMRYmtZoiU
+HTgRlLLCv4Xm0oBSQCIi/TsDhq3za77rFX6x/WbKVl19SGHm+acfx44trQOZYJ5L
+SdlVrAjGEJqO+uiaL44/n29+9L51UlGqNi1MvvqsBkFUhM8ozLGXJFyRjrH2Zp/w
+/RkH/brSpOMJlSIC9tw=
+=pYoe
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/csync2/csync2-1.34-r2.ebuild b/sys-cluster/csync2/csync2-1.34-r2.ebuild
new file mode 100644
index 000000000000..0681dbd9d80e
--- /dev/null
+++ b/sys-cluster/csync2/csync2-1.34-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.34-r2.ebuild,v 1.1 2010/06/22 08:41:05 xarthisius Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="Cluster synchronization tool."
+HOMEPAGE="http://oss.linbit.com/csync2/"
+SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ssl xinetd"
+
+RDEPEND=">=net-libs/librsync-0.9.5
+	=dev-db/sqlite-2.8*
+	ssl? ( >=net-libs/gnutls-2.7.3 )
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+SLOT="0"
+
+src_prepare() {
+	if use ssl; then
+		epatch "${FILESDIR}"/${P}-gnutls.patch #274213
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--sysconfdir=/etc/csync2 \
+		$(use_enable ssl gnutls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/${PN}.xinetd ${PN} || die
+	fi
+
+	keepdir /var/lib/csync2
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO csync2_locheck.sh || die
+}
+
+pkg_postinst() {
+	if use xinetd; then
+		echo
+		einfo "After you setup your conf file, edit the xinetd"
+		einfo "entry in /etc/xinetd.d/${PN} to enable, then"
+		einfo "start xinetd: /etc/init.d/xinetd start"
+	fi
+	echo
+	einfo "To add ${PN} to your services file"
+	if use ssl; then
+		einfo "and to generate the SSL certificates,"
+	fi
+	einfo "just run this command after you install:"
+	echo
+	einfo "emerge  --config =${PF}"
+	echo
+	einfo "Now you can find csync2.cfg under /etc/${PN}"
+	einfo "Please move you old config to the right location"
+	echo
+	einfo "To start csync2 as a standalone daemon, simply run:"
+	einfo "/etc/init.d/csync2 start"
+	echo
+}
+
+pkg_config() {
+	einfo "Updating ${ROOT}/etc/services"
+	{ grep -v ^${PN} "${ROOT}"/etc/services;
+	echo "csync2  30865/tcp"
+	} > "${ROOT}"/etc/services.new
+	mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services
+
+	if use ssl; then
+		if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then
+			einfo "Creating default certificate in ${ROOT}/etc/${PN}"
+
+			openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null
+
+			yes '' | \
+			openssl req -new \
+				-key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+				&> "${ROOT}"/dev/null
+
+			openssl x509 -req -days 600 \
+				-in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \
+				-signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \
+				-out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \
+				&> "${ROOT}"/dev/null
+
+			rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr
+			chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem
+		fi
+	fi
+}