From 086a094baa5f3e65a9f249d6709b8f39a1d65323 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 25 Aug 2011 09:50:42 +0000 Subject: [PATCH] Version bump. Bug #379907. Thanks to Dan Weeks . Assigned to proxy-maintainers Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- app-admin/conserver/ChangeLog | 11 +- app-admin/conserver/Manifest | 27 ++++- app-admin/conserver/conserver-8.1.18.ebuild | 87 +++++++++++++++ .../files/conserver-8.1.18-dmalloc.patch | 100 ++++++++++++++++++ app-admin/conserver/metadata.xml | 11 +- 5 files changed, 230 insertions(+), 6 deletions(-) create mode 100644 app-admin/conserver/conserver-8.1.18.ebuild create mode 100644 app-admin/conserver/files/conserver-8.1.18-dmalloc.patch diff --git a/app-admin/conserver/ChangeLog b/app-admin/conserver/ChangeLog index c2af338b4f32..1c97786a395e 100644 --- a/app-admin/conserver/ChangeLog +++ b/app-admin/conserver/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/conserver -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.75 2009/02/23 14:57:29 josejx Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.76 2011/08/25 09:50:42 hwoarang Exp $ + +*conserver-8.1.18 (24 Aug 2011) + + 24 Aug 2011; Markos Chandras +conserver-8.1.18.ebuild, + +files/conserver-8.1.18-dmalloc.patch, metadata.xml: + Version bump. Bug #379907. Thanks to Dan Weeks . Assigned + to proxy-maintainers 23 Feb 2009; Joseph Jezak conserver-8.1.16-r1.ebuild: Marked ~ppc/~ppc64 for bug #210799. diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest index cb10ce1e62d6..27dcf085b210 100644 --- a/app-admin/conserver/Manifest +++ b/app-admin/conserver/Manifest @@ -1,10 +1,33 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX conserver-8.1.18-dmalloc.patch 2806 RMD160 d53fb45b5bee83c42b772e26b1df2e3f0c3f7582 SHA1 4cf478a9f13dfa0d0800ee519268d0ac99121efa SHA256 4c2ce7620fd78d2d4b2fcdb11fbef03eb532124f95dc9653488d6c166fb59621 AUX conserver-prestrip.patch 882 RMD160 0ebc17ce4133f8a54cb0ce0a439d1f990e58a58d SHA1 5c166ca1302daa2f9961327cf3b54a3b4b614747 SHA256 3e333d4e3bce4faa67255fc8065c22590b24e812956f8d7b9645ae2788dd4839 AUX conserver.confd 288 RMD160 88e2e2f067f26ed5cc9394145a6feeddeb31cd58 SHA1 6f4f1720093e3fba537bdca6a683777e56a2a3e9 SHA256 1b3986fba9787bfd39c6c6921f4fbe644b048592cd7c2d8a69e73be15cf588c3 AUX conserver.initd 1172 RMD160 1af7d950f3f0fcde02fac7a60e1a6615047ed5cf SHA1 df196fa42a1a7963c96d483801826adae760c449 SHA256 87d44499372ae77065d7b04640bfb1a3ee138866abf0848f3bcac053f54b866e AUX conserver.pam-include.1 210 RMD160 8933bcb2018ff43b9b5ee2124fc1a87fbfafc8bb SHA1 525a78c675402c3ddc4ab49da9ffe3fbe2c475d2 SHA256 facea91616049551f44655a7f8a270c61dd571e860284abc972fd3430a9b8d50 AUX conserver.pam-pambase 194 RMD160 ae3f752424b71af34841e2b0ff5aec8dca0e9e2d SHA1 02885b0461f7916270b0219db893439ee9bb933f SHA256 7b1f7770c8781453907b2785c54b1043c8e66202437479c4d9664b71a0bac816 DIST conserver-8.1.16.tar.gz 311373 RMD160 918832d21d46f7f20cf9c1088c058190093343a0 SHA1 6e2a985927812cc8c253463d53911dc37fb37111 SHA256 43dc9d81bc23d76a0ec01acd1f54f5c276b715feeb8f52bb33b5c81f325a46d8 +DIST conserver-8.1.18.tar.gz 323247 RMD160 aad60ba5aa8d2860dd4fde505c93b6bf2c118002 SHA1 54336e8ce7f48a2d8d51e93f4df492b3e426a192 SHA256 3c73cebf732419c41c7c860032e41d83c1f152fe3115a30dc9851820b7864e14 EBUILD conserver-8.1.16-r1.ebuild 2234 RMD160 9b827957718da15cfe191c8beb0bcc0081dc30f6 SHA1 04a6fb94d2eae583052916e001070250ccb3ba24 SHA256 050e3b2dda044a7de98cd7aa10fb2e06d77aeb5fbc654a59ac320bf0cfa0dace EBUILD conserver-8.1.16.ebuild 2158 RMD160 ac5f2e3ec2d80e08883fea92d83c25bc41374142 SHA1 e2bd7f10dd3dda2ed1439ed820b9b0070e7f2526 SHA256 4522e779427552168c80371e72f0f7fd15560cde11035f0affeba3cf3d01fb56 -MISC ChangeLog 10841 RMD160 2a196ad580b15c361b2c2ba93372dea101110540 SHA1 ad81c5c59e78fd042acf073321496c674f32bac7 SHA256 b002d0f57905e355b44b75018d73849c3c55f46d94f55143993099bcc0a00f16 -MISC metadata.xml 1048 RMD160 cb99813534d36460e77e5d04548c2f8424bcd00e SHA1 89da5ce707b8c263694760f8b55ce39fb778ae57 SHA256 1571318e000418eb2cd09696ffaad21692c6bcab763ef0cb2ec72cd4a4cc941c +EBUILD conserver-8.1.18.ebuild 2351 RMD160 0d6995f5331c1f6f372dc7dbd77088e3f1290382 SHA1 5046e51169c16a0bbb98b5ffa725aed2431cad8b SHA256 ce651bac05af55ffe028fc5dbd77756d79a2ae440ceb4cf15dc1b053dd038a56 +MISC ChangeLog 11112 RMD160 04a5a24b2b0bce020a9bfa76510faaf89b36668f SHA1 1e959f14faf4590540d65c5dccc3c7ecdde99d11 SHA256 835b18cbe12ed60efaaf95d0917b2d9da9f53efdb1658e5fd23380db24cdab1b +MISC metadata.xml 1291 RMD160 3ac5ec8a1650c0b0ddd0da962825d4d5b6db2da7 SHA1 def2f0eb091d86e60f8534536d719b5318dc6066 SHA256 66b47d784b68d0bbf659636705a00143d8cfb307f50f3c1a57fb797e265e8249 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBCgAGBQJOVhrfAAoJEPqDWhW0r/LCAywP/20c92ic9bU1EmPOrFfBD5Lq +iQp1T8LcUC7L+sK1JDXd4BMyqAHyLPvCW5pRmH/gig8LyJv8lThWvIWVpfEjoH/F +YtjR2kranH49u6zTCPoGO0MkPLHnHhhj0xQ10YnnEC3xK72wEGqXSTYuZQVx1SD/ ++nSZjpoCT7ooqvM0rzGkzofiIly6bPboaWJt53K+vgRZjppfdh2KCXzXFi+KO24x +8eqsJAR9/TPV3lfDp24pUnj/EJ+nyiygbgsxA7VBhlKIJuJrghqRuLEugRcBwkuD +5w1tyQG3Tz8PkvyUUGoDBIwmvwF0AqJaeNqZCB5aD1pDT0WDjkzefT5vgXN+WxeT +cR0HVK4nM/kxrcbNHegYk5vWWK0kZRJvOIpkRdhy8ekCF6z92o0k+h1J/pdNqeir +RuDPZIcXBPVx2h+/8zZFA+mfdOq+0nh4Q9PVxTGUQpqPLakEQpPRWcvhBZZf9S+k +/WfPH9I7Y4Fusz2um6Kzjw5zgKxXpF6q9oOEEXwYRtbyodrRL16152SU12pMFdCd +VIhoYAGItBvSvZP59maKHtH0qqF0DVWLSjbQ71LD7WMpdDpjntgMLSf1SUsvm4LF +xuoH3v5FhgFE1eIo8wUldzzZYCoTApILIXq3GRCRg//SsMjZPzO7qsprMyOF6O20 +BiAjosX7asKqcby3kO/N +=6I0V +-----END PGP SIGNATURE----- diff --git a/app-admin/conserver/conserver-8.1.18.ebuild b/app-admin/conserver/conserver-8.1.18.ebuild new file mode 100644 index 000000000000..04d262649e26 --- /dev/null +++ b/app-admin/conserver/conserver-8.1.18.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.18.ebuild,v 1.1 2011/08/25 09:50:42 hwoarang Exp $ + +EAPI="4" + +inherit ssl-cert eutils pam autotools + +DESCRIPTION="Serial Console Manager" +HOMEPAGE="http://www.conserver.com/" +SRC_URI="http://www.conserver.com/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="kerberos pam ssl tcpd debug" + +DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g ) + pam? ( virtual/pam ) + tcpd? ( sys-apps/tcp-wrappers ) + debug? ( dev-libs/dmalloc ) + kerberos? ( + virtual/krb5 + net-libs/libgssglue + )" +RDEPEND="${DEPEND} + pam? ( >=sys-auth/pambase-20080219.1 )" + +src_prepare() { + # Apply patch to prevent package from stripping binaries + epatch "${FILESDIR}"/${PN}-prestrip.patch + + # Apply patch to use custom dmalloc macro + epatch "${FILESDIR}"/${P}-dmalloc.patch + + AT_M4DIR="m4" eautoreconf +} + +src_configure() { + econf \ + $(use_with ssl openssl) \ + $(use_with pam) \ + $(use_with tcpd libwrap) \ + $(use_with debug dmalloc) \ + $(use_with kerberos gssapi) \ + --with-logfile=/var/log/conserver.log \ + --with-pidfile=/var/run/conserver.pid \ + --with-cffile=conserver/conserver.cf \ + --with-pwdfile=conserver/conserver.passwd \ + --with-master=localhost \ + --with-port=7782 +} + +src_install() { + emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install + + ## create data directory + dodir /var/consoles + fowners daemon:daemon /var/consoles + fperms 700 /var/consoles + + ## add startup and sample config + newinitd "${FILESDIR}"/conserver.initd conserver + newconfd "${FILESDIR}"/conserver.confd conserver + + dodir /etc/conserver + fperms 700 /etc/conserver + insinto /etc/conserver + newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample + newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample + + ## add docs + dohtml conserver.html + dodoc CHANGES FAQ PROTOCOL README TODO + dodoc conserver/Sun-serial contrib/maketestcerts + newdoc conserver.cf/conserver.cf conserver.cf.sample + + # Add pam config + newpamd "${FILESDIR}"/conserver.pam-pambase conserver +} + +pkg_postinst() { + # Add certs if SSL use flag is enabled + if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then + install_cert /etc/ssl/conserver/conserver + fi +} diff --git a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch new file mode 100644 index 000000000000..ff82f74b261c --- /dev/null +++ b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch @@ -0,0 +1,100 @@ +--- configure.in 2011-08-19 01:11:06.000000000 -0400 ++++ configure.in 2011-08-19 02:06:50.000000000 -0400 +@@ -320,6 +320,8 @@ + AC_PROG_LN_S + AC_PROG_MAKE_SET + ++AM_WITH_DMALLOC([cons_with_dmalloc="YES"],[cons_with_dmalloc="NO"]) ++ + dnl ### Compiler characteristics. ################################## + AC_AIX + AC_C_CONST +@@ -578,51 +580,6 @@ + fi] + ) + +-cons_with_dmalloc="NO" +-AC_ARG_WITH(dmalloc, +- AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@], +- [Compile in dmalloc support]), +- [if test "$withval" != "no"; then +- if test "$withval" != "yes"; then +- DMALLOCCPPFLAGS="-I$withval/include" +- if test "$use_dash_r" != "yes"; then +- DMALLOCLDFLAGS="-L$withval/lib" +- else +- DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib" +- fi +- else +- DMALLOCCPPFLAGS="" +- DMALLOCLDFLAGS="" +- fi +- +- oCPPFLAGS="$CPPFLAGS" +- oLDFLAGS="$LDFLAGS" +- oLIBS="$LIBS" +- have_dmalloc=no +- +- CPPFLAGS="$CPPFLAGS $DMALLOCCPPFLAGS" +- LDFLAGS="$LDFLAGS $DMALLOCLDFLAGS" +- +- AC_CHECK_HEADER([dmalloc.h], +- [LIBS="$LIBS -ldmalloc" +- AC_MSG_CHECKING(for dmalloc libraries -ldmalloc) +- AC_TRY_LINK([#include +- ],[dmalloc_debug(0)], +- [AC_MSG_RESULT(yes) +- cons_with_dmalloc="YES" +- AC_DEFINE(HAVE_DMALLOC) +- have_dmalloc=yes], +- [AC_MSG_RESULT(no)])],) +- +- if test $have_dmalloc = no; then +- LIBS="$oLIBS" +- CPPFLAGS="$oCPPFLAGS" +- LDFLAGS="$oLDFLAGS" +- fi +- fi] +-) +- +- + dnl ### Check for needed functions. ################################ + + dnl dnl The following basically stollen from the less-358 distribution, but +--- /dev/null 2011-08-07 13:18:05.535976733 -0400 ++++ m4/dmalloc.m4 2011-08-19 03:49:03.755073497 -0400 +@@ -0,0 +1,34 @@ ++## ----------------------------------- ## -*- Autoconf -*- ++## Check if --with-dmalloc was given. ## ++## From Franc,ois Pinard ## ++## ----------------------------------- ## ++ ++# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010, ++# 2011 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 7 ++ ++dnl AM_WITH_DMALLOC([ACTION-IF-FOUND],[ACTION-IF-NOT]) ++AC_DEFUN([AM_WITH_DMALLOC], ++[AC_MSG_CHECKING([if malloc debugging is wanted]) ++AC_ARG_WITH([dmalloc], ++[AS_HELP_STRING([--with-dmalloc], ++ [use dmalloc, as in http://www.dmalloc.com])], ++[if test "$withval" = yes; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE([WITH_DMALLOC], [1], ++ [Define if using the dmalloc debugging malloc package]) ++ LIBS="$LIBS -ldmalloc" ++ LDFLAGS="$LDFLAGS -g" ++ [$1] ++else ++ AC_MSG_RESULT([no]) ++ [$2] ++fi], [AC_MSG_RESULT([no])]) ++]) ++ ++AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC]) diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml index 0756987f0d1f..831ceb9cc06f 100644 --- a/app-admin/conserver/metadata.xml +++ b/app-admin/conserver/metadata.xml @@ -1,9 +1,16 @@ - no-herd + proxy-maintainers - maintainer-needed@gentoo.org + hwoarang@gentoo.org + Markos Chandras + Proxy maintainers. CC him on bugs + + + dan@danweeks.net + Dan Weeks + Maintainer. Assign bugs to him Conserver is an application that allows multiple users to watch a serial -- 2.26.2