Attachment 170211 Details for Bug 209446 – patch.txt

[patch] patch.txt

file_209446.txt (text/plain), 5.69 KB, created by Leonid Nevecherya on 2016-05-11 12:57:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leonid Nevecherya

Created: 2016-05-11 12:57:12 UTC

Size: 5.69 KB

patch

obsolete

>--- sysutils/ipmitool/Makefile.orig	2016-04-01 17:25:16.000000000 +0300
>+++ sysutils/ipmitool/Makefile	2016-05-10 16:18:52.000000000 +0300
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/ipmitool/Makefile 412349 2016-04-01 14:25:16Z mat $
> 
> PORTNAME=	ipmitool
>-PORTVERSION=	1.8.15
>-PORTREVISION=	1
>+PORTVERSION=	1.8.17
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>--- sysutils/ipmitool/distinfo.orig	2015-11-08 22:22:46.000000000 +0300
>+++ sysutils/ipmitool/distinfo	2016-05-10 16:22:43.000000000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (ipmitool-1.8.15.tar.bz2) = 4acd2df5f8740fef5c032cebee0113ec4d3bbef04a6f4dbfaf7fcc7f3eb08c40
>-SIZE (ipmitool-1.8.15.tar.bz2) = 747174
>+SHA256 (ipmitool-1.8.17.tar.bz2) = 97fa20efd9c87111455b174858544becae7fcc03a3cb7bf5c19b09065c842d02
>+SIZE (ipmitool-1.8.17.tar.bz2) = 772570
>--- sysutils/ipmitool/files/patch-configure.orig	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/ipmitool/files/patch-configure	2016-05-11 11:07:18.027707000 +0300
>@@ -0,0 +1,10 @@
>+--- configure.orig	2016-05-06 17:52:11.000000000 +0300
>++++ configure	2016-05-11 11:05:50.540757000 +0300
>+@@ -12603,6 +12603,7 @@
>+ 	xenable_intf_imb=no
>+ 	xenable_intf_lipmi=no
>+ 	xenable_intf_bmc=no
>++	xenable_intf_usb=no
>+ 	;;
>+ *netbsd*)
>+ 	xenable_intf_imb=no
>--- sysutils/ipmitool/files/patch-ipmi_chassis.c.orig	2014-01-22 21:40:44.000000000 +0400
>+++ sysutils/ipmitool/files/patch-ipmi_chassis.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- lib/ipmi_chassis.c.orig	2012-10-15 07:38:19.000000000 +0000
>-+++ lib/ipmi_chassis.c	2012-10-15 07:38:46.000000000 +0000
>-@@ -41,6 +41,7 @@
>- #include <ipmitool/ipmi_intf.h>
>- #include <ipmitool/ipmi_strings.h>
>- #include <ipmitool/ipmi_chassis.h>
>-+#include <ipmitool/bswap.h>
>- 
>- extern int verbose;
>- 
>--- sysutils/ipmitool/files/patch-ipmi_intf.c.orig	2014-06-02 18:27:27.000000000 +0400
>+++ sysutils/ipmitool/files/patch-ipmi_intf.c	2016-05-11 15:38:13.319106000 +0300
>@@ -1,9 +1,22 @@
>---- src/plugins/ipmi_intf.c.orig       2014-05-30 19:18:08.346626784 -0400
>-+++ src/plugins/ipmi_intf.c    2014-05-30 19:18:43.537804678 -0400
>-@@ -45,6 +45,7 @@
>- #include <ifaddrs.h>
>- #include <unistd.h>
>+--- src/plugins/ipmi_intf.c.orig	2016-05-06 17:48:54.000000000 +0300
>++++ src/plugins/ipmi_intf.c	2016-05-11 15:23:58.000000000 +0300
>+@@ -29,9 +29,6 @@
>+  * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
>+  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
>+  */
>+-#define _XOPEN_SOURCE 700
>+-#define _GNU_SOURCE 1
>+-#define _DARWIN_C_SOURCE 1
>+ 
>+ #include <stdio.h>
>+ #include <stdlib.h>
>+@@ -50,6 +47,9 @@
>  #include <netdb.h>
>-+#define s6_addr16 __u6_addr.__u6_addr16
>  #endif
>-
>+ 
>++#define _XOPEN_SOURCE 700
>++#define _GNU_SOURCE 1
>++#define _DARWIN_C_SOURCE 1
>+ 
>+ #include <ipmitool/ipmi_intf.h>
>+ #include <ipmitool/ipmi.h>
>--- sysutils/ipmitool/files/patch-ipmi_pef.c.orig	2013-02-01 19:04:00.000000000 +0400
>+++ sysutils/ipmitool/files/patch-ipmi_pef.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- lib/ipmi_pef.c.orig	2012-10-15 07:41:07.000000000 +0000
>-+++ lib/ipmi_pef.c	2012-10-15 07:41:36.000000000 +0000
>-@@ -39,6 +39,7 @@
>- #include <ipmitool/ipmi.h>
>- #include <ipmitool/ipmi_intf.h>
>- #include <ipmitool/ipmi_pef.h>
>-+#include <ipmitool/bswap.h>
>- 
>- extern int verbose;
>- /*
>--- sysutils/ipmitool/files/patch-open.c.orig	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/ipmitool/files/patch-open.c	2016-05-11 15:38:07.940892000 +0300
>@@ -0,0 +1,20 @@
>+--- src/plugins/open/open.c.orig	2016-05-06 17:48:54.000000000 +0300
>++++ src/plugins/open/open.c	2016-05-11 15:31:35.000000000 +0300
>+@@ -29,8 +29,6 @@
>+  * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
>+  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
>+  */
>+-#define _POSIX_SOURCE
>+-
>+ #include <stdio.h>
>+ #include <fcntl.h>
>+ #include <unistd.h>
>+@@ -42,6 +40,8 @@
>+ #include <sys/select.h>
>+ #include <sys/stat.h>
>+ 
>++#define _POSIX_SOURCE
>++
>+ #include <ipmitool/ipmi.h>
>+ #include <ipmitool/ipmi_intf.h>
>+ #include <ipmitool/ipmi_sel.h>
>--- sysutils/ipmitool/files/patch-serial_basic.c.orig	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/ipmitool/files/patch-serial_basic.c	2016-05-10 22:17:07.000000000 +0300
>@@ -0,0 +1,10 @@
>+--- src/plugins/serial/serial_basic.c.orig	2016-05-06 17:48:54.000000000 +0300
>++++ src/plugins/serial/serial_basic.c	2016-05-10 22:16:00.498180000 +0300
>+@@ -33,7 +33,6 @@
>+ 
>+ /* Serial Interface, Basic Mode plugin. */
>+ 
>+-#include <alloca.h>
>+ #include <stdio.h>
>+ #include <fcntl.h>
>+ #include <time.h>
>--- sysutils/ipmitool/files/patch-serial_terminal.c.orig	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/ipmitool/files/patch-serial_terminal.c	2016-05-10 22:04:44.964442000 +0300
>@@ -0,0 +1,10 @@
>+--- src/plugins/serial/serial_terminal.c.orig	2016-05-06 17:48:54.000000000 +0300
>++++ src/plugins/serial/serial_terminal.c	2016-05-10 22:01:50.885093000 +0300
>+@@ -33,7 +33,6 @@
>+ 
>+ /* Serial Interface, Terminal Mode plugin. */
>+ 
>+-#include <alloca.h>
>+ #include <stdio.h>
>+ #include <fcntl.h>
>+ #include <unistd.h>
>--- sysutils/ipmitool/files/status-ipmi.sh.in.orig	2013-02-01 19:04:00.000000000 +0400
>+++ sysutils/ipmitool/files/status-ipmi.sh.in	2016-05-11 12:23:24.322920000 +0300
>@@ -49,7 +49,12 @@
>         if [ $entries -gt $last ]; then
>           echo $entries > /var/db/ipmi-sel-count
>           echo ""
>-          $ipmitool sel list $sel_list_args
>+          if [ "$sel_list_args" ]; then
>+            $ipmitool sel list $sel_list_args
>+          else
>+            count=$(($entries-$last))
>+            $ipmitool sel list last $count
>+          fi
>           rc=3
>         fi
>         ;;

Flags:

nevecherya: maintainer-approval? (zi)

Actions: View | Diff

Attachments on bug 209446: 170205 | 170211