svn commit: r221487 - head/crypto/openssh
Dag-Erling Smorgrav
des at FreeBSD.org
Thu May 5 08:08:18 UTC 2011
Author: des
Date: Thu May 5 08:08:18 2011
New Revision: 221487
URL: http://svn.freebsd.org/changeset/base/221487
Log:
Merge two upstream patches from vendor branch. No functional changes.
Modified:
head/crypto/openssh/ChangeLog
head/crypto/openssh/defines.h
Directory Properties:
head/crypto/openssh/ (props changed)
Modified: head/crypto/openssh/ChangeLog
==============================================================================
--- head/crypto/openssh/ChangeLog Thu May 5 08:04:31 2011 (r221486)
+++ head/crypto/openssh/ChangeLog Thu May 5 08:08:18 2011 (r221487)
@@ -1,6 +1,7 @@
20110403
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Prepare for 5.8p2 release.
+ - (djm) [version.h] crank version
- Release 5.8p2
20110329
Modified: head/crypto/openssh/defines.h
==============================================================================
--- head/crypto/openssh/defines.h Thu May 5 08:04:31 2011 (r221486)
+++ head/crypto/openssh/defines.h Thu May 5 08:08:18 2011 (r221487)
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */
+/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */
/* Constants */
@@ -45,6 +45,7 @@ enum
/*
* Definitions for IP type of service (ip_tos)
*/
+#include <netinet/in_systm.h>
#include <netinet/ip.h>
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
@@ -57,7 +58,6 @@ enum
/*
* Definitions for DiffServ Codepoints as per RFC2474
*/
-#include <netinet/in_systm.h>
#ifndef IPTOS_DSCP_AF11
# define IPTOS_DSCP_AF11 0x28
# define IPTOS_DSCP_AF12 0x30
More information about the svn-src-head
mailing list