From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-sound/orpheus/files/1.5-amd64.patch | 31 ++++ .../orpheus/files/101_fix-buffer-overflow.diff | 15 ++ .../orpheus/files/orpheus-1.6-bufsize.patch | 13 ++ .../orpheus/files/orpheus-1.6-constify.patch | 60 +++++++ .../orpheus/files/orpheus-1.6-cppflags.patch | 12 ++ .../files/orpheus-1.6-fix-buildsystem.patch | 182 +++++++++++++++++++++ media-sound/orpheus/files/orpheus-1.6-gcc47.patch | 15 ++ .../orpheus/files/orpheus-1.6-nolibghttp.patch | 15 ++ 8 files changed, 343 insertions(+) create mode 100644 media-sound/orpheus/files/1.5-amd64.patch create mode 100644 media-sound/orpheus/files/101_fix-buffer-overflow.diff create mode 100644 media-sound/orpheus/files/orpheus-1.6-bufsize.patch create mode 100644 media-sound/orpheus/files/orpheus-1.6-constify.patch create mode 100644 media-sound/orpheus/files/orpheus-1.6-cppflags.patch create mode 100644 media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch create mode 100644 media-sound/orpheus/files/orpheus-1.6-gcc47.patch create mode 100644 media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch (limited to 'media-sound/orpheus/files') diff --git a/media-sound/orpheus/files/1.5-amd64.patch b/media-sound/orpheus/files/1.5-amd64.patch new file mode 100644 index 000000000000..eac0ab0a2c61 --- /dev/null +++ b/media-sound/orpheus/files/1.5-amd64.patch @@ -0,0 +1,31 @@ +--- orpheus-1.5/kkstrtext-0.1/kkstrtext.cc 2004-01-15 21:25:31.000000000 +0100 ++++ orpheus-1.5-new/kkstrtext-0.1/kkstrtext.cc 2006-08-28 11:48:36.926598598 +0200 +@@ -431,7 +431,7 @@ + } + + int intcompare(void *s1, void *s2) { +- return (int) s1 != (int) s2; ++ return (long) s1 != (long) s2; + } + + string i2str(int i) { +@@ -885,7 +885,7 @@ + #ifdef HAVE_ICONV + iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str()); + +- if(((int) cd) != -1) { ++ if(((long) cd) != -1) { + string r, text(atext); + size_t inleft, outleft, soutleft; + char *inbuf, *outbuf, *sinbuf, *soutbuf; +--- orpheus-1.5/kkconsui-0.1/src/texteditor.cc 2003-09-09 23:51:33.000000000 +0200 ++++ orpheus-1.5-new/kkconsui-0.1/src/texteditor.cc 2006-08-28 11:56:10.082753610 +0200 +@@ -1940,7 +1940,7 @@ + } + + int texteditor::findint(void *p1, void *p2) { +- return *(int *) p1 != (int) p2; ++ return *(long *) p1 != (long) p2; + } + + int texteditor::findhighline(void *p1, void *p2) { diff --git a/media-sound/orpheus/files/101_fix-buffer-overflow.diff b/media-sound/orpheus/files/101_fix-buffer-overflow.diff new file mode 100644 index 000000000000..4d6c8e4e18a4 --- /dev/null +++ b/media-sound/orpheus/files/101_fix-buffer-overflow.diff @@ -0,0 +1,15 @@ +Fix a stack-based buffer overflow in kkstrtext.h in ktools library. +(CVE-2005-3863) (Closes: #368402) +Index: orpheus-1.5/kkstrtext-0.1/kkstrtext.h +=================================================================== +--- orpheus-1.5.orig/kkstrtext-0.1/kkstrtext.h 2003-12-14 11:51:38.000000000 +0100 ++++ orpheus-1.5/kkstrtext-0.1/kkstrtext.h 2006-08-01 21:57:14.000000000 +0200 +@@ -87,7 +87,7 @@ + { \ + va_list vgs__ap; char vgs__buf[1024]; \ + va_start(vgs__ap, fmt); \ +- vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \ ++ vsnprintf(vgs__buf, 1024, fmt, vgs__ap); c = vgs__buf; \ + va_end(vgs__ap); \ + } + diff --git a/media-sound/orpheus/files/orpheus-1.6-bufsize.patch b/media-sound/orpheus/files/orpheus-1.6-bufsize.patch new file mode 100644 index 000000000000..319fcd83eecc --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-bufsize.patch @@ -0,0 +1,13 @@ +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)); diff --git a/media-sound/orpheus/files/orpheus-1.6-constify.patch b/media-sound/orpheus/files/orpheus-1.6-constify.patch new file mode 100644 index 000000000000..8255b4094ef6 --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-constify.patch @@ -0,0 +1,60 @@ +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); diff --git a/media-sound/orpheus/files/orpheus-1.6-cppflags.patch b/media-sound/orpheus/files/orpheus-1.6-cppflags.patch new file mode 100644 index 000000000000..bf7effbcd9d9 --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-cppflags.patch @@ -0,0 +1,12 @@ +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 = diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch new file mode 100644 index 000000000000..5819fe9a053c --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch @@ -0,0 +1,182 @@ +--- orpheus-1.6/configure.ac ++++ orpheus-1.6/configure.ac +@@ -1,5 +1,5 @@ +-AC_INIT(aclocal.m4) +-AM_INIT_AUTOMAKE(orpheus, 1.6) ++AC_INIT([orpheus],[1.6]) ++AM_INIT_AUTOMAKE + + AC_CANONICAL_HOST + +@@ -8,7 +8,8 @@ + AC_PROG_CPP + AC_PROG_RANLIB + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) ++AM_PROG_AR + + ### use option --enable-locales-fix to fix problems with double-byte + ### encodings on systems with broken locale, iscntrl() +@@ -20,30 +20,21 @@ + + AC_CHECK_HEADERS(sys/soundcard.h soundcard.h machine/soundcard.h, break) + +-AM_PATH_XML2(2.0.0, [ +- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" +- LIBS="$LIBS $XML_LIBS" +- AC_DEFINE(HAVE_LIBXML2, 1, [use libxml2]) +-], [ +- AC_MSG_WARN(libxml2 not found, internet radio presets fetching disabled) ++PKG_CHECK_MODULES([DEPENDENCIES], [ncurses vorbis vorbisfile ogg libxml-2.0], ++[ ++AC_DEFINE([HAVE_LIBXML2], [1], [Defined if libxml is present]) ++AC_DEFINE([HAVE_LIBNCURSES], [1], [Defined if ncurses is present]) ++AC_DEFINE([HAVE_LIBVORBIS], [1], [Defined if libvorbis is present]) ++AC_DEFINE([HAVE_LIBVORBISFILE], [1], [Defined if libvorbisfile is present]) + ]) + +-AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))) +- +-AC_CHECK_LIB(ghttp, ghttp_request_new,, +- [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)]) +- +-AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,, +- AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled)) +- +-AC_CHECK_LIB(vorbisfile, ov_open,, +- AC_MSG_WARN(libvorbis not found - the support for OGG files is disabled)) +- + AM_ICONV_LINK + +-LIBS="$LIBS $LIBICONV" ++CPPFLAGS="$CPPFLAGS $DEPENDENCIES_CFLAGS" ++LIBS="$LIBS $LIBICONV $DEPENDENCIES_LIBS" + + ALL_LINGUAS="ru ca" + AM_GNU_GETTEXT + AC_CONFIG_SUBDIRS(kkstrtext-0.1 kkconsui-0.1) +-AC_OUTPUT(Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile) ++AC_CONFIG_FILES([Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile]) ++AC_OUTPUT +--- orpheus-1.6/kkconsui-0.1/configure.ac ++++ orpheus-1.6/kkconsui-0.1/configure.ac +@@ -6,7 +6,7 @@ + AC_PROG_CC + AC_PROG_CXX + AC_PROG_RANLIB +- ++AM_PROG_AR + + ### use option --enable-locales-fix to fix problems with double-byte + ### encodings on systems with broken locale, iscntrl() +--- orpheus-1.6/kkstrtext-0.1/configure.ac ++++ orpheus-1.6/kkstrtext-0.1/configure.ac +@@ -6,6 +6,7 @@ + AC_PROG_CC + AC_PROG_CXX + AC_PROG_RANLIB ++AM_PROG_AR + + AC_CHECK_HEADERS(_G_config.h) + AC_LANG_CPLUSPLUS +--- orpheus-1.6/po/Makefile.in.in ++++ orpheus-1.6/po/Makefile.in.in +@@ -29,7 +29,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs + mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ +--- orpheus-1.6/src/cdtrack.cc ++++ orpheus-1.6/src/cdtrack.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "cdtrack.h" + #include "playlist.h" + +--- orpheus-1.6/src/main.cc ++++ orpheus-1.6/src/main.cc +@@ -21,6 +21,9 @@ + * USA + * + */ ++ ++#include "../config.h" ++ + #include "uitext.h" + #include "cdtrack.h" + #include "mp3track.h" +--- orpheus-1.6/src/mp3track.cc ++++ orpheus-1.6/src/mp3track.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "mp3track.h" + #include "orpheusconf.h" + +--- orpheus-1.6/src/oggtrack.cc ++++ orpheus-1.6/src/oggtrack.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "oggtrack.h" + #include "orpheusconf.h" + +--- orpheus-1.6/src/orpheusconf.cc ++++ orpheus-1.6/src/orpheusconf.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "orpheusconf.h" + + #include +--- orpheus-1.6/src/playlist.cc ++++ orpheus-1.6/src/playlist.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "playlist.h" + #include "mp3track.h" + #include "oggtrack.h" +--- orpheus-1.6/src/streamtrack.cc ++++ orpheus-1.6/src/streamtrack.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "streamtrack.h" + #include "playlist.h" + +--- orpheus-1.6/src/uitext.cc ++++ orpheus-1.6/src/uitext.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "uitext.h" + #include "playlist.h" + #include "cdtrack.h" diff --git a/media-sound/orpheus/files/orpheus-1.6-gcc47.patch b/media-sound/orpheus/files/orpheus-1.6-gcc47.patch new file mode 100644 index 000000000000..605bb9927760 --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-gcc47.patch @@ -0,0 +1,15 @@ + https://bugs.gentoo.org/430386 + + src/streamtrack.cc | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/streamtrack.cc ++++ b/src/streamtrack.cc +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch new file mode 100644 index 000000000000..e6a5f87a210f --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch @@ -0,0 +1,15 @@ +Index: orpheus-1.6/configure.in +=================================================================== +--- orpheus-1.6.orig/configure.in ++++ orpheus-1.6/configure.in +@@ -30,8 +30,8 @@ AM_PATH_XML2(2.0.0, [ + + AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))) + +-AC_CHECK_LIB(ghttp, ghttp_request_new,, +- [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)]) ++#AC_CHECK_LIB(ghttp, ghttp_request_new,, ++# [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)]) + + AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,, + AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled)) -- cgit v1.2.3