Fix #339900 (Several buffer overflows)

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

4 files changed, 123 insertions, 3 deletions

diff --git a/net-p2p/dbhub/ChangeLog b/net-p2p/dbhub/ChangeLog
index feb3ae4bb74e..6abc5adeaa9c 100644
--- a/net-p2p/dbhub/ChangeLog
+++ b/net-p2p/dbhub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/dbhub
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/ChangeLog,v 1.30 2010/10/24 18:40:01 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/ChangeLog,v 1.31 2011/01/19 20:18:41 sochotnicky Exp $
+
+*dbhub-0.451-r1 (19 Jan 2011)
+
+  19 Jan 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  +dbhub-0.451-r1.ebuild, +files/dbhub-fix-buffer-overflows.patch:
+  Fix #339900 (Several buffer overflows)
 
   24 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> dbhub-0.451.ebuild,
   +files/dbhub-no-dynaloader.patch:
diff --git a/net-p2p/dbhub/Manifest b/net-p2p/dbhub/Manifest
index daeca3b02ff4..a5b4843fc971 100644
--- a/net-p2p/dbhub/Manifest
+++ b/net-p2p/dbhub/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dbhub-fix-buffer-overflows.patch 1406 RMD160 8ecdc391c42ef0c40fa3f4340e9d0f7fd119ad74 SHA1 f720185f3a9d9f69c3f28e7f822a39768baa8b89 SHA256 3bb5980495f7d759d8256717322f1316ff89d24b98e518aa7555b5bb3026ce85
 AUX dbhub-gentoo.patch 769 RMD160 9ad6cb093dde48b846fd1e1cf89a4b73f4941f67 SHA1 24c430c33ec8a176b0fafbcb280f137f304f7dcb SHA256 f66e623953bd0e8e73e184ae8054ec6412b0d89074497b6bdbcd27c9f24686b2
 AUX dbhub-no-dynaloader.patch 323 RMD160 f501c6cc3a3ac9c1765d65cefcc2065eb172d0df SHA1 d663d6a336b0ecd2d5c4d520aa5343c0bcfc72c5 SHA256 5ba25453a1e3094b87b8dc64a91c081af7cf0cf0679972f85be77d3a27836e25
 DIST dbhub-0.451.tbz2 239911 RMD160 be9af96966785f1f598f7fbeef1f73facb2d1017 SHA1 62303e6d45704d390983d39f38aba7aaded1b7b9 SHA256 941b384d11c181ed270d546f0867dc517693d05fdcdacb14b0b7c682022663b8
+EBUILD dbhub-0.451-r1.ebuild 935 RMD160 d9cbd491d5166c3980902bcf0262f05e51449fca SHA1 f598ed8cd6d57e0288039628d932914d95c477fa SHA256 d23ad6ea341def08a1459ed1b0f99bce704248b8bc98e900029d0be7da5302fb
 EBUILD dbhub-0.451.ebuild 858 RMD160 f81ec3bd48f8e54b313dcc27688260e2da2f47d1 SHA1 b8287f59e3305c532974a17b5c2891c7024a1127 SHA256 20059d0f63023fae345a713a311a981d8310cdf478d753fb8d15668a626e66e9
-MISC ChangeLog 4637 RMD160 ff4fe44e1bc731874c181baa272f86d95caeb715 SHA1 1df92679e2ba93e5c733405ae8e8b4f3d42011ce SHA256 5b36eda63ca3d9282dc7a4707af51947da0ca8323c48fb2b1df7e3949844c987
+MISC ChangeLog 4840 RMD160 eb8586b8cf0c9aa36281e8fac8ad2da5432fd050 SHA1 b8b5fe81b69f741238ccdcb961ae764ed405f881 SHA256 19c57d23f6ac951042102246b7b842973a99e9c905d2a7d16975edbf62fda529
 MISC metadata.xml 249 RMD160 2dbc9f130b2b097c763a3b414eae5501891c925b SHA1 ee9a3ab1cae5c9bb9eb52f7d8a7b906e548c403d SHA256 dfda50c6d7240674c24c2d1c65977dbfe39d6b69fa540de0c1086e4a718bd8db
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNN0cnAAoJELy9dS57CHJB94UP/1grubjKDVA6VNFQQlV6b3Jm
+n0XSJDQP3Wfxi1j7NYSUBc++B3uGhZNEf9LSqw7kMdtULw8+bSzPmeH7GQPTg64Q
+xlD9jaDkAWUp9WR+dScugjjEMDiRBARnPOpg8lOEdYioMAGbWanctvhmJ6Ade6DA
+KjhBUOj63EUhncMNBX4fDeQnbLz7CjB+vatEPzd33v1TCZDyzh8Ta/3DhuV7i5IT
+bTen1VVgR5B3TpbBPpTHU2QH8cTj4tcD4FYwyxe7xh/XPysxn+TVmck/rNckxh/H
+J6Fne0wHk7yuB3/FTXqllEKkrDV2ZYUE7xWS3/kNV8LhVJJBC9mhPuNmlZ2//Oaq
+fL6I4Q/Tw9Jd9PLU8Bs4BUynk3ovgyYeY+rNPmp8WTDeRxEctmZ4KmiVyXDDKeqI
+wK6hdmDki7oaZp+f57lLUNbjjRcdtX31zq9alqTkqHLHqqaL9WZ8I886tOOYywN1
+46br4T6qUvjRHgdTMZQbkqZvtTKTZKSiFiI0T3o44hh6btG1nugYQVgBaiSpxBCt
+MiSZxMpSrFC7/KF/HjGTU/2AMoT4gBJq6Qr44ltMUdRmlSAbMxV83Ru+TDwy1xrV
+das6kAvhTAL5esXfp/5+1HeWTGEI67WvFI2lxYvPjCuu+v9zrokuSwqvWm5aXEjd
+ioIt9k4stpvKRmbLAU/o
+=3OCF
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/dbhub/dbhub-0.451-r1.ebuild b/net-p2p/dbhub/dbhub-0.451-r1.ebuild
new file mode 100644
index 000000000000..365db15d8ba6
--- /dev/null
+++ b/net-p2p/dbhub/dbhub-0.451-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dbhub/dbhub-0.451-r1.ebuild,v 1.1 2011/01/19 20:18:41 sochotnicky Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Hub software for Direct Connect, fork of opendchub"
+HOMEPAGE="http://www.dbhub.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug perl nls switch_user"
+
+DEPEND="perl? ( dev-lang/perl )
+	switch_user? ( sys-libs/libcap )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gentoo.patch \
+		"${FILESDIR}"/${PN}-no-dynaloader.patch \
+		"${FILESDIR}"/${PN}-fix-buffer-overflows.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable perl) \
+		$(use_enable switch_user) \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/net-p2p/dbhub/files/dbhub-fix-buffer-overflows.patch b/net-p2p/dbhub/files/dbhub-fix-buffer-overflows.patch
new file mode 100644
index 000000000000..8c4395d75d0a
--- /dev/null
+++ b/net-p2p/dbhub/files/dbhub-fix-buffer-overflows.patch
@@ -0,0 +1,53 @@
+From 6d52acedf13eba875ab064d1a3b6a0ac3afb24f3 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@gentoo.org>
+Date: Wed, 19 Jan 2011 21:06:05 +0100
+Subject: [PATCH] Fix buffer overflows
+
+---
+ src/commands.c |    2 +-
+ src/main.c     |    2 +-
+ src/main.h     |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/commands.c b/src/commands.c
+index f66ad68..e0bc6a8 100644
+--- a/src/commands.c
++++ b/src/commands.c
+@@ -313,7 +313,7 @@ void chat(char *buf, struct user_t *user)
+ 	char kg2user[51];
+ 	char largestring[501];
+ 	char msgl[801];
+-	char bigstring[1001]; 
++	char bigstring[4096];
+ 	char tempstring[151];
+ 	char nick[51];
+ 	char phrase[51];
+diff --git a/src/main.c b/src/main.c
+index dec3ef8..85dad68 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -506,7 +506,7 @@ void alarm_signal(int z){
+ void alarm_handler(void)
+ {
+ 	struct sock_t *human_user;
+-	char sometxt[151];
++	char sometxt[250];
+ 	char somerec[21];
+ 	char showrec[251];
+ 	char recpath[MAX_FDP_LEN+1];
+diff --git a/src/main.h b/src/main.h
+index 886312e..da1ead5 100644
+--- a/src/main.h
++++ b/src/main.h
+@@ -430,7 +430,7 @@ int 	brokensr;		/* 1 means share record was broken */
+ char  	recordshstr[120];
+ char  	recordusstr[120];
+ 
+-char 	clocknick[21];
++char 	clocknick[50];
+ 
+ //DB// Pointers that count various things and display them in !ui command to admins/owners
+ long long blocked_pm;
+-- 
+1.7.3.4
+