diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-01-01 22:14:12 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-01 22:14:12 +0000 |
commit | 80384ee472cddce58d4fb9c989edc9024cce9449 (patch) | |
tree | 08b1eeddd273ae743d14369c3b38c9db1a4e6c54 /net-im | |
parent | arm KEYWORDS (Manifest recommit) (diff) | |
download | gentoo-2-80384ee472cddce58d4fb9c989edc9024cce9449.tar.gz gentoo-2-80384ee472cddce58d4fb9c989edc9024cce9449.tar.bz2 gentoo-2-80384ee472cddce58d4fb9c989edc9024cce9449.zip |
Add patch from upstream cvs #74705.
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/linpopup/ChangeLog | 11 | ||||
-rw-r--r-- | net-im/linpopup/files/2.0.4-overflow.patch | 39 | ||||
-rw-r--r-- | net-im/linpopup/files/digest-linpopup-2.0.4-r1 (renamed from net-im/linpopup/files/digest-linpopup-2.0.4) | 0 | ||||
-rw-r--r-- | net-im/linpopup/linpopup-2.0.2.ebuild | 4 | ||||
-rw-r--r-- | net-im/linpopup/linpopup-2.0.4-r1.ebuild (renamed from net-im/linpopup/linpopup-2.0.4.ebuild) | 12 |
5 files changed, 59 insertions, 7 deletions
diff --git a/net-im/linpopup/ChangeLog b/net-im/linpopup/ChangeLog index d94971807478..c8e0fe3fc3dc 100644 --- a/net-im/linpopup/ChangeLog +++ b/net-im/linpopup/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/linpopup -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.11 2004/12/30 21:16:17 vapier Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.12 2005/01/01 22:14:12 vapier Exp $ + +*linpopup-2.0.4-r1 (01 Jan 2005) + + 01 Jan 2005; Mike Frysinger <vapier@gentoo.org> + +files/2.0.4-overflow.patch, +linpopup-2.0.4-r1.ebuild, + -linpopup-2.0.4.ebuild: + Add patch from upstream cvs #74705. *linpopup-2.0.4 (30 Dec 2004) diff --git a/net-im/linpopup/files/2.0.4-overflow.patch b/net-im/linpopup/files/2.0.4-overflow.patch new file mode 100644 index 000000000000..c038d303d598 --- /dev/null +++ b/net-im/linpopup/files/2.0.4-overflow.patch @@ -0,0 +1,39 @@ +--- src/string.c.orig 2000-03-14 03:45:05.000000000 +0100 ++++ src/string.c 2004-12-23 22:43:12.000000000 +0100 +@@ -29,20 +29,30 @@ + { + int string_index = 0, sub_index, string_len; + char sub_string[50], new_string[2048]; ++ int new_len; + + string_len = strlen (string); +- strcpy (new_string, ""); ++ new_string[0] = 0; ++ new_len = 0; + do + { + sub_index = 0; +- strcpy (sub_string, ""); +- while ((string[string_index]) && (string[string_index] != 32)) ++ while ((sub_index < sizeof(sub_string)-1) && (string[string_index]) && (string[string_index] != 32)) + sub_string[sub_index++] = string[string_index++]; + sub_string[sub_index] = 0; + if (!strcmp (sub_string, search_string)) +- strcpy (sub_string, replace_string); +- strcat (new_string, sub_string); +- strcat (new_string, " "); ++ strncpy (sub_string, replace_string, 50); ++ sub_string[49] = 0; ++ if (new_len + sub_index >= sizeof(new_string)) ++ sub_index = sizeof(new_string) - new_len - 1; ++ strncpy (new_string+new_len, sub_string, sub_index); ++ new_len += sub_index; ++ if (new_len >= sizeof(new_string)-1) { ++ new_string[sizeof(new_string)-1] = 0; ++ break; ++ } ++ new_string[new_len++] = ' '; ++ new_string[new_len] = 0; + } + while (++string_index < string_len); + diff --git a/net-im/linpopup/files/digest-linpopup-2.0.4 b/net-im/linpopup/files/digest-linpopup-2.0.4-r1 index b0ef7a658d38..b0ef7a658d38 100644 --- a/net-im/linpopup/files/digest-linpopup-2.0.4 +++ b/net-im/linpopup/files/digest-linpopup-2.0.4-r1 diff --git a/net-im/linpopup/linpopup-2.0.2.ebuild b/net-im/linpopup/linpopup-2.0.2.ebuild index 8cf7e5fd9b9d..4bc48cc6ab24 100644 --- a/net-im/linpopup/linpopup-2.0.2.ebuild +++ b/net-im/linpopup/linpopup-2.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.2.ebuild,v 1.5 2004/07/15 00:16:56 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.2.ebuild,v 1.6 2005/01/01 22:14:12 vapier Exp $ inherit gnome2 diff --git a/net-im/linpopup/linpopup-2.0.4.ebuild b/net-im/linpopup/linpopup-2.0.4-r1.ebuild index 8f7da2f2810f..b09eec8ae8b9 100644 --- a/net-im/linpopup/linpopup-2.0.4.ebuild +++ b/net-im/linpopup/linpopup-2.0.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.4.ebuild,v 1.1 2004/12/30 21:16:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.4-r1.ebuild,v 1.1 2005/01/01 22:14:12 vapier Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="GTK2 port of the LinPopUp messaging client for Samba (including Samba 3)" HOMEPAGE="http://linpopup2.sourceforge.net/" @@ -21,6 +21,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS BUGS ChangeLog INSTALL MANUAL NEWS README THANKS TODO" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PV}-overflow.patch +} + src_install() { # Install icon and .desktop for menu entry if use gnome ; then |