OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=7

e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af96554d169704fd7338ad5f05d590b9af61d27357327c7cb3a6c3344648fc55
+size 3597330

e2fsprogs-1.39+1.40_WIP_20061114.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa644dbfdc6a9e6d05d780a1a8cc6f46ae605c7774b9f214fd7b3152cb0c3822
-size 3596521

e2fsprogs-1.39-check_fs_open-in-dump_unused.patch

@@ -1,14 +0,0 @@
-diff -upNr e2fsprogs-1.38.orig/debugfs/unused.c e2fsprogs-1.38/debugfs/unused.c
---- e2fsprogs-1.38.orig/debugfs/unused.c	2006-09-23 13:55:27.000000000 -0500
-+++ e2fsprogs-1.38/debugfs/unused.c	2006-09-23 13:56:14.000000000 -0500
-@@ -31,6 +31,10 @@ void do_dump_unused(int argc EXT2FS_ATTR
- 	unsigned int	i;
- 	errcode_t	retval;
- 
-+	if (common_args_process(argc, argv, 1, 1,
-+				"dump_unused", "", 0))
-+		return;
-+
- 	for (blk=current_fs->super->s_first_data_block;
- 	     blk < current_fs->super->s_blocks_count; blk++) {
- 		if (ext2fs_test_block_bitmap(current_fs->block_map,blk))

e2fsprogs.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 30 12:33:36 CEST 2007 - mkoenig@suse.de
+
+- update to current hg version from 29-03-2007
+  * Fixes a lot of memory leaks and other bugs
+- remove merged patch: 
+  e2fsprogs-1.39-check_fs_open-in-dump_unused.patch 
+
 -------------------------------------------------------------------
 Wed Mar 28 15:44:16 CEST 2007 - mkoenig@suse.de
 

e2fsprogs.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package e2fsprogs (Version 1.39+1.40_WIP_20061114)
+# spec file for package e2fsprogs (Version 1.39+1.40_WIP_20061114+PATCH20070329)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -18,8 +18,8 @@ Provides:       e2fsbn ext2fs
 Obsoletes:      ext2fs
 PreReq:         %install_info_prereq
 Autoreqprov:    on
-Version:        1.39+1.40_WIP_20061114
+Version:        1.39+1.40_WIP_20061114+PATCH20070329
-Release:        10
+Release:        1
 Summary:        Utilities for the Second Extended File System
 URL:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -41,7 +41,6 @@ Patch14:        e2fsprogs-1.39-cleanup.patch
 Patch15:        e2fsprogs-1.39-uuid_duplicates.patch
 Patch16:        e2fsprogs-1.39-resize2fs_manpage.patch
 Patch17:        e2fsprogs-strncat.patch
-Patch18:        e2fsprogs-1.39-check_fs_open-in-dump_unused.patch
 Patch19:        e2fsprogs-blkid_probe_ext4.patch
 Patch20:        e2fsprogs-blkid_probe_hfsplus.patch
 # libcom_err patches
@@ -119,7 +118,6 @@ Authors:
 %patch15 -p1
 %patch16
 %patch17 -p1
-%patch18 -p1
 %patch19 -p1
 %patch20 -p1
 # libcom_err patches
@@ -248,6 +246,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n libcom_err -p /sbin/ldconfig
 
 %changelog
+* Fri Mar 30 2007 - mkoenig@suse.de
+- update to current hg version from 29-03-2007
+  * Fixes a lot of memory leaks and other bugs
+- remove merged patch:
+  e2fsprogs-1.39-check_fs_open-in-dump_unused.patch
 * Wed Mar 28 2007 - mkoenig@suse.de
 - blkid: add hfsplus volume detection (FATE#302071)
 - blkid: add experimental detection of ext4dev (FATE#301897)

libcom_err-mutex.patch

@@ -1,6 +1,8 @@
---- e2fsprogs-1.39/lib/et/com_err.pc.in
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/com_err.pc.in
-+++ e2fsprogs-1.39/lib/et/com_err.pc.in
+===================================================================
-@@ -7,5 +7,5 @@
+--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/com_err.pc.in
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/com_err.pc.in
+@@ -7,5 +7,5 @@ Name: com_err
  Description: Common error description library
  Version: @E2FSPROGS_VERSION@
  Requires:
@@ -8,17 +10,19 @@
 -Libs: -L${libdir} -lcom_err
 +Cflags: -I${includedir} -pthread
 +Libs: -L${libdir} -lcom_err -pthread
---- e2fsprogs-1.39/lib/et/error_message.c
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c
-+++ e2fsprogs-1.39/lib/et/error_message.c
+===================================================================
+--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/error_message.c
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_message.c
 @@ -20,6 +20,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <errno.h>
 +#include <pthread.h>
- #include "com_err.h"
+ #ifdef HAVE_SYS_PRCTL_H
- #include "error_table.h"
+ #include <sys/prctl.h>
- #include "internal.h"
+ #else
-@@ -27,6 +28,17 @@
+@@ -35,6 +36,17 @@
  struct et_list * _et_list = (struct et_list *) NULL;
  struct et_list * _et_dynamic_list = (struct et_list *) NULL;
  
@@ -36,7 +40,7 @@
  
  const char * error_message (errcode_t code)
  {
-@@ -51,22 +63,32 @@
+@@ -59,22 +71,32 @@ const char * error_message (errcode_t co
  	    goto oops;
  #endif
      }
@@ -75,7 +79,7 @@
  oops:
      return "Unknown code";
  }
-@@ -81,10 +103,14 @@
+@@ -143,6 +165,9 @@ errcode_t add_error_table(const struct e
  	if (!(el = (struct et_list *) malloc(sizeof(struct et_list))))
  		return ENOMEM;
  
@@ -85,12 +89,15 @@
  	el->table = et;
  	el->next = _et_dynamic_list;
  	_et_dynamic_list = el;
+@@ -153,6 +178,7 @@ errcode_t add_error_table(const struct e
+ 			error_table_name(et->base),
+ 			(const void *) et);
  
 +	et_list_unlock();
  	return 0;
  }
  
-@@ -93,9 +119,13 @@
+@@ -161,9 +187,13 @@ errcode_t add_error_table(const struct e
   */
  errcode_t remove_error_table(const struct error_table * et)
  {
@@ -102,26 +109,30 @@
 +	    return ENOENT;
 +
 +	el = _et_dynamic_list;
+ 	init_debug();
  	while (el) {
  		if (el->table->base == et->base) {
- 			if (el2)	/* Not the beginning of the list */
+@@ -177,6 +207,7 @@ errcode_t remove_error_table(const struc
-@@ -103,11 +133,13 @@
+ 					"remove_error_table: %s (0x%p)\n",
- 			else
+ 					error_table_name(et->base),
- 				_et_dynamic_list = el->next;
+ 					(const void *) et);
- 			(void) free(el);
 +			et_list_unlock();
  			return 0;
  		}
  		el2 = el;
- 		el = el->next;
+@@ -186,6 +217,7 @@ errcode_t remove_error_table(const struc
- 	}
+ 		fprintf(debug_f, "remove_error_table FAILED: %s (0x%p)\n",
+ 			error_table_name(et->base),
+ 			(const void *) et);
 +	et_list_unlock();
  	return ENOENT;
  }
  
---- e2fsprogs-1.39/lib/et/error_table.h
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_table.h
-+++ e2fsprogs-1.39/lib/et/error_table.h
+===================================================================
-@@ -19,6 +19,8 @@
+--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/error_table.h
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/error_table.h
+@@ -19,6 +19,8 @@ struct et_list {
      const struct error_table *table;
  };
  extern struct et_list * _et_list;
@@ -130,9 +141,11 @@
  
  #define	ERRCODE_RANGE	8	/* # of bits to shift table number */
  #define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
---- e2fsprogs-1.39/lib/et/et_c.awk
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/et_c.awk
-+++ e2fsprogs-1.39/lib/et/et_c.awk
+===================================================================
-@@ -225,6 +225,8 @@
+--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/et/et_c.awk
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/et/et_c.awk
+@@ -225,6 +225,8 @@ END {
  	print "    const struct error_table * table;" > outfile
  	print "};" > outfile
  	print "extern struct et_list *_et_list;" > outfile
@@ -141,7 +154,7 @@
  	print "" > outfile
  	if (tab_base_high == 0) {
  		print "const struct error_table et_" table_name "_error_table = { text, " \
-@@ -242,7 +244,22 @@
+@@ -242,7 +244,22 @@ END {
  	print "void initialize_" table_name "_error_table(void);" > outfile
  	print "" > outfile
  	print "void initialize_" table_name "_error_table(void) {" > outfile
@@ -165,7 +178,7 @@
  	print "}" > outfile
  	print "" > outfile
  	print "/* For Heimdal compatibility */" > outfile
-@@ -255,9 +272,6 @@
+@@ -255,9 +272,6 @@ END {
  	print "            return;" > outfile
  	print "    et = malloc(sizeof(struct et_list));" > outfile
  	print "    if (et == 0) {" > outfile