Hello community,
here is the log from the commit of package e2fsprogs
checked in at Wed Jun 20 01:19:20 CEST 2007.
--------
--- e2fsprogs/e2fsprogs.changes 2007-04-25 12:54:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/e2fsprogs/e2fsprogs.changes 2007-06-19 11:17:23.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Jun 19 11:06:52 CEST 2007 - mkoenig@suse.de
+
+- fix e2fsprogs-1.39-uuid_duplicates.patch [#189640]
+ * detach shm segment after use
+ * set SEM_UNDO for semaphore operations, otherwise we do not
+ get a clean state after interruption by a signal
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ e2fsprogs.spec ++++++
--- /var/tmp/diff_new_pack.o32353/_old 2007-06-20 01:16:51.000000000 +0200
+++ /var/tmp/diff_new_pack.o32353/_new 2007-06-20 01:16:51.000000000 +0200
@@ -21,7 +21,7 @@
PreReq: %install_info_prereq
Autoreqprov: on
Version: 1.39+1.40_WIP_20061114+PATCH20070329
-Release: 9
+Release: 23
Summary: Utilities for the Second Extended File System
URL: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2
@@ -254,6 +254,11 @@
%postun -n libcom_err -p /sbin/ldconfig
%changelog
+* Tue Jun 19 2007 - mkoenig@suse.de
+- fix e2fsprogs-1.39-uuid_duplicates.patch [#189640]
+ * detach shm segment after use
+ * set SEM_UNDO for semaphore operations, otherwise we do not
+ get a clean state after interruption by a signal
* Wed Apr 25 2007 - pth@suse.de
- Fix German translations.
* Wed Apr 11 2007 - mkoenig@suse.de
++++++ e2fsprogs-1.39-uuid_duplicates.patch ++++++
--- /var/tmp/diff_new_pack.o32353/_old 2007-06-20 01:16:51.000000000 +0200
+++ /var/tmp/diff_new_pack.o32353/_new 2007-06-20 01:16:51.000000000 +0200
@@ -1,6 +1,8 @@
---- e2fsprogs-1.39/lib/uuid/Makefile.in
-+++ e2fsprogs-1.39/lib/uuid/Makefile.in
-@@ -19,6 +19,8 @@
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/Makefile.in
+===================================================================
+--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/uuid/Makefile.in
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/Makefile.in
+@@ -19,6 +19,8 @@ SMANPAGES= uuid.3 uuid_clear.3 uuid_comp
OBJS= clear.o \
compare.o \
copy.o \
@@ -9,7 +11,7 @@
gen_uuid.o \
isnull.o \
pack.o \
-@@ -30,6 +32,8 @@
+@@ -30,6 +32,8 @@ OBJS= clear.o \
SRCS= $(srcdir)/clear.c \
$(srcdir)/compare.c \
$(srcdir)/copy.c \
@@ -18,7 +20,7 @@
$(srcdir)/gen_uuid.c \
$(srcdir)/isnull.c \
$(srcdir)/pack.c \
-@@ -82,7 +86,7 @@
+@@ -82,7 +86,7 @@ tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
@echo " LD $@"
@@ -27,9 +29,11 @@
$(LIBUUID)
uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
---- e2fsprogs-1.39/lib/uuid/gen_uuid.c
-+++ e2fsprogs-1.39/lib/uuid/gen_uuid.c
-@@ -71,6 +71,10 @@
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/gen_uuid.c
+===================================================================
+--- e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329.orig/lib/uuid/gen_uuid.c
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/gen_uuid.c
+@@ -74,6 +74,10 @@
#endif
#include "uuidP.h"
@@ -40,7 +44,7 @@
#ifdef HAVE_SRANDOM
#define srand(x) srandom(x)
-@@ -224,42 +228,55 @@
+@@ -247,54 +251,75 @@ static int get_node_id(unsigned char *no
/* Assume that the gettimeofday() has microsecond granularity */
#define MAX_ADJUSTMENT 10
@@ -116,7 +120,9 @@
*clock_high = clock_reg >> 32;
*clock_low = clock_reg;
*ret_clock_seq = clock_seq;
-@@ -268,10 +285,16 @@
++ shm_detach(clock_time);
+ return 0;
+ }
void uuid_generate_time(uuid_t out)
{
@@ -124,7 +130,8 @@
+
+ pthread_once(&m_uuid_init_guard, m_uuid_init_once);
+
-+ if(m_uuid_sem_id != -1) uuid_sem_P(m_uuid_sem_id);
++ if(m_uuid_sem_id != -1)
++ uuid_sem_P(m_uuid_sem_id);
+
static unsigned char node_id[6];
static int has_init = 0;
@@ -134,19 +141,22 @@
if (!has_init) {
if (get_node_id(node_id) <= 0) {
-@@ -291,6 +314,10 @@
+@@ -314,6 +339,11 @@ void uuid_generate_time(uuid_t out)
uu.time_hi_and_version = ((clock_mid >> 16) & 0x0FFF) | 0x1000;
memcpy(uu.node, node_id, 6);
uuid_pack(&uu, out);
+
-+ if(m_uuid_sem_id != -1) uuid_sem_V(m_uuid_sem_id);
++ if(m_uuid_sem_id != -1)
++ uuid_sem_V(m_uuid_sem_id);
+
+ pthread_mutex_unlock(&m_uuid_mutex);
}
void uuid_generate_random(uuid_t out)
---- e2fsprogs-1.39/lib/uuid/pv.c
-+++ e2fsprogs-1.39/lib/uuid/pv.c
+Index: e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/pv.c
+===================================================================
+--- /dev/null
++++ e2fsprogs-1.39+1.40_WIP_20061114+PATCH20070329/lib/uuid/pv.c
@@ -0,0 +1,88 @@
+#include
participants (1)
-
root@Hilbert.suse.de