rpms/libfishsound/devel libfishsound-0.9.1-FLAC.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libfishsound.spec, 1.3, 1.4 sources, 1.2, 1.3 libfishsound-0.9.0-FLAC.patch, 1.1, NONE
Michel Alexandre Salim (salimma)
fedora-extras-commits at redhat.com
Wed Apr 9 13:18:46 UTC 2008
- Previous message (by thread): rpms/libfishsound/F-8 libfishsound-0.9.1-FLAC.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libfishsound.spec, 1.3, 1.4 sources, 1.2, 1.3 libfishsound-0.9.0-FLAC.patch, 1.1, NONE
- Next message (by thread): rpms/kdebase-workspace/devel kdebase-workspace.spec,1.62,1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: salimma
Update of /cvs/pkgs/rpms/libfishsound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8269/devel
Modified Files:
.cvsignore libfishsound.spec sources
Added Files:
libfishsound-0.9.1-FLAC.patch
Removed Files:
libfishsound-0.9.0-FLAC.patch
Log Message:
Update to 0.9.1 (CVE-2008-1686, bz #441246)
libfishsound-0.9.1-FLAC.patch:
--- NEW FILE libfishsound-0.9.1-FLAC.patch ---
--- libfishsound-0.9.1/configure.FLAC 2008-04-06 17:02:11.000000000 -0400
+++ libfishsound-0.9.1/configure 2008-04-09 08:46:02.000000000 -0400
@@ -21185,9 +21185,9 @@
if test "x${ac_enable_flac}" = xyes ; then
- { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__stream_decoder_init in -lFLAC... $ECHO_C" >&6; }
-if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init+set}" = set; then
+ { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init_stream in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_init_stream in -lFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21205,11 +21205,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char FLAC__stream_decoder_init ();
+char FLAC__stream_decoder_init_stream ();
int
main ()
{
-return FLAC__stream_decoder_init ();
+return FLAC__stream_decoder_init_stream ();
;
return 0;
}
@@ -21232,21 +21232,21 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_FLAC_FLAC__stream_decoder_init=yes
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_FLAC_FLAC__stream_decoder_init=no
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init" >&6; }
-if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream" >&6; }
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream = yes; then
HAVE_FLAC="maybe"
fi
--- libfishsound-0.9.0/src/libfishsound/flac.c.FLAC 2008-01-12 02:08:39.000000000 -0500
+++ libfishsound-0.9.0/src/libfishsound/flac.c 2008-01-19 12:31:50.000000000 -0500
@@ -252,13 +252,18 @@
return NULL;
}
- FLAC__stream_decoder_set_read_callback(fi->fsd, fs_flac_read_callback);
- FLAC__stream_decoder_set_write_callback(fi->fsd, fs_flac_write_callback);
- FLAC__stream_decoder_set_metadata_callback(fi->fsd, fs_flac_meta_callback);
- FLAC__stream_decoder_set_error_callback(fi->fsd, fs_flac_error_callback);
- FLAC__stream_decoder_set_client_data(fi->fsd, fsound);
-
- if (FLAC__stream_decoder_init(fi->fsd) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
+ if (FLAC__stream_decoder_init_stream
+ (fi->fsd,
+ fs_flac_read_callback,
+ NULL, // seek callback
+ NULL, // tell callback
+ NULL, // length callback
+ NULL, // EOF callback
+ fs_flac_write_callback,
+ fs_flac_meta_callback,
+ fs_flac_error_callback,
+ fsound
+ ) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
return NULL;
return fi->fsd;
@@ -539,16 +544,19 @@
FLAC__stream_encoder_set_channels(fi->fse, fsound->info.channels);
FLAC__stream_encoder_set_sample_rate(fi->fse, fsound->info.samplerate);
FLAC__stream_encoder_set_bits_per_sample(fi->fse, BITS_PER_SAMPLE);
- FLAC__stream_encoder_set_write_callback(fi->fse, fs_flac_enc_write_callback);
- FLAC__stream_encoder_set_metadata_callback(fi->fse, fs_flac_enc_meta_callback);
- FLAC__stream_encoder_set_client_data(fi->fse, fsound);
+ // if it's NULL, then init_stream is passed NULL which is fine
metadata = fs_flac_encode_vorbiscomments (fsound);
- if (metadata != NULL)
- FLAC__stream_encoder_set_metadata (fi->fse, &metadata, 1);
/* FLAC__stream_encoder_set_total_samples_estimate(fi->fse, ...);*/
- if (FLAC__stream_encoder_init(fi->fse) != FLAC__STREAM_ENCODER_OK)
+ if (FLAC__stream_encoder_init_stream
+ (fi->fse,
+ fs_flac_enc_write_callback,
+ NULL, // seek callback
+ NULL, // tell callback
+ fs_flac_enc_meta_callback,
+ fsound
+ ) != FLAC__STREAM_ENCODER_OK)
return NULL;
return fsound;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libfishsound/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jan 2008 21:48:46 -0000 1.2
+++ .cvsignore 9 Apr 2008 13:18:09 -0000 1.3
@@ -1 +1 @@
-libfishsound-0.9.0.tar.gz
+libfishsound-0.9.1.tar.gz
Index: libfishsound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libfishsound/devel/libfishsound.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libfishsound.spec 14 Feb 2008 14:58:53 -0000 1.3
+++ libfishsound.spec 9 Apr 2008 13:18:09 -0000 1.4
@@ -1,13 +1,13 @@
Name: libfishsound
-Version: 0.9.0
-Release: 5%{?dist}
+Version: 0.9.1
+Release: 1%{?dist}
Summary: Simple programming interface for Xiph.Org codecs
Group: System Environment/Libraries
License: BSD
URL: http://www.annodex.net/
Source0: http://www.annodex.net/software/libfishsound/download/libfishsound-%{version}.tar.gz
-Patch0: libfishsound-0.9.0-FLAC.patch
+Patch0: libfishsound-0.9.1-FLAC.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# also pulled in by speex-devel
@@ -56,7 +56,7 @@
%prep
%setup -q
-%patch0 -p1 -b .flac
+%patch0 -p1 -b .FLAC
%build
@@ -112,6 +112,9 @@
%changelog
+* Wed Apr 9 2008 Michel Salim <salimma at fedoraproject.org> - 0.9.1-1
+- Update to 0.9.1 (CVE-2008-1686, bz #441246)
+
* Thu Feb 14 2008 Michel Salim <michel.sylvan at gmail.com> - 0.9.0-5
- Previous revision misspelled speex
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libfishsound/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jan 2008 21:48:46 -0000 1.2
+++ sources 9 Apr 2008 13:18:09 -0000 1.3
@@ -1 +1 @@
-8fab7ecd777a87bf337047a63f9d75f5 libfishsound-0.9.0.tar.gz
+42e84db27c203e7d20e1d18c7010aeba libfishsound-0.9.1.tar.gz
--- libfishsound-0.9.0-FLAC.patch DELETED ---
- Previous message (by thread): rpms/libfishsound/F-8 libfishsound-0.9.1-FLAC.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libfishsound.spec, 1.3, 1.4 sources, 1.2, 1.3 libfishsound-0.9.0-FLAC.patch, 1.1, NONE
- Next message (by thread): rpms/kdebase-workspace/devel kdebase-workspace.spec,1.62,1.63
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list