osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

illumos-net-tools (4.3) unstable; urgency=medium 

* New upstream snapshot
  * Refreshed patches
  * Added illumos-4868-ifconfig-uninitialized-mask.patch
This commit is contained in:
Igor Pashev 2014-05-20 09:35:08 +04:00
parent b11e87c232
commit 01130fa160
7 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
illumos-net-tools/debian/changelog
View File

@ -1,3 +1,11 @@
illumos-net-tools (4.3) unstable; urgency=medium
* New upstream snapshot
* Refreshed patches
* Added illumos-4868-ifconfig-uninitialized-mask.patch
-- Igor Pashev <pashev.igor@gmail.com> Tue, 20 May 2014 09:29:10 +0400
illumos-net-tools (2.10-2) unstable; urgency=low
* Fixed typo in ifconfig-disable-ipmp.patch

6
illumos-net-tools/debian/control
View File

@ -4,7 +4,7 @@ Priority: required
Maintainer: Igor Pashev <pashev.igor@gmail.com>
Build-Depends:
dh-illumos,
illumos-source-2.10,
illumos-source-4.3,
libdevinfo-dev,
libdhcpagent1-dev,
libdladm1-dev,
@ -14,12 +14,10 @@ Build-Depends:
libtsnet1-dev,
libkstat-dev,
quilt,
Standards-Version: 3.9.3
Standards-Version: 3.9.5
Homepage: https://www.illumos.org
Package: illumos-net-tools
Priority: important
Section: admin
Provides: net-tools
Architecture: illumos-any
Recommends: ipadm, dladm, routeadm

6
illumos-net-tools/debian/patches/ifconfig-pointers.patch
View File

@ -1,8 +1,8 @@
Index: illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/revarp.c
===================================================================
--- illumos-net-tools.orig/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/revarp.c 2012-10-08 00:25:23.000000000 +0000
+++ illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/revarp.c 2013-03-16 20:50:52.204215409 +0000
@@ -328,7 +328,7 @@
--- illumos-net-tools.orig/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/revarp.c 2014-03-01 16:17:51.000000000 +0400
+++ illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/revarp.c 2014-05-20 09:26:55.083134253 +0400
@@ -326,7 +326,7 @@
void
dlpi_print_address(const char *linkname)
{

40
illumos-net-tools/debian/patches/illumos-4868-ifconfig-uninitialized-mask.patch Normal file
View File

@ -0,0 +1,40 @@
From 60b43c45a204a6c0651e8017e1e505015ba74094 Mon Sep 17 00:00:00 2001
From: Dan McDonald <danmcd@omniti.com>
Date: Sun, 18 May 2014 21:18:36 -0400
Subject: [PATCH] 4868 ifconfig(1M)'s "addif" uses an uninitialized mask if not
specified Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Andy
Stormont <AStormont@racktopsystems.com> Reviewed by: Josef 'Jeff' Sipek
<jeffpc@josefsipek.net> Approved by: Garrett D'Amore <garrett@damore.org>
---
usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c
index 4fb7837..299bb47 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c
@@ -1,8 +1,7 @@
/*
- * Copyright 2012, Daniil Lunev. All rights reserved.
- */
-/*
* Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012, Daniil Lunev. All rights reserved.
+ * Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
*/
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -1836,6 +1835,9 @@ addif(char *str, int64_t param)
setaddr = 0;
(*afp->af_getaddr)(str, (struct sockaddr *)&laddr, &prefixlen);
+ (void) memset(&mask, 0, sizeof (mask));
+ mask.ss_family = afp->af_af;
+
switch (prefixlen) {
case NO_PREFIX:
/* Nothing there - ok */
--
1.9.3

1
illumos-net-tools/debian/patches/series
View File

@ -6,3 +6,4 @@ netstat-pointers.patch
statcommon-include-time.h.patch
ndd-pointers.patch
netstat-prints-garbage.patch
illumos-4868-ifconfig-uninitialized-mask.patch

6
illumos-net-tools/debian/patches/statcommon-include-time.h.patch
View File

@ -1,8 +1,8 @@
Index: illumos-net-tools/usr/src/cmd/stat/common/statcommon.h
===================================================================
--- illumos-net-tools.orig/usr/src/cmd/stat/common/statcommon.h 2012-10-08 00:25:33.000000000 +0000
+++ illumos-net-tools/usr/src/cmd/stat/common/statcommon.h 2013-03-16 23:54:28.034817435 +0000
@@ -34,6 +34,7 @@
--- illumos-net-tools.orig/usr/src/cmd/stat/common/statcommon.h 2014-03-01 16:18:04.000000000 +0400
+++ illumos-net-tools/usr/src/cmd/stat/common/statcommon.h 2014-05-20 09:27:18.796054256 +0400
@@ -37,6 +37,7 @@
#include <stdio.h>
#include <kstat.h>

2
illumos-net-tools/debian/rules
View File

@ -112,6 +112,6 @@ binary-stamp: install-stamp
clean: unpatch
dh_testdir
dh_testroot
dh_clean
rm -rf usr .pc
dh_clean