rpms/grip/F-8 grip-3.2.0-executionpatch.patch, NONE, 1.1 grip.834724.patch, NONE, 1.1 grip.spec, 1.20, 1.21

Adrian Reber adrian at fedoraproject.org
Sun Nov 9 14:41:39 UTC 2008


Author: adrian

Update of /cvs/extras/rpms/grip/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11953

Modified Files:
	grip.spec 
Added Files:
	grip-3.2.0-executionpatch.patch grip.834724.patch 
Log Message:
* Sun Nov 09 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-24
- fixed "buffer overflow caused by large amount of CDDB replies" (#470552)
  (CVE-2005-0706)


grip-3.2.0-executionpatch.patch:

--- NEW FILE grip-3.2.0-executionpatch.patch ---
diff -up grip-3.2.0/src/grip.c.exec-after-encode grip-3.2.0/src/grip.c
--- grip-3.2.0/src/grip.c.exec-after-encode	2008-08-11 11:56:07.000000000 +0300
+++ grip-3.2.0/src/grip.c	2008-08-11 11:56:07.000000000 +0300
@@ -129,7 +129,8 @@ void DoSaveConfig(GripInfo *ginfo);
 {"vol_vis",CFG_ENTRY_BOOL,0,&uinfo->volvis},\
 {"track_edit_vis",CFG_ENTRY_BOOL,0,&uinfo->track_edit_visible},\
 {"track_prog_vis",CFG_ENTRY_BOOL,0,&uinfo->track_prog_visible},\
-{"volume",CFG_ENTRY_INT,0,&ginfo->volume},
+{"volume",CFG_ENTRY_INT,0,&ginfo->volume},\
+{"execute_after_encode_cmd",CFG_ENTRY_STRING,256,ginfo->execute_after_encode_cmd},
 
 #define CDPAR_CFG_ENTRIES \
 {"disable_paranoia",CFG_ENTRY_BOOL,0,&ginfo->disable_paranoia},\
diff -up grip-3.2.0/src/gripcfg.c.exec-after-encode grip-3.2.0/src/gripcfg.c
--- grip-3.2.0/src/gripcfg.c.exec-after-encode	2008-08-11 11:56:07.000000000 +0300
+++ grip-3.2.0/src/gripcfg.c	2008-08-11 11:56:07.000000000 +0300
@@ -475,6 +475,11 @@ void MakeConfigPage(GripInfo *ginfo)
 		     255,TRUE);
   gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
   gtk_widget_show(entry);
+  
+  entry=MakeStrEntry(NULL,ginfo->execute_after_encode_cmd,_("Execute command after encode"),
+		     255,TRUE);
+  gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
+  gtk_widget_show(entry);
 
   gtk_container_add(GTK_CONTAINER(page2),vbox);
   gtk_widget_show(vbox);
diff -up grip-3.2.0/src/grip.h.exec-after-encode grip-3.2.0/src/grip.h
--- grip-3.2.0/src/grip.h.exec-after-encode	2004-04-15 20:51:47.000000000 +0300
+++ grip-3.2.0/src/grip.h	2008-08-11 11:56:07.000000000 +0300
@@ -311,6 +311,7 @@ typedef struct _grip_info {
   int edit_num_cpu;
   int mp3nice;
   char mp3_filter_cmd[256];
+  char execute_after_encode_cmd[256];
   gboolean doid3;
   gboolean doid3v2;
   gboolean tag_mp3_only;
diff -up grip-3.2.0/src/rip.c.exec-after-encode grip-3.2.0/src/rip.c
--- grip-3.2.0/src/rip.c.exec-after-encode	2008-08-11 11:56:07.000000000 +0300
+++ grip-3.2.0/src/rip.c	2008-08-11 12:14:09.000000000 +0300
@@ -1012,6 +1012,13 @@ void UpdateRipProgress(GripInfo *ginfo)
 	    else RipIsFinished(ginfo,FALSE);
           }
 
+	  /* Check if last encode finished */
+	  if(*ginfo->execute_after_encode_cmd&&!ginfo->rip_partial&&
+	     !ginfo->ripping&&!ginfo->encode_list)
+	    TranslateAndLaunch(ginfo->execute_after_encode_cmd,TranslateSwitch,
+			       ginfo->encoded_track[mycpu],FALSE,
+			       &(ginfo->sprefs),CloseStuff,(void *)ginfo);
+
 	  g_free(ginfo->encoded_track[mycpu]);
          
 	  if(!ginfo->rip_partial&&ginfo->encode_list) {

grip.834724.patch:

--- NEW FILE grip.834724.patch ---
diff --git a/src/discdb.c b/src/discdb.c
index c21a608..9ad279b 100644
--- a/src/discdb.c
+++ b/src/discdb.c
@@ -311,7 +311,7 @@ gboolean DiscDBDoQuery(DiscInfo *disc,DiscDBServer *server,
     query->query_match=MATCH_EXACT;
     query->query_matches=0;
 
-    while((inbuffer=DiscDBReadLine(&dataptr))) {
+    while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) {
       query->query_list[query->query_matches].list_genre=
 	DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
       
@@ -331,7 +331,7 @@ gboolean DiscDBDoQuery(DiscInfo *disc,DiscDBServer *server,
     query->query_match=MATCH_INEXACT;
     query->query_matches=0;
 
-    while((inbuffer=DiscDBReadLine(&dataptr))) {
+    while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) {
       query->query_list[query->query_matches].list_genre=
 	DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
       


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/F-8/grip.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- grip.spec	27 Jul 2008 08:25:38 -0000	1.20
+++ grip.spec	9 Nov 2008 14:41:09 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 20%{?dist}
+Release: 24%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,8 @@
 Patch3: grip.desktop.patch
 Patch4: grip-64bit-fix.patch
 Patch5: grip-3.2.0-lookup.patch
+Patch6: grip-3.2.0-executionpatch.patch
+Patch7: grip.834724.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -33,6 +35,8 @@
 %patch3
 %patch4
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -46,7 +50,7 @@
 # convert non utf8 .po files to utf8
 # to fix #456721 (Grip silently crahses on F8)
 pushd po
-for i in de.po es.po fr.po pt_BR.po ru.po; do
+for i in es.po pt_BR.po ru.po; do
 	iconv -f iso-8859-1 -t utf-8 $i > $i.tmp
 	mv $i.tmp $i
 done
@@ -94,6 +98,20 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 09 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-24
+- fixed "buffer overflow caused by large amount of CDDB replies" (#470552)
+  (CVE-2005-0706)
+
+* Thu Oct 02 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-23
+- fixed "German Umlauts are shown incorrectly" (#459394)
+  (not converting de.po and fr.po to UTF-8 anymore)
+
+* Sat Aug 23 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-22
+- updated to better "execute command after encode" patch from Stefan Becker
+
+* Sun Aug 10 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-21
+- added "execute command after encode" patch (#457186)
+
 * Sat Jul 26 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-20
 - fixed "Grip silently crahses on F8" (#456721)
   (converted non UTF-8 .po files to UTF-8)




More information about the fedora-extras-commits mailing list