Attachment #250415 for bug #278775

View | Details | Raw Unified | Return to bug 278775
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/audio/id3lib/Makefile (-7 / +13 lines)
1	PORTNAME= id3lib	1	PORTNAME= id3lib
2	PORTVERSION= 3.8.3	2	DISTVERSION= 3.8.3.20240114
3	PORTREVISION= 10
4	CATEGORIES= audio	3	CATEGORIES= audio
5	MASTER_SITES= SF
6		4
7	MAINTAINER= sunpoet@FreeBSD.org	5	MAINTAINER= sunpoet@FreeBSD.org
8	COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags	6	COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags
Lines 14-26 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
14	BROKEN_mips= fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section	12	BROKEN_mips= fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
15	BROKEN_mips64= fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section	13	BROKEN_mips64= fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
16		14
17	USES= compiler:c11 cpe iconv libtool localbase	15	USES= cmake cpe iconv pkgconfig
		16
		17	USE_GITHUB= yes
		18	GH_ACCOUNT= thekhalifa
		19	GH_TAGNAME= 497fe49
18		20
19	GNU_CONFIGURE= yes
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21		22
		23	CMAKE_OFF= WITH_DOCS WITH_TESTS
		24
22	post-patch:	25	post-patch:
23	# Clean up bundled libraries	26	@${REINPLACE_CMD} -e 's\|share/pkgconfig\|libdata/pkgconfig\|g' \
24	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/	27	${PATCH_WRKSRC}/src/CMakeLists.txt
		28
		29	post-install:
		30	(cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/)
25		31
26	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/audio/id3lib/distinfo (-2 / +3 lines)
1	SHA256 (id3lib-3.8.3.tar.gz) = 2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079	1	TIMESTAMP = 1714861837
2	SIZE (id3lib-3.8.3.tar.gz) = 950726	2	SHA256 (thekhalifa-id3lib-3.8.3.20240114-497fe49_GH0.tar.gz) = 1bcd3129cea7be9d4eea5f4d0009cd889c23e703be4c838da830cdcb666d9fe2
		3	SIZE (thekhalifa-id3lib-3.8.3.20240114-497fe49_GH0.tar.gz) = 450648




--- src/tag_file.cpp.orig	2003-03-02 00:23:00 UTC
+++ src/tag_file.cpp
@@ -242,8 +242,8 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
     strcpy(sTempFile, filename.c_str());
     strcat(sTempFile, sTmpSuffix.c_str());
 
-#if ((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
-    // This section is for Windows folk && gcc 3.x folk
+#if !defined(HAVE_MKSTEMP)
+    // This section is for Windows folk
     fstream tmpOut;
     createFile(sTempFile, tmpOut);
 
@@ -257,7 +257,7 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
       tmpOut.write((char *)tmpBuffer, nBytes);
     }
 
-#else //((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
+#else //!defined(HAVE_MKSTEMP)
 
     // else we gotta make a temp file, copy the tag into it, copy the
     // rest of the old file after the tag, delete the old file, rename
@@ -270,7 +270,7 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
       //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
     }
 
-    ofstream tmpOut(fd);
+    ofstream tmpOut(sTempFile);
     if (!tmpOut)
     {
       tmpOut.close();
@@ -285,14 +285,14 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
     uchar tmpBuffer[BUFSIZ];
     while (file)
     {
-      file.read(tmpBuffer, BUFSIZ);
+      file.read((char *)tmpBuffer, BUFSIZ);
       size_t nBytes = file.gcount();
-      tmpOut.write(tmpBuffer, nBytes);
+      tmpOut.write((char *)tmpBuffer, nBytes);
     }
 
     close(fd); //closes the file
 
-#endif ////((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
+#endif ////!defined(HAVE_MKSTEMP)
 
     tmpOut.close();
     file.close();




--- Makefile.in.orig	2003-03-02 00:23:00 UTC
+++ Makefile.in
@@ -132,8 +132,8 @@ EXTRA_DIST = \
 @ID3_NEEDZLIB_TRUE@zlib_subdir = zlib
 @ID3_NEEDZLIB_FALSE@zlib_subdir = 
 
-SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples
-DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
+SUBDIRS = . m4 doc include id3com src examples
+DIST_SUBDIRS = . m4 doc include id3com src examples prj libprj
 
 INCLUDES = @ID3LIB_DEBUG_FLAGS@
 




--- configure.orig	2003-03-02 00:23:00 UTC
+++ configure
@@ -9134,6 +9134,7 @@ if test x$ac_cv_lib_z_uncompress = xno; then
 else
   ID3_NEEDZLIB_TRUE='#'
   ID3_NEEDZLIB_FALSE=
+  LIBS="-lz $LIBS"
 fi
 
 
@@ -9730,14 +9731,13 @@ fi
   if test ! x$silent = xyes; then
     exec 6>&1
   fi
-  #standalone library rules over libc
-  if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
+  if test $iconv_in_libc = 1; then
+    echo "$as_me:$LINENO: result: libc" >&5
+echo "${ECHO_T}libc" >&6
+  elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
     echo "$as_me:$LINENO: result: libiconv" >&5
 echo "${ECHO_T}libiconv" >&6
     ICONV_LIB=-liconv
-  elif test $iconv_in_libc = 1; then
-    echo "$as_me:$LINENO: result: libc" >&5
-echo "${ECHO_T}libc" >&6
   else
     echo "$as_me:$LINENO: result: not found (panic)" >&5
 echo "${ECHO_T}not found (panic)" >&6
@@ -10296,7 +10296,7 @@ done
 
 for ac_header in \
   string                        \
-  iomanip.h                     \
+  iomanip                     \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

Removed Link Here

(-)a/audio/id3lib/files/patch-examples-demo_convert.cpp (-11 lines)
1	--- examples/demo_convert.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ examples/demo_convert.cpp
3	@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTags)
4	}
5	}
6
7	-int main( unsigned int argc, char * const argv[])
8	+int main( int argc, char * const argv[])
9	{
10	flags_t ulFlag = ID3TT_ALL;
11	gengetopt_args_info args;

Removed Link Here

(-)a/audio/id3lib/files/patch-examples-demo_copy.cpp (-11 lines)
1	--- examples/demo_copy.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ examples/demo_copy.cpp
3	@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTags)
4	}
5	}
6
7	-int main( unsigned int argc, char * const argv[])
8	+int main( int argc, char * const argv[])
9	{
10	int ulFlag = ID3TT_ID3;
11	ID3D_INIT_DOUT();

Removed Link Here

(-)a/audio/id3lib/files/patch-examples-demo_info.cpp (-11 lines)
1	--- examples/demo_info.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ examples/demo_info.cpp
3	@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myTag)
4
5	#define DEBUG
6
7	-int main( unsigned int argc, char * const argv[])
8	+int main( int argc, char * const argv[])
9	{
10	ID3D_INIT_DOUT();
11

Removed Link Here

(-)a/audio/id3lib/files/patch-examples-demo_tag.cpp (-11 lines)
1	--- examples/demo_tag.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ examples/demo_tag.cpp
3	@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTags)
4	os << "v2";
5	}
6
7	-int main( unsigned int argc, char * const argv[])
8	+int main( int argc, char * const argv[])
9	{
10	int ulFlag = ID3TT_ID3;
11	ID3D_INIT_DOUT();

Removed Link Here

(-)a/audio/id3lib/files/patch-include-id3-globals.h (-11 lines)
1	--- include/id3/globals.h.orig 2003-03-02 00:23:00 UTC
2	+++ include/id3/globals.h
3	@@ -480,7 +480,7 @@ ID3_ENUM(Mp3_Frequencies)
4	MP3FREQUENCIES_24000HZ = 24000,
5	MP3FREQUENCIES_32000HZ = 32000,
6	MP3FREQUENCIES_48000HZ = 48000,
7	- MP3FREQUENCIES_44100HZ = 44100,
8	+ MP3FREQUENCIES_44100HZ = 44100
9	};
10
11	ID3_ENUM(Mp3_ChannelMode)

Removed Link Here

(-)a/audio/id3lib/files/patch-include-id3-id3lib_strings.h (-10 lines)
1	--- include/id3/id3lib_strings.h.orig 2003-03-02 00:23:00 UTC
2	+++ include/id3/id3lib_strings.h
3	@@ -30,6 +30,7 @@
4	#define _ID3LIB_STRINGS_H_
5
6	#include <string>
7	+#include <cstring>
8
9	#if (defined(__GNUC__) && (__GNUC__ >= 3) \|\| (defined(_MSC_VER) && _MSC_VER > 1000))
10	namespace std

Removed Link Here

(-)a/audio/id3lib/files/patch-include-id3-writers.h (-10 lines)
1	--- include/id3/writers.h.orig 2003-03-02 00:23:00 UTC
2	+++ include/id3/writers.h
3	@@ -29,6 +29,7 @@
4	#define _ID3LIB_WRITERS_H_
5
6	#include "id3/writer.h"
7	+#include <cstring>
8	#include "id3/id3lib_streams.h"
9	//#include <string.h>
10




--- src/io_helpers.cpp.orig	2003-03-02 00:23:00 UTC
+++ src/io_helpers.cpp
@@ -363,9 +363,10 @@ size_t io::writeUnicodeText(ID3_Writer& writer, String
     // Write the BOM: 0xFEFF
     unicode_t BOM = 0xFEFF;
     writer.writeChars((const unsigned char*) &BOM, 2);
+    const unsigned char* pdata = (const unsigned char*)data.c_str();
     for (size_t i = 0; i < size; i += 2)
     {
-      unicode_t ch = (data[i] << 8) | data[i+1];
+      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
       writer.writeChars((const unsigned char*) &ch, 2);
     }
   }

Removed Link Here

(-)a/audio/id3lib/files/patch-src-mp3_parse.cpp (-11 lines)
1	--- src/mp3_parse.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ src/mp3_parse.cpp
3	@@ -465,7 +465,7 @@ bool Mp3Info::Parse(ID3_Reader& reader,
4	// from http://www.xingtech.com/developer/mp3/
5
6	const size_t VBR_HEADER_MIN_SIZE = 8; // "xing" + flags are fixed
7	- const size_t VBR_HEADER_MAX_SIZE = 116; // frames, bytes, toc and scale are optional
8	+ const size_t VBR_HEADER_MAX_SIZE = 120; // frames, bytes, toc and scale are optional
9
10	if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE)
11	{

Lines 5-13 bin/id3tag Link Here

(-)b/audio/id3lib/pkg-plist (-3 / +11 lines)
5	include/id3.h	5	include/id3.h
6	include/id3/field.h	6	include/id3/field.h
7	include/id3/globals.h	7	include/id3/globals.h
		8	include/id3/helpers.h
8	include/id3/id3lib_frame.h	9	include/id3/id3lib_frame.h
9	include/id3/id3lib_streams.h	10	include/id3/id3lib_streams.h
10	include/id3/id3lib_strings.h	11	include/id3/id3lib_strings.h
		12	include/id3/io_decorators.h
		13	include/id3/io_helpers.h
		14	include/id3/io_strings.h
11	include/id3/misc_support.h	15	include/id3/misc_support.h
12	include/id3/reader.h	16	include/id3/reader.h
13	include/id3/readers.h	17	include/id3/readers.h
Lines 16-22 include/id3/tag.h Link Here
16	include/id3/utils.h	20	include/id3/utils.h
17	include/id3/writer.h	21	include/id3/writer.h
18	include/id3/writers.h	22	include/id3/writers.h
19	lib/libid3-3.8.so.3	23	lib/libid3.so.3.8.3
20	lib/libid3-3.8.so.3.0.0
21	lib/libid3.a
22	lib/libid3.so	24	lib/libid3.so
		25	libdata/pkgconfig/id3lib.pc
		26	share/man/man1/id3convert.1.gz
		27	share/man/man1/id3cp.1.gz
		28	share/man/man1/id3info.1.gz
		29	share/man/man1/id3tag.1.gz
		30

Return to bug 278775

Removed Link Here

(-)a/audio/id3lib/files/patch-CVE-2007-4460 (-49 lines)
1	--- src/tag_file.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ src/tag_file.cpp
3	@@ -242,8 +242,8 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
4	strcpy(sTempFile, filename.c_str());
5	strcat(sTempFile, sTmpSuffix.c_str());
6
7	-#if ((defined(__GNUC__) && __GNUC__ >= 3 ) \|\| !defined(HAVE_MKSTEMP))
8	- // This section is for Windows folk && gcc 3.x folk
9	+#if !defined(HAVE_MKSTEMP)
10	+ // This section is for Windows folk
11	fstream tmpOut;
12	createFile(sTempFile, tmpOut);
13
14	@@ -257,7 +257,7 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
15	tmpOut.write((char *)tmpBuffer, nBytes);
16	}
17
18	-#else //((defined(__GNUC__) && __GNUC__ >= 3 ) \|\| !defined(HAVE_MKSTEMP))
19	+#else //!defined(HAVE_MKSTEMP)
20
21	// else we gotta make a temp file, copy the tag into it, copy the
22	// rest of the old file after the tag, delete the old file, rename
23	@@ -270,7 +270,7 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
24	//ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
25	}
26
27	- ofstream tmpOut(fd);
28	+ ofstream tmpOut(sTempFile);
29	if (!tmpOut)
30	{
31	tmpOut.close();
32	@@ -285,14 +285,14 @@ size_t RenderV2ToFile(const ID3_TagImpl& tag, fstream&
33	uchar tmpBuffer[BUFSIZ];
34	while (file)
35	{
36	- file.read(tmpBuffer, BUFSIZ);
37	+ file.read((char *)tmpBuffer, BUFSIZ);
38	size_t nBytes = file.gcount();
39	- tmpOut.write(tmpBuffer, nBytes);
40	+ tmpOut.write((char *)tmpBuffer, nBytes);
41	}
42
43	close(fd); //closes the file
44
45	-#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) \|\| !defined(HAVE_MKSTEMP))
46	+#endif ////!defined(HAVE_MKSTEMP)
47
48	tmpOut.close();
49	file.close();

Removed Link Here

(-)a/audio/id3lib/files/patch-Makefile.in (-13 lines)
1	--- Makefile.in.orig 2003-03-02 00:23:00 UTC
2	+++ Makefile.in
3	@@ -132,8 +132,8 @@ EXTRA_DIST = \
4	@ID3_NEEDZLIB_TRUE@zlib_subdir = zlib
5	@ID3_NEEDZLIB_FALSE@zlib_subdir =
6
7	-SUBDIRS = . m4 $(zlib_subdir) doc include id3com src examples
8	-DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
9	+SUBDIRS = . m4 doc include id3com src examples
10	+DIST_SUBDIRS = . m4 doc include id3com src examples prj libprj
11
12	INCLUDES = @ID3LIB_DEBUG_FLAGS@
13

Removed Link Here

(-)a/audio/id3lib/files/patch-configure (-38 lines)
1	--- configure.orig 2003-03-02 00:23:00 UTC
2	+++ configure
3	@@ -9134,6 +9134,7 @@ if test x$ac_cv_lib_z_uncompress = xno; then
4	else
5	ID3_NEEDZLIB_TRUE='#'
6	ID3_NEEDZLIB_FALSE=
7	+ LIBS="-lz $LIBS"
8	fi
9
10
11	@@ -9730,14 +9731,13 @@ fi
12	if test ! x$silent = xyes; then
13	exec 6>&1
14	fi
15	- #standalone library rules over libc
16	- if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
17	+ if test $iconv_in_libc = 1; then
18	+ echo "$as_me:$LINENO: result: libc" >&5
19	+echo "${ECHO_T}libc" >&6
20	+ elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
21	echo "$as_me:$LINENO: result: libiconv" >&5
22	echo "${ECHO_T}libiconv" >&6
23	ICONV_LIB=-liconv
24	- elif test $iconv_in_libc = 1; then
25	- echo "$as_me:$LINENO: result: libc" >&5
26	-echo "${ECHO_T}libc" >&6
27	else
28	echo "$as_me:$LINENO: result: not found (panic)" >&5
29	echo "${ECHO_T}not found (panic)" >&6
30	@@ -10296,7 +10296,7 @@ done
31
32	for ac_header in \
33	string \
34	- iomanip.h \
35	+ iomanip \
36
37	do
38	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`

Removed Link Here

(-)a/audio/id3lib/files/patch-src-io_helpers.cpp (-14 lines)
1	--- src/io_helpers.cpp.orig 2003-03-02 00:23:00 UTC
2	+++ src/io_helpers.cpp
3	@@ -363,9 +363,10 @@ size_t io::writeUnicodeText(ID3_Writer& writer, String
4	// Write the BOM: 0xFEFF
5	unicode_t BOM = 0xFEFF;
6	writer.writeChars((const unsigned char*) &BOM, 2);
7	+ const unsigned char* pdata = (const unsigned char*)data.c_str();
8	for (size_t i = 0; i < size; i += 2)
9	{
10	- unicode_t ch = (data[i] << 8) \| data[i+1];
11	+ unicode_t ch = (pdata[i] << 8) \| pdata[i+1];
12	writer.writeChars((const unsigned char*) &ch, 2);
13	}
14	}