From 8a0ee48501baa1f794b0afead933524614b786513ad6834a1e63d7950c23b30e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 15 Dec 2008 11:27:19 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=16

---
 drbd-8.2.7.tar.bz2  |  4 ++--
 drbd-optflags.patch | 33 ---------------------------------
 drbd.changes        | 13 +++++++++++++
 drbd.spec           | 14 +++++++++++---
 4 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 drbd-optflags.patch

diff --git a/drbd-8.2.7.tar.bz2 b/drbd-8.2.7.tar.bz2
index b497bfe..bd27872 100644
--- a/drbd-8.2.7.tar.bz2
+++ b/drbd-8.2.7.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:588ab2a66b659e434f4ae5fb4d0db59f868bdb21f39915b548794a005f7b474f
-size 279020
+oid sha256:6e6114bcc1f5ebede32625efda54b25284ed0065e4c8d1a8088271ab3070a3d9
+size 281309
diff --git a/drbd-optflags.patch b/drbd-optflags.patch
deleted file mode 100644
index 97c5e78..0000000
--- a/drbd-optflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
----
- benchmark/Makefile |    4 +++-
- user/Makefile      |    3 ++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
---- drbd-8.2.5.orig/benchmark/Makefile	2007-12-09 13:54:21.000000000 +0100
-+++ drbd-8.2.5/benchmark/Makefile	2008-04-15 14:28:50.253569000 +0200
-@@ -1,6 +1,8 @@
--CFLAGS=-Wall
-+CFLAGS=-Wall $(OPTFLAGS)
-+
-+OPTFLAGS=-O2
- 
- all: dm io-latency-test
- 
- io-latency-test: io-latency-test.c
- 	$(CC) -pthread -o $@ $^
---- drbd-8.2.5.orig/user/Makefile	2007-10-09 16:13:11.000000000 +0200
-+++ drbd-8.2.5/user/Makefile	2008-04-15 14:28:29.595246000 +0200
-@@ -18,11 +18,12 @@
- #
- 
- KDIR := /lib/modules/$(shell uname -r)/build
- 
- CC = gcc
--CFLAGS = -g -O2 -c -W -Wall -I../drbd
-+OPTFLAGS = -O2
-+CFLAGS = -g $(OPTFLAGS) -c -W -Wall -I../drbd
- # for the netlink connector stuff <linux/connector.h>:
- drbdsetup: CFLAGS += -I$(KDIR)/include
- drbdsetup drbdmeta: CFLAGS += -fno-strict-aliasing
- 
- drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \
diff --git a/drbd.changes b/drbd.changes
index 06bcf73..c9e5b22 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Dec 10 13:30:00 CET 2008 - lmb@suse.de
+
+- Update with changes from 8a9ba53abe973301639beacc55eec569b43507e5:
+- Fix buffer overflow and off-by-one errors in drbd user-space token
+  parser (bnc#450883).
+- Fix resizing of devices.
+- Fix a NULL pointer dereference in barrier handling.
+- Handle failing request better.
+- Race in UUID synchronization.
+- Fix a call to a blocking function from within a spinlock.
+- drbd-optflags.patch: removed, is now upstream.
+
 -------------------------------------------------------------------
 Fri Nov 21 14:00:00 CET 2008 - lmb@suse.de
 
diff --git a/drbd.spec b/drbd.spec
index a244f1d..75ee81a 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -24,9 +24,8 @@ BuildRequires:  xen-tools
 %endif
 Summary:        Distributed Replicated Block Device
 Version:        8.2.7
-Release:        1
+Release:        2
 Source:         %{name}-%{version}.tar.bz2
-Patch0:         drbd-optflags.patch
 License:        GPL v2 or later
 Group:          Productivity/Clustering/HA
 Provides:       drbdsetup drbd-control
@@ -66,7 +65,6 @@ Authors:
 
 %prep
 %setup -n %{name}-%{version}
-%patch0 -p1
 mkdir source
 cp -a drbd/. source/. || :
 cp source/Makefile-2.6 source/Makefile
@@ -159,6 +157,16 @@ rm -rf "$RPM_BUILD_ROOT"
 %doc scripts/drbd.conf
 
 %changelog
+* Wed Dec 10 2008 lmb@suse.de
+- Update with changes from 8a9ba53abe973301639beacc55eec569b43507e5:
+- Fix buffer overflow and off-by-one errors in drbd user-space token
+  parser (bnc#450883).
+- Fix resizing of devices.
+- Fix a NULL pointer dereference in barrier handling.
+- Handle failing request better.
+- Race in UUID synchronization.
+- Fix a call to a blocking function from within a spinlock.
+- drbd-optflags.patch: removed, is now upstream.
 * Fri Nov 21 2008 lmb@suse.de
 - Update from 8.2.7-rc1 to 8.2.7 proper.
 - Endianness fixes.