[Pkg-virtualbox-commits] [kbuild] 03/05: Patch refresh, new upstream release

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Thu Dec 4 10:17:31 UTC 2014 

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

locutusofborg-guest pushed a commit to branch experimental
in repository kbuild.

commit 4c9286ddf4b409bc3f4016f32cadcb7aab54e785
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Nov 13 18:03:39 2014 +0100

    Patch refresh, new upstream release
---
 debian/changelog                                   |  4 +-
 debian/patches/01_gnukfreebsd.diff                 | 65 ++++++----------------
 debian/patches/02_sh4.diff                         |  8 +--
 debian/patches/03_dprintf-posix2008.diff           | 37 ------------
 debian/patches/04_armv7l.diff                      |  2 +-
 debian/patches/05_hppa-disable-threads.diff        |  2 +-
 debian/patches/06_binutils-gold.diff               |  2 +-
 debian/patches/08_no_o3_optimization.diff          |  2 +-
 ...ord_files_SV_33034_Changes_fatal_to_error.patch |  2 +-
 debian/patches/series                              |  1 -
 10 files changed, 28 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c01049b..cf1c88a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-kbuild (1:0.1.9998svn2695+dfsg-3) UNRELEASED; urgency=medium
+kbuild (1:0.1.9998svn2734+dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot, patch refresh.
+    - drop 03_dprintf-posix2008.diff code removed upstream.
   * Add myself to uploaders.
   * Bump Standards-Version to 3.9.6, no changes needed.
   [ Fernando Seiti Furusato ]
diff --git a/debian/patches/01_gnukfreebsd.diff b/debian/patches/01_gnukfreebsd.diff
index 600f891..b8b8cfc 100644
--- a/debian/patches/01_gnukfreebsd.diff
+++ b/debian/patches/01_gnukfreebsd.diff
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/540665
 
 --- a/src/kmk/dir.c
 +++ b/src/kmk/dir.c
-@@ -42,7 +42,7 @@ char *vmsify (char *name, int type);
+@@ -43,7 +43,7 @@ char *vmsify (char *name, int type);
  # endif /* HAVE_VMSDIR_H */
  #endif
  /* bird: FreeBSD + smbfs -> readdir() + EBADF */
@@ -15,7 +15,7 @@ Bug-Debian: http://bugs.debian.org/540665
  # include <sys/mount.h>
  #endif
  /* bird: end */
-@@ -783,7 +783,7 @@ dir_contents_file_exists_p (struct direc
+@@ -814,7 +814,7 @@ dir_contents_file_exists_p (struct direc
           To exactly determin the cause here, I should probably do some smbfs
           tracing, but for now just ignoring the EBADF on seems to work.
           (The smb server is 64-bit vista, btw.) */
@@ -26,7 +26,7 @@ Bug-Debian: http://bugs.debian.org/540665
            errno = 0;
 --- a/src/kmk/incdep.c
 +++ b/src/kmk/incdep.c
-@@ -606,7 +606,7 @@ incdep_are_threads_enabled (void)
+@@ -602,7 +602,7 @@ incdep_are_threads_enabled (void)
    if (getenv ("KMK_THREADS_ENABLED"))
      return 1;
  
@@ -70,7 +70,7 @@ Bug-Debian: http://bugs.debian.org/540665
  # ifdef __OS2__
 --- a/src/kmk/make.h
 +++ b/src/kmk/make.h
-@@ -218,7 +218,7 @@ extern unsigned long make_stats_ht_colli
+@@ -215,7 +215,7 @@ extern unsigned long make_stats_ht_colli
  #  include <malloc/malloc.h>
  #  define SIZE_OF_HEAP_BLOCK(ptr)   malloc_good_size(ptr)
  
@@ -81,7 +81,7 @@ Bug-Debian: http://bugs.debian.org/540665
  
 --- a/src/lib/k/kDefs.h
 +++ b/src/lib/k/kDefs.h
-@@ -56,8 +56,10 @@
+@@ -58,8 +58,10 @@
  #define K_OS_SOLARIS    10
  /** Windows. */
  #define K_OS_WINDOWS    11
@@ -93,7 +93,7 @@ Bug-Debian: http://bugs.debian.org/540665
  /** @} */
  
  /** @def K_OS
-@@ -78,6 +80,8 @@
+@@ -80,6 +82,8 @@
  #  define K_OS      K_OS_DRAGONFLY
  # elif defined(__FreeBSD__) /*??*/
  #  define K_OS      K_OS_FREEBSD
@@ -104,7 +104,7 @@ Bug-Debian: http://bugs.debian.org/540665
  # elif defined(__gnu_linux__)
 --- a/Config.kmk
 +++ b/Config.kmk
-@@ -111,6 +111,7 @@ endif
+@@ -119,6 +119,7 @@ endif
  #
  DEFS.darwin  += KBUILD_OS_DARWIN
  DEFS.freebsd += KBUILD_OS_FREEBSD
@@ -112,7 +112,7 @@ Bug-Debian: http://bugs.debian.org/540665
  DEFS.linux   += KBUILD_OS_LINUX
  DEFS.netbsd  += KBUILD_OS_NETBSD
  DEFS.openbsd += KBUILD_OS_OPENBSD
-@@ -287,7 +288,7 @@ endif
+@@ -304,7 +305,7 @@ endif
  
  ifndef TEMPLATE_BIN_TOOL
   # Use GCC3 when we're certain that the system is using GNU ld and ar.
@@ -145,7 +145,7 @@ Bug-Debian: http://bugs.debian.org/540665
  KBUILD_ARCHES    := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha
  KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
  KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
-@@ -551,7 +551,7 @@ else ifeq ($(KBUILD_HOST),os2)
+@@ -565,7 +565,7 @@ else ifeq ($(KBUILD_HOST),os2)
  EXEC_X86_WIN32      := innopec.exe
  HOSTSUFF_EXE        := .exe
  
@@ -154,7 +154,7 @@ Bug-Debian: http://bugs.debian.org/540665
  # Unix (like) systems with wine.
  EXEC_X86_WIN32      := wine
  HOSTSUFF_EXE        :=
-@@ -595,7 +595,7 @@ SUFF_OBJ    := .o
+@@ -609,7 +609,7 @@ SUFF_OBJ    := .o
  SUFF_LIB    := .a
  SUFF_DLL    := .so
  SUFF_EXE    :=
@@ -203,31 +203,9 @@ Bug-Debian: http://bugs.debian.org/540665
  TOOL_GXX64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
  ifeq ($(KBUILD_TARGET),os2)
  TOOL_GXX64_LD_MAP ?= -Zmap=$(1)
---- a/src/ash/Makefile.kmk
-+++ b/src/ash/Makefile.kmk
-@@ -45,6 +45,8 @@ kmk_ash_DEFS.darwin = \
- 	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
- kmk_ash_DEFS.dragonfly = \
- 	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
-+kmk_ash_DEFS.gnukfreebsd = \
-+	HAVE_SYSCTL_H
- kmk_ash_DEFS.freebsd = \
- 	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
- kmk_ash_DEFS.openbsd = \
-@@ -81,6 +83,10 @@ kmk_ash_SOURCES = \
- 	$(kmk_ash_0_OUTDIR)/builtins.c \
- 	$(kmk_ash_0_OUTDIR)/init.c \
- 	$(kmk_ash_0_OUTDIR)/nodes.c
-+kmk_ash_SOURCES.gnukfreebsd = \
-+	sys_signame.c \
-+	strlcpy.c \
-+	setmode.c
- kmk_ash_SOURCES.linux = \
- 	sys_signame.c \
- 	strlcpy.c \
 --- a/src/kash/Makefile.kmk
 +++ b/src/kash/Makefile.kmk
-@@ -48,6 +48,8 @@ kash_DEFS.darwin = \
+@@ -50,6 +50,8 @@ kash_DEFS.darwin = \
  	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
  kash_DEFS.dragonfly = \
  	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
@@ -236,7 +214,7 @@ Bug-Debian: http://bugs.debian.org/540665
  kash_DEFS.freebsd = \
  	HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
  kash_DEFS.openbsd = \
-@@ -96,6 +98,9 @@ kash_SOURCES = \
+@@ -102,6 +104,9 @@ kash_SOURCES = \
  kash_SOURCES.haiku = \
  	sys_signame.c \
  	strlcpy.c
@@ -248,7 +226,7 @@ Bug-Debian: http://bugs.debian.org/540665
  	strlcpy.c
 --- a/src/kmk/kmkbuiltin/install.c
 +++ b/src/kmk/kmkbuiltin/install.c
-@@ -202,7 +202,8 @@ kmk_builtin_install(int argc, char *argv
+@@ -209,7 +209,8 @@ kmk_builtin_install(int argc, char *argv
  			dodir = 1;
  			break;
  		case 'f':
@@ -260,7 +238,7 @@ Bug-Debian: http://bugs.debian.org/540665
  				return errx(EX_USAGE, "%s: invalid flag", flags);
 --- a/src/kmk/kmkbuiltin/rm.c
 +++ b/src/kmk/kmkbuiltin/rm.c
-@@ -630,7 +630,8 @@ check(char *path, char *name, struct sta
+@@ -657,7 +657,8 @@ check(char *path, char *name, struct sta
                      )
  			return (1);
  		bsd_strmode(sp->st_mode, modep);
@@ -272,7 +250,7 @@ Bug-Debian: http://bugs.debian.org/540665
  		(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
 --- a/src/kmk/Makefile.kmk
 +++ b/src/kmk/Makefile.kmk
-@@ -101,6 +101,9 @@ kmkmissing_SOURCES.freebsd = \
+@@ -107,6 +107,9 @@ kmkmissing_SOURCES.freebsd = \
  	glob/glob.c \
  	glob/fnmatch.c
  
@@ -282,7 +260,7 @@ Bug-Debian: http://bugs.debian.org/540665
  kmkmissing_SOURCES.linux += \
  	kmkbuiltin/strlcpy.c
  
-@@ -224,6 +227,7 @@ kmk_SOURCES = \
+@@ -231,6 +234,7 @@ kmk_SOURCES = \
  	vpath.c \
  	remote-stub.c
  
@@ -302,14 +280,3 @@ Bug-Debian: http://bugs.debian.org/540665
    {
      struct timespec timespec;
      if (clock_gettime (CLOCK_REALTIME, &timespec) == 0)
---- a/src/ash/jobs.c
-+++ b/src/ash/jobs.c
-@@ -58,7 +58,7 @@ __RCSID("$NetBSD: jobs.c,v 1.63 2005/06/
- #endif
- #include <sys/types.h>
- #include <sys/param.h>
--#if defined(BSD) || defined(__sun__)
-+#if defined(BSD) || defined(__sun__) || defined(__FreeBSD_kernel__)
- #include <sys/wait.h>
- #include <sys/time.h>
- #include <sys/resource.h>
diff --git a/debian/patches/02_sh4.diff b/debian/patches/02_sh4.diff
index f4e989e..a74440f 100644
--- a/debian/patches/02_sh4.diff
+++ b/debian/patches/02_sh4.diff
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/544974
 
 --- a/kBuild/env.sh
 +++ b/kBuild/env.sh
-@@ -368,6 +368,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
+@@ -372,6 +372,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
          alpha)
              KBUILD_HOST_ARCH='alpha'
              ;;
@@ -30,7 +30,7 @@ Bug-Debian: http://bugs.debian.org/544974
  #
 --- a/src/lib/k/kDefs.h
 +++ b/src/lib/k/kDefs.h
-@@ -166,6 +166,8 @@
+@@ -170,6 +170,8 @@
  #define K_ARCH_SPARC_32         (17 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
  /** 64-bit SPARC. */
  #define K_ARCH_SPARC_64         (18 | K_ARCH_BIT_64 | K_ARCH_END_BI)
@@ -39,11 +39,11 @@ Bug-Debian: http://bugs.debian.org/544974
  /** The end of the valid architecture values (exclusive). */
  #define K_ARCH_MAX              (19)
  /** @} */
-@@ -206,6 +208,8 @@
+@@ -210,6 +212,8 @@
  #  define K_ARCH    K_ARCH_S390_64
  # elif defined(__s390__)
  #  define K_ARCH    K_ARCH_S390_32
-+# elif defined(__sh__) 
++# elif defined(__sh__)
 +#  define K_ARCH    K_ARCH_SH_32
  # else
  #  error "Port Me"
diff --git a/debian/patches/03_dprintf-posix2008.diff b/debian/patches/03_dprintf-posix2008.diff
deleted file mode 100644
index f01bf58..0000000
--- a/debian/patches/03_dprintf-posix2008.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: This dprintf() collides with POSIX.1-2008 dprintf()
- and is not used at all anyways.
- (Whoa! what a stupid name! standardized before invention of grep!)
-Author: Lubomir Rintel <lkundrak at v3.sk>
-Bug-Debian: http://bugs.debian.org/552843
-
---- a/src/ash/output.c
-+++ b/src/ash/output.c
-@@ -230,6 +230,7 @@ out1fmt(const char *fmt, ...)
- 	va_end(ap);
- }
- 
-+#if 0
- void
- dprintf(const char *fmt, ...)
- {
-@@ -240,6 +241,7 @@ dprintf(const char *fmt, ...)
- 	va_end(ap);
- 	flushout(out2);
- }
-+#endif
- 
- void
- fmtstr(char *outbuf, size_t length, const char *fmt, ...)
---- a/src/ash/output.h
-+++ b/src/ash/output.h
-@@ -65,8 +65,10 @@ void outfmt(struct output *, const char
-     __attribute__((__format__(__printf__,2,3)));
- void out1fmt(const char *, ...)
-     __attribute__((__format__(__printf__,1,2)));
-+#if 0
- void dprintf(const char *, ...)
-     __attribute__((__format__(__printf__,1,2)));
-+#endif
- void fmtstr(char *, size_t, const char *, ...)
-     __attribute__((__format__(__printf__,3,4)));
- void doformat(struct output *, const char *, va_list);
diff --git a/debian/patches/04_armv7l.diff b/debian/patches/04_armv7l.diff
index 00ca63c..cbf95c2 100644
--- a/debian/patches/04_armv7l.diff
+++ b/debian/patches/04_armv7l.diff
@@ -4,7 +4,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/535093
 
 --- a/kBuild/env.sh
 +++ b/kBuild/env.sh
-@@ -362,7 +362,7 @@ if test -z "$KBUILD_HOST_ARCH"; then
+@@ -366,7 +366,7 @@ if test -z "$KBUILD_HOST_ARCH"; then
          hppa64|parisc64)
              KBUILD_HOST_ARCH='hppa64'
              ;;
diff --git a/debian/patches/05_hppa-disable-threads.diff b/debian/patches/05_hppa-disable-threads.diff
index d7014b7..93c95dd 100644
--- a/debian/patches/05_hppa-disable-threads.diff
+++ b/debian/patches/05_hppa-disable-threads.diff
@@ -3,7 +3,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 
 --- a/src/kmk/Makefile.kmk
 +++ b/src/kmk/Makefile.kmk
-@@ -227,6 +227,9 @@ kmk_SOURCES = \
+@@ -234,6 +234,9 @@ kmk_SOURCES = \
  	vpath.c \
  	remote-stub.c
  
diff --git a/debian/patches/06_binutils-gold.diff b/debian/patches/06_binutils-gold.diff
index faa2f2e..f118979 100644
--- a/debian/patches/06_binutils-gold.diff
+++ b/debian/patches/06_binutils-gold.diff
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/554937
 
 --- a/src/kmk/Makefile.kmk
 +++ b/src/kmk/Makefile.kmk
-@@ -273,6 +273,12 @@ kmk_SOURCES += \
+@@ -280,6 +280,12 @@ kmk_SOURCES += \
  ##kmk_DEFS += KMK_PRF=1
  ##kmkmissing_DEFS += KMK_PRF=1
  
diff --git a/debian/patches/08_no_o3_optimization.diff b/debian/patches/08_no_o3_optimization.diff
index 316f421..6aa3d49 100644
--- a/debian/patches/08_no_o3_optimization.diff
+++ b/debian/patches/08_no_o3_optimization.diff
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/697892
 
 --- a/Config.kmk
 +++ b/Config.kmk
-@@ -299,8 +299,8 @@ ifndef TEMPLATE_BIN_TOOL
+@@ -317,8 +317,8 @@ ifndef TEMPLATE_BIN_TOOL
   endif
   TEMPLATE_BIN_LDFLAGS           = -g
   TEMPLATE_BIN_LDFLAGS.profile   = -pg -p
diff --git a/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch b/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
index f7c58d6..98257c9 100644
--- a/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
+++ b/debian/patches/09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
@@ -44,7 +44,7 @@ diff --git a/src/kmk/read.c b/src/kmk/read.c
 index ebc6a63..9a326bb 100644
 --- a/src/kmk/read.c
 +++ b/src/kmk/read.c
-@@ -2743,7 +2743,7 @@ l_next:
+@@ -2746,7 +2746,7 @@ l_next:
        /* Reduce escaped percents.  If there are any unescaped it's an error  */
        name = filenames->name;
        if (find_percent_cached (&name))
diff --git a/debian/patches/series b/debian/patches/series
index 16ee264..55bf67f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_gnukfreebsd.diff
 02_sh4.diff
-03_dprintf-posix2008.diff
 04_armv7l.diff
 05_hppa-disable-threads.diff
 06_binutils-gold.diff

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

More information about the Pkg-virtualbox-commits mailing list