[gentoo-commits] gentoo-x86 commit in media-sound/orpheus/files: orpheus-1.6-cppflags.patch orpheus-1.6-bufsize.patch orpheus-1.6-constify.patch

[Alexis Ballier (aballier)]

aballier    11/02/26 12:28:33

  Added:                orpheus-1.6-cppflags.patch
                        orpheus-1.6-bufsize.patch
                        orpheus-1.6-constify.patch
  Log:
  Make it build with latest autotools, fix an automake warning, fix a buffer overflow (bug #339242), fix some char* vs const char* warnings.
  
  (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/orpheus/files/orpheus-1.6-cppflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/orpheus/files/orpheus-1.6-cppflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/orpheus/files/orpheus-1.6-cppflags.patch?rev=1.1&content-type=text/plain

Index: orpheus-1.6-cppflags.patch
===================================================================
Index: orpheus-1.6/kkconsui-0.1/src/Makefile.am
===================================================================
--- orpheus-1.6.orig/kkconsui-0.1/src/Makefile.am
+++ orpheus-1.6/kkconsui-0.1/src/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/../kkstrtext -I$(top_srcdir)/../kkstrtext-0.1
 noinst_LIBRARIES = libsrc.a
-CPPFLAGS = 
+AM_CPPFLAGS = 
 libsrc_a_SOURCES =  treeview.cc colorschemer.cc textinputline.cc fileselector.cc textwindow.cc texteditor.cc dialogbox.cc screenarea.cc textbrowser.cc abstractui.cc horizontalbar.cc linkedlist.cc cmenus.cc conscommon.cc
 EXTRA_DIST = treeview.cc colorschemer.cc textinputline.cc fileselector.cc textwindow.cc texteditor.cc dialogbox.cc screenarea.cc textbrowser.cc abstractui.cc horizontalbar.cc linkedlist.cc cmenus.cc conscommon.cc
 SUBDIRS = 



1.1                  media-sound/orpheus/files/orpheus-1.6-bufsize.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/orpheus/files/orpheus-1.6-bufsize.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/orpheus/files/orpheus-1.6-bufsize.patch?rev=1.1&content-type=text/plain

Index: orpheus-1.6-bufsize.patch
===================================================================
Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
===================================================================
--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.cc
+++ orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
@@ -1132,7 +1132,7 @@ string striprtf(const string &s, const s
 			    bunicode = false;
 			    if(unichar.substr(0, 4).find_first_not_of("0123456789") == -1) {
 				long l = strtol(unichar.substr(0, 4).c_str(), 0, 0);
-				char ubuf[sizeof(long)+4];
+				char ubuf[sizeof(long)*2+4];
 			    #ifdef HAVE_ICONV
 				memcpy(ubuf, "\xff\xfe", 2);
 				memcpy(ubuf+2, &l, sizeof(long));



1.1                  media-sound/orpheus/files/orpheus-1.6-constify.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/orpheus/files/orpheus-1.6-constify.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/orpheus/files/orpheus-1.6-constify.patch?rev=1.1&content-type=text/plain

Index: orpheus-1.6-constify.patch
===================================================================
Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
===================================================================
--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.cc
+++ orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
@@ -41,17 +41,17 @@ char *strimlead(char *str)  { return tri
 char *strimtrail(char *str) { return trimtrail(str, " \t"); }
 char *strim(char *str)      { return trim(str, " \t");      }
 
-char *trimlead(char *str, char *chr) {
+char *trimlead(char *str, const char *chr) {
     while(strchr(chr, str[0]) && strlen(str)) strcpy(str, str + 1);
     return str;
 }
 
-char *trimtrail(char *str, char *chr) {
+char *trimtrail(char *str, const char *chr) {
     while(strchr(chr, str[strlen(str)-1]) && strlen(str)) str[strlen(str)-1] = 0;
     return str;
 }
 
-char *trim(char *str, char *chr) {
+char *trim(char *str, const char *chr) {
     return trimlead(trimtrail(str, chr), chr);
 }
 
@@ -370,7 +370,7 @@ const char *strqstr(const char *s, const
     return ret;
 }
 
-char *strinsert(char *buf, int pos, char *ins) {
+char *strinsert(char *buf, int pos, const char *ins) {
     char *p = strdup(buf+pos);
     memcpy(buf+pos+strlen(ins), p, strlen(p)+1);
     memcpy(buf+pos, ins, strlen(ins));
Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.h
===================================================================
--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.h
+++ orpheus-1.6/kkstrtext-0.1/kkstrtext.h
@@ -119,9 +119,9 @@ __KTOOL_BEGIN_C
 
 char *strcut(char *strin, int frompos, int count);
 
-char *trimlead(char *str, char *chr);
-char *trimtrail(char *str, char *chr);
-char *trim(char *str, char *chr);
+char *trimlead(char *str, const char *chr);
+char *trimtrail(char *str, const char *chr);
+char *trim(char *str, const char *chr);
 
 char *strimlead(char *str);
 char *strimtrail(char *str);
@@ -145,7 +145,7 @@ const char *strqstr(const char *s,
     const char *esc = "");
 
 char *strccat(char *dest, char c);
-char *strinsert(char *buf, int pos, char *ins);
+char *strinsert(char *buf, int pos, const char *ins);
 char *strcinsert(char *buf, int pos, char ins);
 
 int strchcount(char *s, char *accept);