[libdumb] 04/06: Remove all old patches.

Tobias Hansen thansen at moszumanska.debian.org
Sun Sep 3 15:31:45 UTC 2017


This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository libdumb.

commit f291bdeffe93b86731a17c3db7f528d9c367ea52
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Sep 3 00:04:46 2017 +0100

    Remove all old patches.
---
 debian/changelog                      |  5 +++++
 debian/patches/010_extra_flags.diff   | 13 -------------
 debian/patches/100_CVE-2006-3668.diff | 16 ----------------
 debian/patches/110-hardening.diff     | 18 ------------------
 debian/patches/series                 |  3 ---
 5 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0c6eec..693c919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ libdumb (1:1.0+git20170718-1) UNRELEASED; urgency=medium
 
   * New upstream version (Closes: #799008).
   * New upstream author (project was abandoned).
+  * Remove patches:
+    - 010_extra_flags.diff and 110-hardening.diff:
+      Build system moved to CMake.
+    - 100_CVE-2006-3668.diff:
+      Applied upstream.
 
  -- Tobias Hansen <thansen at debian.org>  Sat, 02 Sep 2017 23:58:15 +0100
 
diff --git a/debian/patches/010_extra_flags.diff b/debian/patches/010_extra_flags.diff
deleted file mode 100644
index 918cd7a..0000000
--- a/debian/patches/010_extra_flags.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- libdumb-0.9.3.orig/Makefile
-+++ libdumb-0.9.3/Makefile
-@@ -231,8 +231,8 @@
- endif
- endif
- 
--CFLAGS_RELEASE := -Iinclude $(WFLAGS) $(OFLAGS)
--CFLAGS_DEBUG := -Iinclude $(WFLAGS) $(DBGFLAGS)
-+CFLAGS_RELEASE := -Iinclude $(WFLAGS) $(OFLAGS) $(CFLAGS_EXTRA)
-+CFLAGS_DEBUG := -Iinclude $(WFLAGS) $(DBGFLAGS) $(CFLAGS_EXTRA)
- 
- LDFLAGS := -s
- 
diff --git a/debian/patches/100_CVE-2006-3668.diff b/debian/patches/100_CVE-2006-3668.diff
deleted file mode 100644
index 09d2fb6..0000000
--- a/debian/patches/100_CVE-2006-3668.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libdumb-0.9.3/src/it/itread.c
-===================================================================
---- libdumb-0.9.3.orig/src/it/itread.c	2006-07-21 11:05:48.000000000 +0200
-+++ libdumb-0.9.3/src/it/itread.c	2006-07-21 11:07:22.000000000 +0200
-@@ -292,6 +292,11 @@
- 
- 	envelope->flags = dumbfile_getc(f);
- 	envelope->n_nodes = dumbfile_getc(f);
-+	if(envelope->n_nodes > 25) {
-+		TRACE("IT error: wrong number of envelope nodes (%d)\n", envelope->n_nodes);
-+		envelope->n_nodes = 0;
-+		return -1;
-+	}
- 	envelope->loop_start = dumbfile_getc(f);
- 	envelope->loop_end = dumbfile_getc(f);
- 	envelope->sus_loop_start = dumbfile_getc(f);
diff --git a/debian/patches/110-hardening.diff b/debian/patches/110-hardening.diff
deleted file mode 100644
index 200c123..0000000
--- a/debian/patches/110-hardening.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -aur libdumb-0.9.3.orig/Makefile libdumb-0.9.3/Makefile
---- libdumb-0.9.3.orig/Makefile	2012-02-06 23:51:26.000000000 +0100
-+++ libdumb-0.9.3/Makefile	2012-02-06 23:52:17.000000000 +0100
-@@ -231,10 +231,10 @@
- endif
- endif
- 
--CFLAGS_RELEASE := -Iinclude $(WFLAGS) $(OFLAGS) $(CFLAGS_EXTRA)
--CFLAGS_DEBUG := -Iinclude $(WFLAGS) $(DBGFLAGS) $(CFLAGS_EXTRA)
-+CFLAGS_RELEASE := -Iinclude $(WFLAGS) $(OFLAGS) $(CFLAGS_EXTRA) `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
-+CFLAGS_DEBUG := -Iinclude $(WFLAGS) $(DBGFLAGS) $(CFLAGS_EXTRA) `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
- 
--LDFLAGS := -s
-+LDFLAGS := -s `dpkg-buildflags --get LDFLAGS`
- 
- 
- CORE_EXAMPLES_OBJ := $(addprefix examples/, $(notdir $(patsubst %.c, %.o, $(CORE_EXAMPLES))))
-Nur in libdumb-0.9.3: Makefile~.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f0eb27b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-010_extra_flags.diff -p1
-100_CVE-2006-3668.diff
-110-hardening.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libdumb.git



More information about the Pkg-games-commits mailing list