diff options
5 files changed, 21 insertions, 263 deletions
diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog index a0fd31b6741d..2712d196fc86 100644 --- a/net-irc/atheme-services/ChangeLog +++ b/net-irc/atheme-services/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/atheme-services # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.16 2011/11/08 02:47:43 binki Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.17 2011/11/08 02:51:39 binki Exp $ + + 08 Nov 2011; Nathan Phillip Brink <binki@gentoo.org> + -atheme-services-7.0.0_alpha7.ebuild, + -files/atheme-services-7.0.0_alpha7-mowgli-strl.patch, + -files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch: + Drop old atheme-services-7.0.0_alpha7. *atheme-services-7.0.0_alpha9 (08 Nov 2011) diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest index 4c8e7148a6ce..5824950e9797 100644 --- a/net-irc/atheme-services/Manifest +++ b/net-irc/atheme-services/Manifest @@ -2,35 +2,31 @@ Hash: SHA256 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595 -AUX atheme-services-7.0.0_alpha7-mowgli-strl.patch 1699 RMD160 e5bf15a77152b59e6a1804eb2443086ed228b2fa SHA1 4a4d7c73e14135d964f278771ed3ff5ebfb6e431 SHA256 3131721a15a0973a282c24067ab4ec786717a12af5c4a7aab04b30221a701a6b -AUX atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch 2254 RMD160 9395b13bbd86ec60bdc797a7d4519150c2b97d31 SHA1 94e7e472107b9cb3aa8290a1de58815226229bb3 SHA256 82964377104ae7356187f07d3ef1bc493e7da74b497124da781a534ffd17789b AUX atheme-services.initd 957 RMD160 e28c12ab60e8d5835c7c2e004e366b136d90aa31 SHA1 40ebacb57dcdebfaff54093863a573c4bdbc40be SHA256 0dae7f602487568054fe4a75961899c7ea428ee331d2a17020aa1cf1dd32fbaf DIST atheme-services-6.0.8.tar.bz2 860407 RMD160 31c1ba46ee5ede98108b51970bde134b259f1b3b SHA1 d201a41592fe0137e00625d7d6ed99fd79a752a7 SHA256 7dffcf8e768ca442d1fcc2b0e3031c41e34f6b3d8ee47164f84f20cb30515c24 DIST atheme-services-6.0.9.tar.bz2 858804 RMD160 57ed736bb1eaedb0db68e63266ee8c98674f0542 SHA1 1b463ec808d4b92d0047319cdc1e4223a9ca9481 SHA256 058616395d6d5477ac4e63fc1daa88dffb62c9cc5a9239dae5dbe54508b6aaf9 -DIST atheme-services-7.0.0-alpha7.tar.bz2 940000 RMD160 68ff2a9289205af7d9519a4e04b26f971df6d131 SHA1 767364054ec9efc4195ae264af533dca0254e064 SHA256 e4b940b8e6f66338507029b5d95021a706dba7ec8e802ca418c394c114c191ba DIST atheme-services-7.0.0-alpha8.tar.bz2 1038237 RMD160 119826683b57ee9774b22f9c684adee2ff9597b2 SHA1 663f67c0d6cc328eb279f40723a12edbcb55051c SHA256 15c462c8010e197a267bc02cd809deb4a7c206556a99ea451f82280ad588878e DIST atheme-services-7.0.0-alpha9.tar.bz2 1055265 RMD160 d86413c63c79579247904965fffa7c2b1e76d688 SHA1 28168d0b4ab36840dd3522283dca2aebbb9a56d3 SHA256 564add960be744d637573d69ee12351555696048e69505af596d767f55b0b3b6 EBUILD atheme-services-6.0.8-r2.ebuild 2703 RMD160 4a2c06940599531be1dca72f2627a1b57f68f456 SHA1 611621b6f8aadf0703ed7b298875a30a278ce42d SHA256 9613151cc34120bc9992e955464a651b8da3c68c1a9b6e0e636860faf0b0b3bd EBUILD atheme-services-6.0.9.ebuild 2707 RMD160 761bc20a1f6c7d3de02461609ce1dda11d5b9f87 SHA1 9c9720342fbbc6334894ccca0def20630e6fc741 SHA256 2f8ae31545c400f25d772c85864dd564a800091fbf5b017c91fc5402d8d2b6af -EBUILD atheme-services-7.0.0_alpha7.ebuild 2930 RMD160 1a7e01666c120069dec5ac1503e47d77e353f493 SHA1 9a3d2ccbfbee44a31d190876593ac9e24d49cb8e SHA256 348d92a949d90f659d917ffe02a93fb0d40bec950ae1cd071738bf78b5839e9a EBUILD atheme-services-7.0.0_alpha8.ebuild 2832 RMD160 53aa90bb392cdcf43061b1eb8ab717c0a3ac1683 SHA1 612065d64f85517fcc8bcf6cc6fcaf967abf3d58 SHA256 890225ad2966e31708d4ebaf896cefae28af3ef2de90f78e04b05ac903a8b591 EBUILD atheme-services-7.0.0_alpha9.ebuild 2832 RMD160 99c8171c9e6c78f346c8dd6ef0fc4965c37bda49 SHA1 bdc4260fedbf21b992751865c873c8a8c80b48f9 SHA256 c00d2dd245f571f84f5c07d02759a3361f29ba6a1e65d5473a765d350c78a259 -MISC ChangeLog 4136 RMD160 1b6672e89bd85380815ecb140f416e49021ec4ac SHA1 8f00ff9ff7a637446ee95e88ceb07daa239c357a SHA256 ace46336666f1a123efb2b9c79993a155a9b6f44cc3aec66d1ea650cccfdfd07 +MISC ChangeLog 4396 RMD160 37658a62eb87734ab4e85eae93f443db12c7b3a3 SHA1 758b92f073044c707fde6997c79065bc3600e995 SHA256 0a4fde0acfe207e89c045e056f639bb1b8e5d78f89ec0e51813edeafdcf99103 MISC metadata.xml 522 RMD160 62256e4afba65ef587fb4314adeeb178b57246c0 SHA1 6765fd4304513a1aca8ba55294f417e11f1a4c8d SHA256 0eb4b26200c6ae7b351c45b9744c0bedd49e2de925f09161af89e5aefb8a5dcf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iQIcBAEBCAAGBQJOuJg9AAoJEHQ6UuhrqBBQe50P/11o6UGPyYJsMYNsvyvk9Twr -OeFPfQOFdGWNMLDBRIsfxSIuBFy0w6r+kpZX6IpR+kmndlIak2PRLe3B0+rr71ST -Z3YrhEnnfCC19/6M3fpi0S6AeiQpGExochX4tbEnjlZzQULnDiZWMpnu8UGbWcpT -rBMuvuciZLpRtu1TCBLjgjUgu9ObGoCM8/kSVwPLdevnuR8tFYqniZgozYNTj/71 -76zQQk4mDpKbuIQb7CNXwYs1AuXrSpmQKLMBy/IyjVDC3dNuHhBYTS7nQ5YGfuBg -arEWF8OB1ZqZvhWvDbXQQTsH+0uhxiU7aexN8qVszZuDL/sBA8uqZayJ0yW0uOpS -Vu3lnF19TH6x/pngc+AbuEOx6H/eLLllkEBqBjhJbRigh09hz2WYvr1IpDWPUmMc -TKlJYCw3ySm3PBuND/OQSGzPEyB0KS7pdJJlLx549dSqHTpzXnzxANJJkjZMBOC0 -CxXROhz9FYCu17SPGeyk8I/99Lt0ToAtEKof537B6NrXe1nEWEi9NLYt6e2lQp6s -EV+Sadv/jkSkkblqwkNPIQ/gC6NR0yVXMOVHBV2dUptS3Q265lfhcKvaASsGga9z -N/iqAyLpHtpdOZ4MK7aUOT1bb0KWuB928HHBTer7RvZpAWrEkH4NNlS2l5hnEyZy -kGcFQRPA/9c4aLJmjcRO -=FhZO +iQIcBAEBCAAGBQJOuJkmAAoJEHQ6UuhrqBBQfR0P/j+IZEX+kbb0xiiokYw/hom+ +d1emE9FKLa2L+mUJQbncI3pjzwxzvEDk6y+bLGPIKjJSzuSGmJYwz+iFZY/Hr/ey +d8nOllTOSmyKZpEWlC1gV2BMRbpRaYcURs/5gTVJYndCEJjoHirfg0LPobVv5ySZ +78y4Hu0SRbalTW9C+k2PcbUWn7zqVxjsPi21D9iv2U+ejs0Ag7TaQTXLC05Oovtn +rdE2CeI/cDsGyR1rU7vS/rewM64udZMMiB4/3pRKa/5fTrhh4ucP5l7oxoSVVatR +uvcUKBvmWLFMHRXem6CQ7adnh5ZjCDzdqqwgK5xVrNiDLd8mZvAgz5GXoRQaQ+Or +xVY2bGygF3xe3BKQbIoVyYiwNA/DnL79FrlPs7CaoIU7vfecq3n7jhVtBv2Z8Nj+ +VTx4SCnuhqZvT7+aywDB9uC4k404u3u5Q0ROB4VkSA8Woj+ZlEENHoNtE9jqFco5 +luCqN5lbDGlLQQs+1eM62KOeAKApja9iU3w3/MjI8CLUg2h+KEchMeSWWT3jm02D +As0Ov33iFABxyiIOuWp+CCSGMrEX4Ln/dSc7DXO6uTnV5soivAm+LlDCsnmeUz9r +3vMx2rOIyF8aLZnpl69qpCOr1XeHbuGiACAOD2X4BZx7o/r5xcOHIZsfTYdeU1// +RWlTNcOIWY9cFvuf4ALJ +=JdvM -----END PGP SIGNATURE----- diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha7.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha7.ebuild deleted file mode 100644 index 9855a6491541..000000000000 --- a/net-irc/atheme-services/atheme-services-7.0.0_alpha7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha7.ebuild,v 1.2 2011/09/30 04:47:45 binki Exp $ - -EAPI=4 - -inherit eutils flag-o-matic perl-module prefix - -MY_P=${P/_/-} - -DESCRIPTION="A portable and secure set of open-source and modular IRC services" -HOMEPAGE="http://atheme.net/" -SRC_URI="http://atheme.net/downloads/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd ~amd64-linux" -IUSE="largenet ldap nls +pcre perl profile ssl" - -RDEPEND=">=dev-libs/libmowgli-0.9.95 - ldap? ( net-nds/openldap ) - nls? ( sys-devel/gettext ) - perl? ( dev-lang/perl ) - pcre? ( dev-libs/libpcre ) - ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - # the dependency calculation puts all of the .c files together and - # overwhelms cc1 with this flag :-( - filter-flags -combine - - if use profile; then - # bug #371119 - ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag." - ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid." - append-flags -nopie - fi - - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/atheme ${PN} -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-mowgli-strl.patch \ - "${FILESDIR}"/${P}-xmlrpc-mowgli-string.patch - - # fix docdir - sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die - - # basic logging config directive fix - sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die - - # QA against bundled libs - rm -rf libmowgli || die - - # Get useful information into build.log - sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die -} - -src_configure() { - econf \ - atheme_cv_c_gcc_w_error_implicit_function_declaration=no \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --localstatedir="${EPREFIX}"/var \ - --enable-fhs-paths \ - --disable-warnings \ - --enable-contrib \ - $(use_enable largenet large-net) \ - $(use_with ldap) \ - $(use_with nls) \ - $(use_enable profile) \ - $(use_with perl) \ - $(use_with pcre) \ - $(use_enable ssl) -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc/${PN} - for conf in dist/*.example; do - # The .cron file isn't meant to live in /etc/${PN}, so only - # install a .example version. - [[ ${conf} == *cron* ]] && continue - - newins ${conf} $(basename ${conf} .example) - done - - fowners -R 0:${PN} /etc/${PN} - keepdir /var/{lib,log}/atheme - fowners ${PN}:${PN} /var/{lib,log,run}/atheme - fperms -R go-w,o-rx /etc/${PN} - fperms 750 /etc/${PN} /var/{lib,log,run}/atheme - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - - # contributed scripts and such: - insinto /usr/share/doc/${PF}/contrib - doins contrib/*.{c,pl,php,py,rb} - - if use perl; then - perlinfo - insinto "${VENDOR_LIB#${EPREFIX}}" - doins -r contrib/Atheme{,.pm} - fi -} diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-mowgli-strl.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-mowgli-strl.patch deleted file mode 100644 index b9a1b8317748..000000000000 --- a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-mowgli-strl.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e933fc04fea4636325fbe60c769e1e20da74496c Mon Sep 17 00:00:00 2001 -From: JD Horelick <jdhore1@gmail.com> -Date: Wed, 31 Aug 2011 03:09:11 -0400 -Subject: [PATCH] hostserv|rpgserv: Change some code in headers to use mowgli_strlcpy() and mowgli_strlcat(). - ---- - modules/hostserv/hostserv.h | 2 +- - modules/rpgserv/prettyprint.h | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/hostserv/hostserv.h b/modules/hostserv/hostserv.h -index 10ec4de..953105a 100644 ---- a/modules/hostserv/hostserv.h -+++ b/modules/hostserv/hostserv.h -@@ -31,7 +31,7 @@ static inline void do_sethost(user_t *u, char *host) - return; - - svs = service_find("hostserv"); -- strlcpy(u->vhost, host ? host : u->host, HOSTLEN); -+ mowgli_strlcpy(u->vhost, host ? host : u->host, HOSTLEN); - user_sethost(svs->me, u, u->vhost); - } - -diff --git a/modules/rpgserv/prettyprint.h b/modules/rpgserv/prettyprint.h -index e643608..362eef6 100644 ---- a/modules/rpgserv/prettyprint.h -+++ b/modules/rpgserv/prettyprint.h -@@ -70,7 +70,7 @@ static inline const char *rs_prettyprint_keywords(metadata_t *md, const char **k - - *ppbuf = '\0'; - -- strlcpy(parsebuf, md->value, BUFSIZE); -+ mowgli_strlcpy(parsebuf, md->value, BUFSIZE); - - keyword = strtok_r(parsebuf, " ", &pos); - if (keyword == NULL) -@@ -85,9 +85,9 @@ static inline const char *rs_prettyprint_keywords(metadata_t *md, const char **k - if (!strcasecmp(keyword, keys[i])) - { - if (*ppbuf != '\0') -- strlcat(ppbuf, ", ", BUFSIZE); -+ mowgli_strlcat(ppbuf, ", ", BUFSIZE); - -- strlcat(ppbuf, values[i], BUFSIZE); -+ mowgli_strlcat(ppbuf, values[i], BUFSIZE); - } - } - } --- -1.7.3.4 - diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch deleted file mode 100644 index ca584161d90f..000000000000 --- a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha7-xmlrpc-mowgli-string.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7759002d4f84301541e8b6e5eb4c7a20d559d98d Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Wed, 31 Aug 2011 00:57:22 -0500 -Subject: [PATCH] transport/xmlrpc: unbreak build - ---- - modules/transport/xmlrpc/xmlrpclib.c | 17 ++++++++++------- - 1 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/modules/transport/xmlrpc/xmlrpclib.c b/modules/transport/xmlrpc/xmlrpclib.c -index c708985..11e3b7a 100644 ---- a/modules/transport/xmlrpc/xmlrpclib.c -+++ b/modules/transport/xmlrpc/xmlrpclib.c -@@ -315,7 +315,7 @@ void xmlrpc_generic_error(int code, const char *string) - { - char buf[1024]; - const char *ss; -- mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE); -+ mowgli_string_t *s = mowgli_string_create(); - char *s2; - int len; - -@@ -353,7 +353,8 @@ void xmlrpc_generic_error(int code, const char *string) - } - else - xmlrpc.setbuffer(s->str, len); -- s->delete(s); -+ -+ s->destroy(s); - } - - /*************************************************************************/ -@@ -387,7 +388,7 @@ void xmlrpc_send(int argc, ...) - int len; - char buf[1024]; - const char *ss; -- mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE); -+ mowgli_string_t *s = mowgli_string_create(); - char *s2; - char *header; - -@@ -438,7 +439,8 @@ void xmlrpc_send(int argc, ...) - free(xmlrpc.encode); - xmlrpc.encode = NULL; - } -- s->delete(s); -+ -+ s->destroy(s); - } - - /*************************************************************************/ -@@ -448,7 +450,7 @@ void xmlrpc_send_string(const char *value) - int len; - char buf[1024]; - const char *ss; -- mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE); -+ mowgli_string_t *s = mowgli_string_create(); - char *s2; - char *header; - -@@ -493,7 +495,8 @@ void xmlrpc_send_string(const char *value) - free(xmlrpc.encode); - xmlrpc.encode = NULL; - } -- s->delete(s); -+ -+ s->destroy(s); - } - - /*************************************************************************/ -@@ -736,7 +739,7 @@ void xmlrpc_char_encode(char *outbuffer, const char *s1) - long unsigned int i; - unsigned char c; - char buf2[15]; -- mowgli_string_t *s = mowgli_string_create(XMLRPC_BUFSIZE); -+ mowgli_string_t *s = mowgli_string_create(); - *buf2 = '\0'; - *outbuffer = '\0'; - --- -1.7.3.4 - |