[SCM] libdvdnav/master: Revert "Update patch for the Hurd"

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cad1805761b74fb565c4e8e7318c9db8210ead7c
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Feb 13 18:04:25 2014 +0100

    Revert "Update patch for the Hurd"
    
    This reverts commit b9381d80093fae509e82ca4603b4b18b1ba42117.

diff --git a/debian/patches/0002-hurd.patch b/debian/patches/0002-hurd.patch
index 63b706c..cccf663 100644
--- a/debian/patches/0002-hurd.patch
+++ b/debian/patches/0002-hurd.patch
@@ -5,7 +5,7 @@ Description:
 
 --- a/src/dvdnav.c
 +++ b/src/dvdnav.c
-@@ -166,8 +166,7 @@ dvdnav_status_t dvdnav_open(dvdnav_t** d
+@@ -105,8 +105,7 @@
    }
  
    /* Set the path. FIXME: Is a deep copy 'right' */
@@ -17,7 +17,7 @@ Description:
    this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
 --- a/src/dvdnav_internal.h
 +++ b/src/dvdnav_internal.h
-@@ -65,13 +65,6 @@ static inline int _private_gettimeofday(
+@@ -65,13 +65,6 @@
  /* Maximum length of an error string */
  #define MAX_ERR_LEN 255
  
@@ -31,7 +31,7 @@ Description:
  #ifndef DVD_VIDEO_LB_LEN
  #define DVD_VIDEO_LB_LEN 2048
  #endif
-@@ -144,7 +137,7 @@ typedef struct dvdnav_vobu_s {
+@@ -144,7 +137,7 @@
  
  struct dvdnav_s {
    /* General data */
@@ -53,7 +53,7 @@ Description:
  #endif /* _MSC_VER */
  
  #include <inttypes.h>
-@@ -198,7 +194,7 @@ static int parseblock(char *buf, int *do
+@@ -191,7 +187,7 @@
  
  remap_t* remap_loadmap( char *title) {
      char buf[160];
@@ -62,12 +62,11 @@ Description:
      char *home;
      int res;
      FILE *fp;
-@@ -212,14 +208,20 @@ remap_t* remap_loadmap( char *title) {
+@@ -205,14 +201,19 @@
          fprintf(MSG_OUT, "libdvdnav: Unable to find home directory" );
          return NULL;
      }
 -    snprintf(fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title);
-+
 +    fname = malloc(strlen("/.dvdnav/.map") + strlen(home) + strlen(title) + 1);
 +    if (!fname)
 +        return NULL;
@@ -76,11 +75,11 @@ Description:
      /* Open the map file */
      fp = fopen( fname, "r");
      if (!fp) {
-         fprintf(MSG_OUT, "libdvdnav: Unable to find map file '%s'\n", fname);
-+        free(fname);
-         return NULL;
+ 	fprintf(MSG_OUT, "libdvdnav: Unable to find map file '%s'\n", fname);
++	free(fname);
+ 	return NULL;
      }
 +    free(fname);
  
      /* Load the map file */
-     if ((map = remap_new( title)) == NULL) {
+     map = remap_new( title);

-- 
libdvdnav packaging