Attachment 177854 Details for Bug 215197 – [patch] mark broken with fb9 + base ssl

[patch] [patch] mark broken with fb9 + base ssl

pr-p5cryptsmime-base9ssl.diff (text/plain), 4.40 KB, created by John Hein on 2016-12-10 16:55:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2016-12-10 16:55:28 UTC

Size: 4.40 KB

patch

obsolete

>diff -r af2ae0e69b95 pkg/fpgasp/packet_types.hh
>--- a/pkg/fpgasp/packet_types.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/fpgasp/packet_types.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,15 +1,14 @@
> /*
>- * Copyright 2007 - Symmetricom, Inc.
>+ * Copyright 2007-2016 - Microsemi Corp.
>  * All Rights Reserved.
>  *
>- * $TSC: devel/pkg/fpgasp/packet_types.hh,v 1.4 2009/05/04 13:54:08 trentmeester Exp $
>+ * $TSC$
>  */
> 
> #ifndef FPGASP_PACKET_TYPES_HH
> #define FPGASP_PACKET_TYPES_HH
> 
> #include <stdint.h>
>-#include <util/types.hh>
> 
> namespace FpgaSP
> {
>diff -r af2ae0e69b95 pkg/lantronix/ldp.hh
>--- a/pkg/lantronix/ldp.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/lantronix/ldp.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,17 +1,14 @@
> /*
>- * Copyright 2012 - Symmetricom, Inc.
>+ * Copyright 2012-2016 - Microsemi Corp.
>  * All Rights Reserved.
>- * 
>- * $TSC: devel/pkg/lantronix/ldp.hh $
>  *
>+ * $TSC$
>  */
> 
> #ifndef LANTRONIX_LDP_HH
> #define LANTRONIX_LDP_HH
> 
> #include <stdint.h>
>-#include <util/types.hh>
>-
> #include <string>
> #include <vector>
> 
>diff -r af2ae0e69b95 pkg/smcp/consts.hh
>--- a/pkg/smcp/consts.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/smcp/consts.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,12 +1,12 @@
>-//
>-//  Copyright (c) 2012 Symmetricom, Inc.
>-//  All Rights Reserved.
>-//
>-//  $TSC$
>-//
>+/*
>+ * Copyright 2012-2016 - Microsemi Corp.
>+ * All Rights Reserved.
>+ *
>+ * $TSC$
>+ */
> 
>+#include <stddef.h>
> #include <stdint.h>
>-#include <util/types.hh>
> 
> // SMCP protocol constants
> 
>diff -r af2ae0e69b95 pkg/smcp/node_id.hh
>--- a/pkg/smcp/node_id.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/smcp/node_id.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,13 +1,14 @@
>-//
>-//  Copyright (c) 2013-2014 Microsemi Corp.
>-//  All Rights Reserved.
>-//
>-//  $TSC$
>-//
>+/*
>+ * Copyright 2013-2016 - Microsemi Corp.
>+ * All Rights Reserved.
>+ *
>+ * $TSC$
>+ */
>+
> #ifndef SMCP_NODE_ID_HH
> #define SMCP_NODE_ID_HH
>+
> #include <stdint.h>
>-#include <util/types.hh>
> 
> namespace SMCP
> {
>diff -r af2ae0e69b95 pkg/util/endian.hh
>--- a/pkg/util/endian.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/util/endian.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,8 +1,8 @@
> /*
>- * Copyright (C) 2002-2013 - Timing Solutions Corporation.
>+ * Copyright 2002-2016 - Microsemi Corp.
>  * All Rights Reserved.
>  *
>- * $TSC: devel/pkg/util/endian.hh $
>+ * $TSC$
>  */
> 
> #ifndef UTIL_ENDIAN_HH
>@@ -17,9 +17,6 @@
> #include <endian.h>
> #endif
> 
>-#include <util/types.hh>
>-
>-
> #ifndef bswap16
> static inline uint16_t
> bswap16(uint16_t x)
>diff -r af2ae0e69b95 pkg/util/reverse.hh
>--- a/pkg/util/reverse.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/util/reverse.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,15 +1,14 @@
> /*
>- * Copyright 2013 - Symmetricom, Inc.
>+ * Copyright 2013-2016 - Microsemi Corp.
>  * All Rights Reserved.
>  *
>- * $TSC:Exp $
>+ * $TSC$
>  */
> 
> #ifndef UTIL_REVERSE_HH
> #define UTIL_REVERSE_HH
> 
> #include <stdint.h>
>-#include <util/types.hh>
> 
> namespace TSC
> {
>diff -r af2ae0e69b95 pkg/util/unixtime.hh
>--- a/pkg/util/unixtime.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/util/unixtime.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,24 +1,19 @@
>-//
>-// Copyright 2008 - Symmetricom, Inc.
>-// All Rights Reserved.
>-//
>-// $TSC: devel/pkg/util/unixtime.hh,v 1.6 2009/08/11 21:35:52 jhein Exp $
>-//
>+/*
>+ * Copyright 2008-2016 - Microsemi Corp.
>+ * All Rights Reserved.
>+ *
>+ * $TSC$
>+ */
> 
> #ifndef UTIL_UNIXTIME_HH
> #define UTIL_UNIXTIME_HH
> 
>+#include <iostream>
>+#include <stdarg.h>
> #include <stdint.h>
>-#include <iostream>
>-#include <stdio.h>
> #include <string>
>-
> #include <sys/time.h>
> #include <time.h>
>-#include <stdarg.h>
>-
>-#include <util/types.hh>
>-
> 
> /** Encapsulation of unix time (meaning time counted as seconds-since-1970).
>  *
>diff -r af2ae0e69b95 pkg/util/utstd.hh
>--- a/pkg/util/utstd.hh	Wed Dec 07 20:11:21 2016 -0700
>+++ b/pkg/util/utstd.hh	Thu Dec 08 15:50:02 2016 -0700
>@@ -1,8 +1,8 @@
> /*
>- * Copyright 1999-2008 - Symmetricom, Inc.
>+ * Copyright 1999-2016 - Microsemi Corp.
>  * All Rights Reserved.
>  *
>- * $TSC: devel/pkg/util/utstd.hh,v 1.36 2007/09/04 22:46:26 imp Exp $
>+ * $TSC$
>  */
> 
> #ifndef _UTIL_UTSTD_HH
>@@ -11,12 +11,10 @@
> #include <stdint.h>
> #include <string>
> #include <sys/cdefs.h>
>+#include <sys/param.h>
> #include <sys/time.h>
>-#include <sys/param.h>
> #include <time.h>
> 
>-#include <util/types.hh>
>-
> void logExit(const char *msg, int doAbort, int runDtors = false) __attribute__ ((noreturn));
> char const * logFileName();
> void bitcopy(uint8_t *src, int soff, uint8_t *dst, int doff, size_t len);

Actions: View | Diff

Attachments on bug 215197: 177854 | 177855