[mig] 14/15: New upstream snapshot

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository mig.

commit d10f5d50d1756ef8bfda6c9e3c326d93d21dba19
Author: Samuel Thibault <address@hidden>
Date:   Sat Sep 28 10:22:03 2013 +0000

    New upstream snapshot
---
 debian/changelog                    |    9 +++++++--
 debian/patches/format-string.patch  |   17 -----------------
 debian/patches/no_dealloc_ool.patch |   34 ----------------------------------
 debian/patches/series               |    2 --
 4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b805cd9..a295ef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,9 @@
-mig (1.3.1.99.git20120630-2) UNRELEASED; urgency=low
+mig (1.4-1) unstable; urgency=low
+
+  [ Samuel Thibault ]
+  * New upstream release.
+  * patches/{format-string.patch,no_dealloc_ool.patch}: Remove patches, merged
+    upstream.
 
   [ Pino Toscano ]
   * Bump the debhelper compatibility to 9:
@@ -15,7 +20,7 @@ mig (1.3.1.99.git20120630-2) UNRELEASED; urgency=low
   * Fix Homepage. (Closes: #561714)
   * format-string.patch: add DEP3 headers.
 
- -- GNU Hurd Maintainers <address@hidden>  Wed, 27 Feb 2013 12:45:39 +0100
+ -- Samuel Thibault <address@hidden>  Sat, 28 Sep 2013 10:18:08 +0000
 
 mig (1.3.1.99.git20120630-1) unstable; urgency=low
 
diff --git a/debian/patches/format-string.patch 
b/debian/patches/format-string.patch
deleted file mode 100644
index 4b085a0..0000000
--- a/debian/patches/format-string.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Guillem Jover <address@hidden>
-Description: Fix format string build failure with _FORTIFY_SOURCE=2
- .
- Use a format string instead of directly passing the argument to error.
-Applied-Upstream: commit:7d6e8f1a4718e70724a3bdeb3dc3ad4c1e3897d7
-
---- a/parser.y
-+++ b/parser.y
-@@ -131,7 +131,7 @@ static const char *import_name(statement
- void
- yyerror(const char *s)
- {
--    error(s);
-+    error("%s", s);
- }
- %}
- 
diff --git a/debian/patches/no_dealloc_ool.patch 
b/debian/patches/no_dealloc_ool.patch
deleted file mode 100644
index d573c4d..0000000
--- a/debian/patches/no_dealloc_ool.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-2006-04-09  Olaf Buddenhagen  <address@hidden>
-
-       * server.c (WriteDestroyArg): Only dealloc out-of-line memory from
-       request message if KERN_SUCCESS.
-
-
-Index: b/server.c
-===================================================================
---- a/server.c
-+++ b/server.c
-@@ -761,16 +761,21 @@ WriteDestroyArg(FILE *file, register con
-     if (akCheck(arg->argKind, akbIndefinite)) {
-       /*
-        * Deallocate only if out-of-line.
-+       *
-+       * Also skip deallocation if error occured in processing the RPC.
-+       * (Generic RPC handling code will clean up in this case)
-        */
-       argument_t *count = arg->argCount;
-       ipc_type_t *btype = it->itElement;
-       int     multiplier = btype->itTypeSize / btype->itNumber;
- 
--      fprintf(file, "\tif (!In%dP->%s%s.msgt_inline)\n",
-+      fprintf(file, "\tif (OutP->%s == KERN_SUCCESS)\n",
-+              arg->argRoutine->rtRetCode->argMsgField);
-+      fprintf(file, "\t\tif (!In%dP->%s%s.msgt_inline)\n",
-               arg->argRequestPos,
-               arg->argTTName,
-               arg->argLongForm ? ".msgtl_header" : "");
--      fprintf(file, "\t\t%smig_deallocate(* (vm_offset_t *) %s, ",
-+      fprintf(file, "\t\t\t%smig_deallocate(* (vm_offset_t *) %s, ",
-               SubrPrefix, InArgMsgField(arg));
-       if (multiplier > 1)
-           fprintf(file, "%d * ", multiplier);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9334ed6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-format-string.patch
-no_dealloc_ool.patch

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