[packages/libmp3splt] - up to 0.9.1 - format_security patch applied upstream
atler
atler at pld-linux.org
Sun May 18 21:53:27 CEST 2014
commit 89c184316293a0fc4a3160327f6bd9492f82adc8
Author: Jan Palus <atler at pld-linux.org>
Date: Sun May 18 21:46:15 2014 +0200
- up to 0.9.1
- format_security patch applied upstream
libmp3splt-format_security.patch | 166 ---------------------------------------
libmp3splt.spec | 8 +-
2 files changed, 3 insertions(+), 171 deletions(-)
---
diff --git a/libmp3splt.spec b/libmp3splt.spec
index 3cb7b49..ed0f655 100644
--- a/libmp3splt.spec
+++ b/libmp3splt.spec
@@ -6,14 +6,13 @@
Summary: Libraries for the mp3splt project
Summary(pl.UTF-8): Biblioteki do projektu mp3splt
Name: libmp3splt
-Version: 0.9.0
-Release: 2
+Version: 0.9.1
+Release: 1
License: GPL v2
Group: Libraries
Source0: http://downloads.sourceforge.net/mp3splt/%{name}-%{version}.tar.gz
-# Source0-md5: b9b9677ababf823e0739e5caff68aa86
+# Source0-md5: 742f9fb4806df909c0ba25919bf9bb4f
Patch0: ltdl.patch
-Patch1: %{name}-format_security.patch
URL: http://mp3splt.sourceforge.net/
BuildRequires: autoconf >= 2.62
BuildRequires: automake
@@ -100,7 +99,6 @@ Dokumentacja API biblioteki libmp3splt.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
sed -i -e 's/fr_FR/fr/;s/de_DE/de/;' po/LINGUAS
mv po/de_DE.po po/de.po
mv po/fr_FR.po po/fr.po
diff --git a/libmp3splt-format_security.patch b/libmp3splt-format_security.patch
deleted file mode 100644
index da1196e..0000000
--- a/libmp3splt-format_security.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -urN libmp3splt-0.9.0.orig/src/oformat_parser.c libmp3splt-0.9.0/src/oformat_parser.c
---- libmp3splt-0.9.0.orig/src/oformat_parser.c 2014-03-22 23:25:22.076480090 +0100
-+++ libmp3splt-0.9.0/src/oformat_parser.c 2014-03-22 23:30:02.099814984 +0100
-@@ -533,7 +533,7 @@
- int max_number_of_digits = splt_u_get_requested_num_of_digits(state,
- state->oformat.format[i], &requested_num_of_digits, SPLT_FALSE);
-
-- snprintf(temp + offset, temp_len, format);
-+ snprintf(temp + offset, temp_len, "%s", format);
-
- fm_length = strlen(temp) + 1 + max_number_of_digits;
- if ((fm = malloc(fm_length * sizeof(char))) == NULL)
-@@ -563,7 +563,7 @@
- //
- if (artist_or_performer != NULL)
- {
-- snprintf(temp+2,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2,temp_len, "%s", state->oformat.format[i]+2);
-
- int artist_length = 0;
- artist_length = strlen(artist_or_performer);
-@@ -571,7 +571,7 @@
- }
- else
- {
-- snprintf(temp,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp,temp_len, "%s", state->oformat.format[i]+2);
- fm_length = strlen(temp) + 1;
- }
-
-@@ -591,7 +591,7 @@
- }
- else
- {
-- snprintf(fm, fm_length, temp);
-+ snprintf(fm, fm_length, "%s", temp);
- }
-
- break;
-@@ -608,7 +608,7 @@
- //
- if (artist != NULL)
- {
-- snprintf(temp+2,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2,temp_len, "%s", state->oformat.format[i]+2);
-
- int artist_length = 0;
- artist_length = strlen(artist);
-@@ -616,7 +616,7 @@
- }
- else
- {
-- snprintf(temp,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp,temp_len, "%s", state->oformat.format[i]+2);
- fm_length = strlen(temp) + 1;
- }
-
-@@ -636,7 +636,7 @@
- }
- else
- {
-- snprintf(fm, fm_length, temp);
-+ snprintf(fm, fm_length, "%s", temp);
- }
- break;
- case 'b':
-@@ -654,13 +654,13 @@
- {
- int album_length = 0;
- album_length = strlen(album);
-- snprintf(temp+2, temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
-
- fm_length = strlen(temp) + album_length + 1;
- }
- else
- {
-- snprintf(temp,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp,temp_len, "%s", state->oformat.format[i]+2);
- fm_length = strlen(temp) + 1;
- }
-
-@@ -698,13 +698,13 @@
- {
- int genre_length = 0;
- genre_length = strlen(genre);
-- snprintf(temp+2, temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
-
- fm_length = strlen(temp) + genre_length + 1;
- }
- else
- {
-- snprintf(temp,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp,temp_len, "%s", state->oformat.format[i]+2);
- fm_length = strlen(temp) + 1;
- }
-
-@@ -742,13 +742,13 @@
- {
- int title_length = 0;
- title_length = strlen(title);
-- snprintf(temp+2, temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
-
- fm_length = strlen(temp) + title_length + 1;
- }
- else
- {
-- snprintf(temp,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp,temp_len, "%s", state->oformat.format[i]+2);
- fm_length = strlen(temp) + 1;
- }
-
-@@ -768,7 +768,7 @@
- }
- else
- {
-- snprintf(fm, fm_length, temp);
-+ snprintf(fm, fm_length, "%s", temp);
- }
- break;
- case 'p':
-@@ -786,13 +786,13 @@
- {
- int performer_length = 0;
- performer_length = strlen(performer);
-- snprintf(temp+2, temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2, temp_len, "%s", state->oformat.format[i]+2);
-
- fm_length = strlen(temp) + performer_length + 1;
- }
- else
- {
-- snprintf(temp,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp,temp_len, "%s", state->oformat.format[i]+2);
- fm_length = strlen(temp) + 1;
- }
-
-@@ -811,7 +811,7 @@
- }
- else
- {
-- snprintf(fm, fm_length, temp);
-+ snprintf(fm, fm_length, "%s", temp);
- }
- break;
- case 'l':
-@@ -861,7 +861,7 @@
- const char *format =
- splt_u_get_format_ptr(state->oformat.format[i], temp, NULL);
-
-- snprintf(temp + 4, temp_len, format + 2);
-+ snprintf(temp + 4, temp_len, "%s", format + 2);
- fm_length = strlen(temp) + 1 + max_num_of_digits;
- }
- else
-@@ -902,7 +902,7 @@
- original_filename = strdup(splt_su_get_fname_without_path(splt_t_get_filename_to_split(state)));
- if (original_filename)
- {
-- snprintf(temp+2,temp_len, state->oformat.format[i]+2);
-+ snprintf(temp+2,temp_len, "%s", state->oformat.format[i]+2);
-
- splt_su_cut_extension(original_filename);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmp3splt.git/commitdiff/89c184316293a0fc4a3160327f6bd9492f82adc8
More information about the pld-cvs-commit
mailing list