[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[mig] 02/02: Merge tag 'upstream/1.5'
|
From: |
Samuel Thibault |
|
Subject: |
[mig] 02/02: Merge tag 'upstream/1.5' |
|
Date: |
Fri, 17 Apr 2015 02:00:56 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository mig.
commit c561b9be94a49a9c590f3767d39c17b0c9aaa901
Merge: c9c1b2d a1120f7
Author: Samuel Thibault <address@hidden>
Date: Thu Apr 16 23:35:07 2015 +0000
Merge tag 'upstream/1.5'
Upstream version 1.5
ChangeLog | 141 +++
INSTALL | 4 +-
Makefile.am | 2 +-
Makefile.in | 24 +-
NEWS | 40 +-
aclocal.m4 | 128 +-
build-aux/compile | 347 +++++
build-aux/config.guess | 192 +--
build-aux/config.sub | 30 +-
build-aux/missing | 4 +-
build-aux/ylwrap | 26 +-
configure | 133 +-
configure.ac | 8 +-
debian/changelog | 9 +
debian/patches/git-R-type-punned.patch | 153 +++
debian/patches/git-c-strings.patch | 48 -
debian/patches/git-generate-inlines.patch | 127 --
debian/patches/git-protected-payload.patch | 231 ----
debian/patches/series | 4 +-
global.c | 1 +
global.h | 1 +
header.c | 11 +
lexxer.c | 1064 ++++++++--------
lexxer.l | 4 +
parser.c | 1900 +++++++++++++---------------
parser.h | 1 +
parser.y | 17 +
routine.c | 4 +-
server.c | 148 ++-
type.c | 10 +-
type.h | 2 +
user.c | 41 +-
utils.c | 17 +-
write.h | 1 +
34 files changed, 2609 insertions(+), 2264 deletions(-)
diff --cc debian/changelog
index 021e4c1,0000000..f71b9ed
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,209 -1,0 +1,218 @@@
++mig (1.5-1) unstable; urgency=medium
++
++ * New upstream release
++ * patches/git-R-type-punned.patch: Revert upstream patch to avoid breaking
++ gdb build for now.
++ * patches/git-{c-strings,generate-inlines,protected-payload}.patch: Removed.
++
++ -- Samuel Thibault <address@hidden> Thu, 16 Apr 2015 23:35:12 +0000
++
+mig (1.4-3) unstable; urgency=medium
+
+ [ Samuel Thibault ]
+ * patches/git-c-strings.patch: Upstream patch to fix variable-sized c
+ strings.
+ * patches/git-protected-payload.patch: Upstream patch to add protected
payload
+ support.
+
+ [ Guillem Jover ]
+ * Remove myself from Uploaders.
+
+ -- Samuel Thibault <address@hidden> Sun, 09 Nov 2014 15:14:41 +0000
+
+mig (1.4-2) unstable; urgency=medium
+
+ * patches/generate-inlines.patch: Upstream patch to inline demuxers.
+
+ -- Samuel Thibault <address@hidden> Mon, 03 Feb 2014 23:14:00 +0000
+
+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:
+ - Bump compat to 9.
+ - Bump the debhelper build dependency to >= 9.
+ * Rewrite rules making use of the sequential `dh'.
+ * Run autoreconf before build, since the upstream snapshot from Git has
+ no autogenerated autotools files:
+ - Use the autoreconf dh addon, and build depend on dh-autoreconf for it.
+ - Clean the build-aux directory.
+ * Fix Vcs-* keys to point to anonscm.debian.org.
+ * Fix Homepage. (Closes: #561714)
+ * format-string.patch: add DEP3 headers.
+
+ -- Samuel Thibault <address@hidden> Sat, 28 Sep 2013 10:18:08 +0000
+
+mig (1.3.1.99.git20120630-1) unstable; urgency=low
+
+ * New git snapshot.
+
+ [ Guillem Jover ]
+ * Switch to debhelper compatibility level 7.
+ * Use dh_prep instead of “dh_clean -k”.
+ * Use $(filter ...) instead of $(findstring ...) to extract space separated
+ options from DEB_BUILD_OPTIONS in debian/rules.
+ * Now using Standards-Version 3.9.3.
+ * Switch to source format “3.0 (quilt)”:
+ - Remove quilt from Build-Depends.
+ - Remove quilt.make include from debian/rules.
+ - Remove patch and unpatch targets from debian/rules.
+ - Remove now unneeded debian/README.source.
+ * Remove Marcus Brinkmann, Jeff Bailey and Neal H. Walfield from Uploaders.
+ Closes: #503569
+ * Use any-i386 in binary package Architecture fields.
+ * Update Vcs fields to point to the new git repositories.
+ * Remove duplicate Section and Priority fields in the binary stanza
+ inherited from the source stanza.
+ * Add build-indep and build-arch targets and rename install target to
+ install-arch in debian/rules.
+ * Pass CFLAGS correctly to $(MAKE), instead of passing them as CCOPTIONS.
+ * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS.
+ * Fix a format string build failure in error() function. Add bison to
+ Build-Depends as the patch touches parser.y.
+
+ [ Samuel Thibault ]
+ * Add Multi-Arch: foreign to allow installing the 32bit version on a 64bit
+ system.
+ * Add myself as uploader.
+ * Add misc:Depends dependency.
+
+ -- Guillem Jover <address@hidden> Sat, 30 Jun 2012 17:52:09 +0200
+
+mig (1.3.1.99-2) unstable; urgency=low
+
+ * Add Homepage field.
+ * Add Vcs-Browser and Vcs-Svn fields.
+ * Add a debian/README.source file.
+ * Now using Standards-Version 3.8.0.
+ * Refresh patches with -pab.
+ * Improve debian/copyright:
+ - Refer to GPL-2 from common-licenses instead of just GPL.
+ - Fix GPL snippet in debian/copyright to refer to "version 2 or later".
+ - Remove repository information from as it is now on debian/control.
+ * Line wrap Uploaders field.
+
+ -- Guillem Jover <address@hidden> Sun, 22 Jun 2008 08:08:44 +0300
+
+mig (1.3.1.99-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/args_space.patch: Remove, merged upstream.
+ - debian/patches/arg_isystem.patch: Likewise.
+ - debian/patches/robust_close.patch: Likewise.
+
+ -- Guillem Jover <address@hidden> Thu, 14 Dec 2006 08:25:06 +0200
+
+mig (1.3.1-2) unstable; urgency=low
+
+ * Switched to quilt:
+ - Add new debian/patches/series file.
+ - Add Build-Depends on 'quilt (>= 0.40)'.
+ - Include quilt.make from debian/rules.
+ - Switch clean from a double colon target to single colon.
+ - Make clean depend on unpatch.
+ - Remove now unused debian/patch.mk.
+ * Cleaned debian/rules file:
+ - Remove the all target.
+ - Do not use stamp files for the build target.
+ - Move the installation logic from binary-arch to an install target.
+ - Remove the manual cruft-removal line from the clean target.
+ - Use DESTDIR instead of specifiying again all patch at install time.
+ - Reindent the configure arguments.
+ * Do not deallocate the out-of-line memory if the request didn't succeed.
+ - debian/patches/no_dealloc_ool.patch: New file.
+ Thanks to Olaf Buddenhagen <address@hidden>.
+ * Switch to debhelper compat level 5.
+ * Now using Standards-Version 3.7.2 (no changes needed).
+ * Use ascii single quotes in the manpage.
+
+ -- Guillem Jover <address@hidden> Mon, 13 Nov 2006 06:30:18 +0200
+
+mig (1.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/types.patch: Integrated upstream. Removed.
+ * Added a watch file.
+ * Added a manpage for mig.
+ * Cleaned debian/copyright file:
+ - Update FSF address.
+ - Updated upstream download address.
+ - Change references to Debian to be system neutral.
+ - Added initial date of packaging.
+ - Added Debian subversion packaging repository.
+ - Remove C style comments from license statements and reindent.
+ * Now using Standards-Version 3.6.2 (no changes needed).
+
+ -- Guillem Jover <address@hidden> Thu, 17 Nov 2005 03:32:43 +0200
+
+mig (1.3-4) unstable; urgency=low
+
+ * Support -isystem properly.
+ Thanks to Thomas Schwinge <address@hidden>.
+ * Support spaces in arguments.
+ Thanks to Thomas Schwinge <address@hidden>.
+
+ -- Guillem Jover <address@hidden> Thu, 2 Jun 2005 23:17:42 +0300
+
+mig (1.3-3) unstable; urgency=low
+
+ * Changed Maintainer address.
+ * Added former implicit maintainers to Uploaders.
+ * Added myself to Uploaders.
+ * Split patches into debian/patches.
+ * Make closing files more robust.
+ - debian/patches/robust_close.patch: New file.
+ Thanks to Ognyan Kulev <address@hidden>.
+ * Added gnumach-dev and flex to Build-Depends. (Closes: #246254)
+ Thanks Magnus Ekdahl <address@hidden>.
+ * Enable i386, kfreebsd-i386 and knetbsd-i386 architectures.
+ * Switched to debhelper.
+ * Now using Standards-Version 3.6.1.
+
+ -- Guillem Jover <address@hidden> Mon, 25 Oct 2004 08:50:56 +0200
+
+mig (1.3-2) unstable; urgency=low
+
+ * New CVS snapshot.
+ * debian/control: Add Uploaders.
+
+ -- Marcus Brinkmann <address@hidden> Mon, 5 Aug 2002 00:13:00 +0200
+
+mig (1.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: Bump standards version.
+ Update description.
+ * debian/README: Update description.
+
+ -- Marcus Brinkmann <address@hidden> Thu, 7 Mar 2002 21:55:43 +0100
+
+mig (1.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Marcus Brinkmann <address@hidden> Fri, 8 Jun 2001 18:18:53 +0200
+
+mig (1.1-1) unstable; urgency=low
+
+ * CVS snapshot from new upstream release.
+
+ -- Marcus Brinkmann <address@hidden> Tue, 4 Jul 2000 21:58:26 +0200
+
+mig (1.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Marcus Brinkmann <address@hidden> Mon, 24 May 1999 01:29:26 +0200
+
+mig (1.0.1-1) unstable; urgency=low
+
+ * Initial Release.
+ * Added patch by Roland McGrath to have CC or CPP set.
+
+ -- Marcus Brinkmann <address@hidden> Mon, 19 Apr 1999 00:42:10 +0200
diff --cc debian/patches/git-R-type-punned.patch
index 0000000,0000000..106ff9b
new file mode 100644
--- /dev/null
+++ b/debian/patches/git-R-type-punned.patch
@@@ -1,0 -1,0 +1,153 @@@
++commit 44753cf5a30b9324d2c4ac9021843674bde5cc3c
++Author: Justus Winter <address@hidden>
++Date: Sun Feb 15 13:29:30 2015 +0100
++
++ Do not generate code dereferencing type-punned pointers
++
++ For variable-length arrays, up to 2048 bytes are transmitted inline.
++ If the array is larger, the data is transmitted out-of-line, and a
++ pointer to a vm_allocated region is stored at the beginning of the
++ array.
++
++ Previously, the generated code casted the field. Use a union instead.
++
++ This fixes the gcc warning `dereferencing type-punned pointer will
++ break strict-aliasing rules [-Wstrict-aliasing]'.
++
++ * global.c (OOLPostfix): New variable.
++ * global.h (OOLPostfix): New declaration.
++ * server.c (WriteServerCallArg): Avoid cast.
++ (WriteDestroyArg): Likewise.
++ (WritePackArgValue): Likewise.
++ (WritePackArg): Likewise.
++ * user.c (WriteExtractArgValue): Likewise.
++ * utils.c (WriteFieldDeclPrim): Generate a union with an additional
++ pointer field for variable-length arrays.
++
++diff --git b/global.c a/global.c
++index 5685186..0a938f2 100644
++--- b/global.c
+++++ a/global.c
++@@ -48,7 +48,6 @@ const_string_t UserPrefix = "";
++ const_string_t ServerDemux = strNULL;
++ const_string_t SubrPrefix = "";
++ const_string_t RoutinePrefix = "";
++-const_string_t OOLPostfix = "P";
++
++ string_t yyinname;
++
++diff --git b/global.h a/global.h
++index 8dbb6fd..ca4d865 100644
++--- b/global.h
+++++ a/global.h
++@@ -53,7 +53,6 @@ extern const_string_t UserPrefix;
++ extern const_string_t ServerDemux;
++ extern const_string_t SubrPrefix;
++ extern const_string_t RoutinePrefix;
++-extern const_string_t OOLPostfix;
++
++ extern int yylineno;
++ extern string_t yyinname;
++diff --git b/server.c a/server.c
++index 15fc128..56ccfc7 100644
++--- b/server.c
+++++ a/server.c
++@@ -777,9 +777,9 @@ WriteServerCallArg(FILE *file, const argument_t *arg)
++ arg->argTTName,
++ arg->argLongForm ? ".msgtl_header" : "");
++ fprintf(file, "? %s ", InArgMsgField(arg));
++- fprintf(file, ": %s%s",
++- InArgMsgField(arg),
++- OOLPostfix);
+++ fprintf(file, ": *((%s **)%s)",
+++ FetchServerType(arg->argType->itElement),
+++ InArgMsgField(arg));
++ }
++ else
++ fprintf(file, "%s", InArgMsgField(arg));
++@@ -816,8 +816,8 @@ WriteDestroyArg(FILE *file, const argument_t *arg)
++ arg->argRequestPos,
++ arg->argTTName,
++ arg->argLongForm ? ".msgtl_header" : "");
++- fprintf(file, "\t\t\t%smig_deallocate((vm_offset_t) %s%s, ",
++- SubrPrefix, InArgMsgField(arg), OOLPostfix);
+++ fprintf(file, "\t\t\t%smig_deallocate(* (vm_offset_t *) %s, ",
+++ SubrPrefix, InArgMsgField(arg));
++ if (multiplier > 1)
++ fprintf(file, "%d * ", multiplier);
++ fprintf(file, " %s);\n", InArgMsgField(count));
++@@ -978,9 +978,9 @@ WritePackArgValue(FILE *file, const argument_t *arg)
++ arg->argTTName,
++ arg->argLongForm ? ".msgtl_header" : "",
++ arg->argDealloc->argVarName);
++- fprintf(file, "\t\tOutP->%s%s = %sP;\n",
+++ fprintf(file, "\t\t*((%s **)OutP->%s) = %sP;\n",
+++ FetchServerType(btype),
++ arg->argMsgField,
++- OOLPostfix,
++ arg->argVarName);
++ if (!arg->argRoutine->rtSimpleFixedReply)
++ fprintf(file, "\t\tmsgh_simple = FALSE;\n");
++@@ -1203,9 +1203,9 @@ WritePackArg(FILE *file, const argument_t *arg)
++ arg->argTTName,
++ arg->argLongForm ? ".msgtl_header" : "",
++ arg->argDealloc->argVarName);
++- fprintf(file, "\t\tOutP->%s%s = %sP;\n",
+++ fprintf(file, "\t\t*((%s **)OutP->%s) = %sP;\n",
+++ FetchServerType(it->itElement),
++ arg->argMsgField,
++- OOLPostfix,
++ arg->argVarName);
++ if (!arg->argRoutine->rtSimpleFixedReply)
++ fprintf(file, "\t\tmsgh_simple = FALSE;\n");
++diff --git b/user.c a/user.c
++index 1f3ba3d..5451a03 100644
++--- b/user.c
+++++ a/user.c
++@@ -447,9 +447,9 @@ WritePackArgValue(FILE *file, const argument_t *arg)
++ arg->argLongForm ? ".msgtl_header" : "",
++ arg->argDealloc->argByReferenceUser ? "*" : "",
++ arg->argDealloc->argVarName);
++- fprintf(file, "\t\tInP->%s%s = %s%s;\n",
+++ fprintf(file, "\t\t*((%s **)InP->%s) = %s%s;\n",
+++ FetchUserType(btype),
++ arg->argMsgField,
++- OOLPostfix,
++ ref, arg->argVarName);
++ if (!arg->argRoutine->rtSimpleFixedRequest)
++ fprintf(file, "\t\tmsgh_simple = FALSE;\n");
++@@ -951,10 +951,9 @@ WriteExtractArgValue(FILE *file, const argument_t *arg)
++ fprintf(file, "\tif (!OutP->%s%s.msgt_inline)\n",
++ arg->argTTName,
++ arg->argLongForm ? ".msgtl_header" : "");
++- fprintf(file, "\t %s%s = OutP->%s%s;\n",
+++ fprintf(file, "\t %s%s = *((%s **)OutP->%s);\n",
++ ref, arg->argVarName,
++- arg->argMsgField,
++- OOLPostfix);
+++ FetchUserType(btype), arg->argMsgField);
++ fprintf(file, "\telse if (OutP->%s", count->argMsgField);
++ if (btype->itNumber > 1)
++ fprintf(file, " / %d", btype->itNumber);
++diff --git b/utils.c a/utils.c
++index 4c2a87b..396e743 100644
++--- b/utils.c
+++++ a/utils.c
++@@ -239,16 +239,10 @@ WriteFieldDeclPrim(FILE *file, const argument_t *arg,
++ * use the element type and maximum size specified.
++ * Note arg->argCount->argMultiplier == btype->itNumber.
++ */
++- fprintf(file, "\t\tunion {\n");
++- fprintf(file, "\t\t\t%s %s[%d];\n",
+++ fprintf(file, "\t\t%s %s[%d];",
++ (*tfunc)(btype),
++ arg->argMsgField,
++ it->itNumber/btype->itNumber);
++- fprintf(file, "\t\t\t%s *%s%s;\n",
++- (*tfunc)(btype),
++- arg->argMsgField,
++- OOLPostfix);
++- fprintf(file, "\t\t};");
++ }
++ else
++ fprintf(file, "\t\t%s %s;", (*tfunc)(it), arg->argMsgField);
diff --cc debian/patches/series
index 74ce9b1,0000000..e5e4f95
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- git-generate-inlines.patch
- git-c-strings.patch
- git-protected-payload.patch
++git-R-type-punned.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/mig.git