[SCM] Debian packaging of libdevice-cdio-perl branch, master, updated. upstream/0.3.0-58-g3409049

Martin Ferrari tincho at abhean.mine.nu
Tue Jan 17 17:22:50 UTC 2012


The following commit has been merged in the master branch:
commit 02088ca8a7f12c9023de796df5939bfc44d531eb
Author: Martín Ferrari <tincho at debian.org>
Date:   Tue Jan 17 07:59:44 2012 +0000

    debian/patches: removed a couple of patches applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 8722929..93551b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ libdevice-cdio-perl (0.3.0-1) UNRELEASED; urgency=low
     upstream requirements and package versions in Debian.
   * Mention module name in long description.
 
+  [ Martín Ferrari ]
+  * debian/patches: removed a couple of patches applied upstream.
+
  -- gregor herrmann <gregoa at debian.org>  Fri, 21 Oct 2011 16:32:35 +0200
 
 libdevice-cdio-perl (0.2.4-5) unstable; urgency=medium
diff --git a/debian/patches/01_invalid_cflags.patch b/debian/patches/01_invalid_cflags.patch
deleted file mode 100644
index ff066cd..0000000
--- a/debian/patches/01_invalid_cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Martín Ferrari <martin.ferrari at gmail.com>
-Description: Some string splitting is generating a empty
-array element that's passed to exec, so cc interprets it as a
-parameter and it fails.
-(Patch sent to http://rt.cpan.org/Public/Bug/Display.html?id=28132)
---- a/Build.PL
-+++ b/Build.PL
-@@ -319,6 +319,10 @@ if ('cygwin' eq $Config{osname} && 
-     $ldflags .= " -bundle -flat_namespace";
- }
- 
-+$ccflags =~ s/^\s+//;
-+$ccflags =~ s/\s+$//;
-+$ldflags =~ s/^\s+//;
-+$ldflags =~ s/\s+$//;
- my $class = Module::Build->subclass( code => $code );
- 
- my $builder = $class->new( 
diff --git a/debian/patches/05_buffer_overflows_in_perliso9660.patch b/debian/patches/05_buffer_overflows_in_perliso9660.patch
deleted file mode 100644
index 9b296e5..0000000
--- a/debian/patches/05_buffer_overflows_in_perliso9660.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Martín Ferrari <martin.ferrari at gmail.com>
-Description: There are a coupĺe of offbyone errors that lead to buffer overflows
---- a/perliso9660.swg
-+++ b/perliso9660.swg
-@@ -445,7 +445,7 @@ char * name_translate(const char *psz_ol
- %inline %{
- char *
- name_translate(const char *psz_oldname) {
--  char *psz_newname=calloc(sizeof(char), strlen(psz_oldname));
-+  char *psz_newname=calloc(sizeof(char), strlen(psz_oldname)+1);
-   iso9660_name_translate(psz_oldname, psz_newname);
-   return psz_newname;
- }
-@@ -470,7 +470,7 @@ char * name_translate_ext(const char *ps
- %inline %{
- char * 
- name_translate_ext(const char *psz_oldname, uint8_t i_joliet_level) {
--  char *psz_newname=calloc(sizeof(char), strlen(psz_oldname));
-+  char *psz_newname=calloc(sizeof(char), strlen(psz_oldname)+1);
-   iso9660_name_translate_ext(psz_oldname, psz_newname, i_joliet_level);
-   return psz_newname;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 2f2b9ff..df6a5c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-01_invalid_cflags.patch
 02_wrong_function_name.patch
 03_version_information_in_swig.patch
 04_wrong_handling_of_output_parameters.patch
-05_buffer_overflows_in_perliso9660.patch
 06_module_build.patch
 07_pod-coverage.patch

-- 
Debian packaging of libdevice-cdio-perl



More information about the Pkg-perl-cvs-commits mailing list