Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 877575 Details for
Bug 1079635
Use system libedit instead of bundled one
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Use system libedit instead of bundled one
Use-system-libedit-instead-of-bundled-one.patch (text/plain), 47.39 KB, created by
Ville Skyttä
on 2014-03-22 11:15:16 UTC
(
hide
)
Description:
Use system libedit instead of bundled one
Filename:
MIME Type:
Creator:
Ville Skyttä
Created:
2014-03-22 11:15:16 UTC
Size:
47.39 KB
patch
obsolete
>From c9cd7e63302376733a1d7a026d6243c1370bbb58 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi> >Date: Sat, 22 Mar 2014 13:13:58 +0200 >Subject: [PATCH] Use system libedit instead of bundled one > >- Drop no longer needed aarch64 hacks >- Package all installed files (#1075696) >- Don't ship lanserv files in main package > >https://bugzilla.redhat.com/show_bug.cgi?id=1079635 >--- > OpenIPMI-2.0.21-system-libedit.patch | 149 +++++ > OpenIPMI-aarch64.patch | 1149 ---------------------------------- > OpenIPMI.spec | 41 +- > 3 files changed, 171 insertions(+), 1168 deletions(-) > create mode 100644 OpenIPMI-2.0.21-system-libedit.patch > delete mode 100644 OpenIPMI-aarch64.patch > >diff --git a/OpenIPMI-2.0.21-system-libedit.patch b/OpenIPMI-2.0.21-system-libedit.patch >new file mode 100644 >index 0000000..56281d1 >--- /dev/null >+++ b/OpenIPMI-2.0.21-system-libedit.patch >@@ -0,0 +1,149 @@ >+diff -up OpenIPMI-2.0.21/cmdlang/Makefile.am~ OpenIPMI-2.0.21/cmdlang/Makefile.am >+--- OpenIPMI-2.0.21/cmdlang/Makefile.am~ 2013-01-21 19:24:13.000000000 +0200 >++++ OpenIPMI-2.0.21/cmdlang/Makefile.am 2014-03-22 12:05:46.134715243 +0200 >+@@ -4,7 +4,7 @@ LD_VERSION = 0:5:0 >+ >+ AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ >+ -I$(top_srcdir)/include \ >+- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ >++ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ >+ $(TCL_CFLAGS) >+ >+ lib_LTLIBRARIES = libOpenIPMIcmdlang.la >+@@ -25,7 +25,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l >+ $(top_builddir)/utils/libOpenIPMIutils.la \ >+ $(top_builddir)/lib/libOpenIPMI.la \ >+ $(top_builddir)/unix/libOpenIPMIposix.la \ >+- $(top_builddir)/libedit/libedit.a \ >++ -ledit \ >+ $(TERM_LIBS) \ >+ $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ >+ $(TCL_LIB) $(TCL_LIBS) \ >+diff -up OpenIPMI-2.0.21/cmdlang/Makefile.in~ OpenIPMI-2.0.21/cmdlang/Makefile.in >+--- OpenIPMI-2.0.21/cmdlang/Makefile.in~ 2014-01-28 21:35:10.000000000 +0200 >++++ OpenIPMI-2.0.21/cmdlang/Makefile.in 2014-03-22 12:06:02.871066603 +0200 >+@@ -148,7 +148,7 @@ openipmish_DEPENDENCIES = libOpenIPMIcmd >+ $(top_builddir)/utils/libOpenIPMIutils.la \ >+ $(top_builddir)/lib/libOpenIPMI.la \ >+ $(top_builddir)/unix/libOpenIPMIposix.la \ >+- $(top_builddir)/libedit/libedit.a $(am__DEPENDENCIES_1) \ >++ $(am__DEPENDENCIES_1) \ >+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ >+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ >+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ >+@@ -402,7 +402,7 @@ LIB_VERSION = 0.0.5 >+ LD_VERSION = 0:5:0 >+ AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ >+ -I$(top_srcdir)/include \ >+- -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ >++ -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ >+ $(TCL_CFLAGS) >+ >+ lib_LTLIBRARIES = libOpenIPMIcmdlang.la >+@@ -422,7 +422,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la >+ $(top_builddir)/utils/libOpenIPMIutils.la \ >+ $(top_builddir)/lib/libOpenIPMI.la \ >+ $(top_builddir)/unix/libOpenIPMIposix.la \ >+- $(top_builddir)/libedit/libedit.a \ >++ -ledit \ >+ $(TERM_LIBS) \ >+ $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ >+ $(TCL_LIB) $(TCL_LIBS) \ >+diff -up OpenIPMI-2.0.21/configure~ OpenIPMI-2.0.21/configure >+--- OpenIPMI-2.0.21/configure~ 2014-01-28 21:35:11.000000000 +0200 >++++ OpenIPMI-2.0.21/configure 2014-03-22 12:06:52.631109977 +0200 >+@@ -15109,7 +15109,7 @@ else >+ fi >+ >+ >+-ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile lanserv/sdrcomp/Makefile lanserv/marvell-bmc/Makefile sample/Makefile doc/Makefile man/Makefile swig/Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile libedit/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile include/OpenIPMI/ipmiif.h include/OpenIPMI/internal/Makefile include/linux/Makefile OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc OpenIPMIui.pc" >++ac_config_files="$ac_config_files Makefile utils/Makefile lib/Makefile unix/Makefile glib/Makefile tcl/Makefile ui/Makefile lanserv/Makefile lanserv/OpenIPMI/Makefile lanserv/sdrcomp/Makefile lanserv/marvell-bmc/Makefile sample/Makefile doc/Makefile man/Makefile swig/Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile include/OpenIPMI/ipmiif.h include/OpenIPMI/internal/Makefile include/linux/Makefile OpenIPMI.spec OpenIPMIutils.pc OpenIPMI.pc OpenIPMIpthread.pc OpenIPMIposix.pc OpenIPMIglib.pc OpenIPMIglib12.pc OpenIPMItcl.pc OpenIPMIcmdlang.pc OpenIPMIui.pc" >+ >+ cat >confcache <<\_ACEOF >+ # This file is a shell script that caches the results of configure >+@@ -16134,7 +16134,6 @@ do >+ "swig/perl/Makefile") CONFIG_FILES="$CONFIG_FILES swig/perl/Makefile" ;; >+ "swig/python/Makefile") CONFIG_FILES="$CONFIG_FILES swig/python/Makefile" ;; >+ "swig/python/openipmigui/Makefile") CONFIG_FILES="$CONFIG_FILES swig/python/openipmigui/Makefile" ;; >+- "libedit/Makefile") CONFIG_FILES="$CONFIG_FILES libedit/Makefile" ;; >+ "cmdlang/Makefile") CONFIG_FILES="$CONFIG_FILES cmdlang/Makefile" ;; >+ "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; >+ "include/OpenIPMI/Makefile") CONFIG_FILES="$CONFIG_FILES include/OpenIPMI/Makefile" ;; >+diff -up OpenIPMI-2.0.21/configure.ac~ OpenIPMI-2.0.21/configure.ac >+--- OpenIPMI-2.0.21/configure.ac~ 2014-01-28 21:35:02.000000000 +0200 >++++ OpenIPMI-2.0.21/configure.ac 2014-03-22 12:06:20.726441209 +0200 >+@@ -930,7 +930,6 @@ AC_OUTPUT(Makefile >+ swig/perl/Makefile >+ swig/python/Makefile >+ swig/python/openipmigui/Makefile >+- libedit/Makefile >+ cmdlang/Makefile >+ include/Makefile >+ include/OpenIPMI/Makefile >+diff -up OpenIPMI-2.0.21/Makefile.am~ OpenIPMI-2.0.21/Makefile.am >+--- OpenIPMI-2.0.21/Makefile.am~ 2012-07-22 01:01:45.000000000 +0300 >++++ OpenIPMI-2.0.21/Makefile.am 2014-03-22 12:06:30.702650403 +0200 >+@@ -1,10 +1,10 @@ >+ RPM = rpmbuild >+ RPMFLAGS = -ta >+ >+-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \ >++SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \ >+ ui lanserv sample doc man $(SWIG_DIR) >+ >+-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \ >++DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \ >+ ui lanserv sample doc man swig >+ >+ EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ >+diff -up OpenIPMI-2.0.21/Makefile.in~ OpenIPMI-2.0.21/Makefile.in >+--- OpenIPMI-2.0.21/Makefile.in~ 2014-01-28 21:35:10.000000000 +0200 >++++ OpenIPMI-2.0.21/Makefile.in 2014-03-22 12:06:39.718839395 +0200 >+@@ -390,10 +390,10 @@ top_builddir = @top_builddir@ >+ top_srcdir = @top_srcdir@ >+ RPM = rpmbuild >+ RPMFLAGS = -ta >+-SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \ >++SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \ >+ ui lanserv sample doc man $(SWIG_DIR) >+ >+-DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \ >++DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \ >+ ui lanserv sample doc man swig >+ >+ EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ >+diff -up OpenIPMI-2.0.21/sample/Makefile.am~ OpenIPMI-2.0.21/sample/Makefile.am >+--- OpenIPMI-2.0.21/sample/Makefile.am~ 2013-01-21 19:24:13.000000000 +0200 >++++ OpenIPMI-2.0.21/sample/Makefile.am 2014-03-22 12:07:11.023495196 +0200 >+@@ -53,8 +53,7 @@ solterm_LDADD = $(POPTLIBS) $(top_buildd >+ rmcp_ping_SOURCES = rmcp_ping.c >+ >+ ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c >+-ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) >+-ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit >++ipmi_serial_bmc_emu_LDADD = -ledit $(TERM_LIBS) >+ >+ EXTRA_DIST = example_oem.c >+ >+diff -up OpenIPMI-2.0.21/sample/Makefile.in~ OpenIPMI-2.0.21/sample/Makefile.in >+--- OpenIPMI-2.0.21/sample/Makefile.in~ 2014-01-28 21:35:10.000000000 +0200 >++++ OpenIPMI-2.0.21/sample/Makefile.in 2014-03-22 12:07:28.966870811 +0200 >+@@ -114,7 +114,7 @@ am__v_lt_1 = >+ am_ipmi_serial_bmc_emu_OBJECTS = \ >+ ipmi_serial_bmc_emu-ipmi_serial_bmc_emu.$(OBJEXT) >+ ipmi_serial_bmc_emu_OBJECTS = $(am_ipmi_serial_bmc_emu_OBJECTS) >+-ipmi_serial_bmc_emu_DEPENDENCIES = $(top_builddir)/libedit/libedit.a \ >++ipmi_serial_bmc_emu_DEPENDENCIES = \ >+ $(am__DEPENDENCIES_1) >+ ipmi_serial_bmc_emu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ >+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ >+@@ -460,8 +460,7 @@ solterm_LDADD = $(POPTLIBS) $(top_buildd >+ >+ rmcp_ping_SOURCES = rmcp_ping.c >+ ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c >+-ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) >+-ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit >++ipmi_serial_bmc_emu_LDADD = -ledit $(TERM_LIBS) >+ EXTRA_DIST = example_oem.c >+ all: all-am >+ >diff --git a/OpenIPMI-aarch64.patch b/OpenIPMI-aarch64.patch >deleted file mode 100644 >index f8369fc..0000000 >--- a/OpenIPMI-aarch64.patch >+++ /dev/null >@@ -1,1149 +0,0 @@ >-diff -urN OpenIPMI-2.0.19/config.guess OpenIPMI-2.0.19-aarch64/config.guess >---- OpenIPMI-2.0.19/config.guess 2010-05-09 08:32:53.000000000 -0500 >-+++ OpenIPMI-2.0.19-aarch64/config.guess 2013-03-03 06:56:09.267032676 -0600 >-@@ -1,10 +1,10 @@ >- #! /bin/sh >- # Attempt to guess a canonical system name. >- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, >--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 >--# Free Software Foundation, Inc. >-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, >-+# 2011, 2012 Free Software Foundation, Inc. >- >--timestamp='2009-12-30' >-+timestamp='2012-09-25' >- >- # This file is free software; you can redistribute it and/or modify it >- # under the terms of the GNU General Public License as published by >-@@ -17,9 +17,7 @@ >- # General Public License for more details. >- # >- # You should have received a copy of the GNU General Public License >--# along with this program; if not, write to the Free Software >--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA >--# 02110-1301, USA. >-+# along with this program; if not, see <http://www.gnu.org/licenses/>. >- # >- # As a special exception to the GNU General Public License, if you >- # distribute this file as part of a program that contains a >-@@ -57,8 +55,8 @@ >- >- Originally written by Per Bothner. >- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, >--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free >--Software Foundation, Inc. >-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 >-+Free Software Foundation, Inc. >- >- This is free software; see the source for copying conditions. There is NO >- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." >-@@ -145,7 +143,7 @@ >- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in >- *:NetBSD:*:*) >- # NetBSD (nbsd) targets should (where applicable) match one or >-- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, >-+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, >- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently >- # switched to ELF, *-*-netbsd* would select the old >- # object file format. This provides both forward >-@@ -181,7 +179,7 @@ >- fi >- ;; >- *) >-- os=netbsd >-+ os=netbsd >- ;; >- esac >- # The OS release >-@@ -202,6 +200,10 @@ >- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. >- echo "${machine}-${os}${release}" >- exit ;; >-+ *:Bitrig:*:*) >-+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` >-+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} >-+ exit ;; >- *:OpenBSD:*:*) >- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` >- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} >-@@ -224,7 +226,7 @@ >- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` >- ;; >- *5.*) >-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` >-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` >- ;; >- esac >- # According to Compaq, /usr/sbin/psrinfo has been available on >-@@ -270,7 +272,10 @@ >- # A Xn.n version is an unreleased experimental baselevel. >- # 1.2 uses "1.2" for uname -r. >- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` >-- exit ;; >-+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. >-+ exitcode=$? >-+ trap '' 0 >-+ exit $exitcode ;; >- Alpha\ *:Windows_NT*:*) >- # How do we know it's Interix rather than the generic POSIX subsystem? >- # Should we change UNAME_MACHINE based on the output of uname instead >-@@ -296,12 +301,12 @@ >- echo s390-ibm-zvmoe >- exit ;; >- *:OS400:*:*) >-- echo powerpc-ibm-os400 >-+ echo powerpc-ibm-os400 >- exit ;; >- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) >- echo arm-acorn-riscix${UNAME_RELEASE} >- exit ;; >-- arm:riscos:*:*|arm:RISCOS:*:*) >-+ arm*:riscos:*:*|arm*:RISCOS:*:*) >- echo arm-unknown-riscos >- exit ;; >- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) >-@@ -395,23 +400,23 @@ >- # MiNT. But MiNT is downward compatible to TOS, so this should >- # be no problem. >- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) >-- echo m68k-atari-mint${UNAME_RELEASE} >-+ echo m68k-atari-mint${UNAME_RELEASE} >- exit ;; >- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) >- echo m68k-atari-mint${UNAME_RELEASE} >-- exit ;; >-+ exit ;; >- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) >-- echo m68k-atari-mint${UNAME_RELEASE} >-+ echo m68k-atari-mint${UNAME_RELEASE} >- exit ;; >- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) >-- echo m68k-milan-mint${UNAME_RELEASE} >-- exit ;; >-+ echo m68k-milan-mint${UNAME_RELEASE} >-+ exit ;; >- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) >-- echo m68k-hades-mint${UNAME_RELEASE} >-- exit ;; >-+ echo m68k-hades-mint${UNAME_RELEASE} >-+ exit ;; >- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) >-- echo m68k-unknown-mint${UNAME_RELEASE} >-- exit ;; >-+ echo m68k-unknown-mint${UNAME_RELEASE} >-+ exit ;; >- m68k:machten:*:*) >- echo m68k-apple-machten${UNAME_RELEASE} >- exit ;; >-@@ -481,8 +486,8 @@ >- echo m88k-motorola-sysv3 >- exit ;; >- AViiON:dgux:*:*) >-- # DG/UX returns AViiON for all architectures >-- UNAME_PROCESSOR=`/usr/bin/uname -p` >-+ # DG/UX returns AViiON for all architectures >-+ UNAME_PROCESSOR=`/usr/bin/uname -p` >- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] >- then >- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ >-@@ -495,7 +500,7 @@ >- else >- echo i586-dg-dgux${UNAME_RELEASE} >- fi >-- exit ;; >-+ exit ;; >- M88*:DolphinOS:*:*) # DolphinOS (SVR3) >- echo m88k-dolphin-sysv3 >- exit ;; >-@@ -552,7 +557,7 @@ >- echo rs6000-ibm-aix3.2 >- fi >- exit ;; >-- *:AIX:*:[456]) >-+ *:AIX:*:[4567]) >- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` >- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then >- IBM_ARCH=rs6000 >-@@ -595,52 +600,52 @@ >- 9000/[678][0-9][0-9]) >- if [ -x /usr/bin/getconf ]; then >- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` >-- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` >-- case "${sc_cpu_version}" in >-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 >-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 >-- 532) # CPU_PA_RISC2_0 >-- case "${sc_kernel_bits}" in >-- 32) HP_ARCH="hppa2.0n" ;; >-- 64) HP_ARCH="hppa2.0w" ;; >-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` >-+ case "${sc_cpu_version}" in >-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 >-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 >-+ 532) # CPU_PA_RISC2_0 >-+ case "${sc_kernel_bits}" in >-+ 32) HP_ARCH="hppa2.0n" ;; >-+ 64) HP_ARCH="hppa2.0w" ;; >- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 >-- esac ;; >-- esac >-+ esac ;; >-+ esac >- fi >- if [ "${HP_ARCH}" = "" ]; then >- eval $set_cc_for_build >-- sed 's/^ //' << EOF >$dummy.c >-+ sed 's/^ //' << EOF >$dummy.c >-+ >-+ #define _HPUX_SOURCE >-+ #include <stdlib.h> >-+ #include <unistd.h> >- >-- #define _HPUX_SOURCE >-- #include <stdlib.h> >-- #include <unistd.h> >-- >-- int main () >-- { >-- #if defined(_SC_KERNEL_BITS) >-- long bits = sysconf(_SC_KERNEL_BITS); >-- #endif >-- long cpu = sysconf (_SC_CPU_VERSION); >-- >-- switch (cpu) >-- { >-- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; >-- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; >-- case CPU_PA_RISC2_0: >-- #if defined(_SC_KERNEL_BITS) >-- switch (bits) >-- { >-- case 64: puts ("hppa2.0w"); break; >-- case 32: puts ("hppa2.0n"); break; >-- default: puts ("hppa2.0"); break; >-- } break; >-- #else /* !defined(_SC_KERNEL_BITS) */ >-- puts ("hppa2.0"); break; >-- #endif >-- default: puts ("hppa1.0"); break; >-- } >-- exit (0); >-- } >-+ int main () >-+ { >-+ #if defined(_SC_KERNEL_BITS) >-+ long bits = sysconf(_SC_KERNEL_BITS); >-+ #endif >-+ long cpu = sysconf (_SC_CPU_VERSION); >-+ >-+ switch (cpu) >-+ { >-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; >-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; >-+ case CPU_PA_RISC2_0: >-+ #if defined(_SC_KERNEL_BITS) >-+ switch (bits) >-+ { >-+ case 64: puts ("hppa2.0w"); break; >-+ case 32: puts ("hppa2.0n"); break; >-+ default: puts ("hppa2.0"); break; >-+ } break; >-+ #else /* !defined(_SC_KERNEL_BITS) */ >-+ puts ("hppa2.0"); break; >-+ #endif >-+ default: puts ("hppa1.0"); break; >-+ } >-+ exit (0); >-+ } >- EOF >- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` >- test -z "$HP_ARCH" && HP_ARCH=hppa >-@@ -731,22 +736,22 @@ >- exit ;; >- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) >- echo c1-convex-bsd >-- exit ;; >-+ exit ;; >- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) >- if getsysinfo -f scalar_acc >- then echo c32-convex-bsd >- else echo c2-convex-bsd >- fi >-- exit ;; >-+ exit ;; >- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) >- echo c34-convex-bsd >-- exit ;; >-+ exit ;; >- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) >- echo c38-convex-bsd >-- exit ;; >-+ exit ;; >- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) >- echo c4-convex-bsd >-- exit ;; >-+ exit ;; >- CRAY*Y-MP:*:*:*) >- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' >- exit ;; >-@@ -770,14 +775,14 @@ >- exit ;; >- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) >- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` >-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` >-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` >-- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" >-- exit ;; >-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` >-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` >-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" >-+ exit ;; >- 5000:UNIX_System_V:4.*:*) >-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` >-- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` >-- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" >-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` >-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` >-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" >- exit ;; >- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) >- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} >-@@ -789,30 +794,35 @@ >- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} >- exit ;; >- *:FreeBSD:*:*) >-- case ${UNAME_MACHINE} in >-- pc98) >-- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; >-+ UNAME_PROCESSOR=`/usr/bin/uname -p` >-+ case ${UNAME_PROCESSOR} in >- amd64) >- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; >- *) >-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; >-+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; >- esac >- exit ;; >- i*:CYGWIN*:*) >- echo ${UNAME_MACHINE}-pc-cygwin >- exit ;; >-+ *:MINGW64*:*) >-+ echo ${UNAME_MACHINE}-pc-mingw64 >-+ exit ;; >- *:MINGW*:*) >- echo ${UNAME_MACHINE}-pc-mingw32 >- exit ;; >-+ i*:MSYS*:*) >-+ echo ${UNAME_MACHINE}-pc-msys >-+ exit ;; >- i*:windows32*:*) >-- # uname -m includes "-pc" on this system. >-- echo ${UNAME_MACHINE}-mingw32 >-+ # uname -m includes "-pc" on this system. >-+ echo ${UNAME_MACHINE}-mingw32 >- exit ;; >- i*:PW*:*) >- echo ${UNAME_MACHINE}-pc-pw32 >- exit ;; >- *:Interix*:*) >-- case ${UNAME_MACHINE} in >-+ case ${UNAME_MACHINE} in >- x86) >- echo i586-pc-interix${UNAME_RELEASE} >- exit ;; >-@@ -858,6 +868,13 @@ >- i*86:Minix:*:*) >- echo ${UNAME_MACHINE}-pc-minix >- exit ;; >-+ aarch64:Linux:*:*) >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >-+ exit ;; >-+ aarch64_be:Linux:*:*) >-+ UNAME_MACHINE=aarch64_be >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >-+ exit ;; >- alpha:Linux:*:*) >- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in >- EV5) UNAME_MACHINE=alphaev5 ;; >-@@ -867,7 +884,7 @@ >- EV6) UNAME_MACHINE=alphaev6 ;; >- EV67) UNAME_MACHINE=alphaev67 ;; >- EV68*) UNAME_MACHINE=alphaev68 ;; >-- esac >-+ esac >- objdump --private-headers /bin/sh | grep -q ld.so.1 >- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi >- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} >-@@ -879,20 +896,29 @@ >- then >- echo ${UNAME_MACHINE}-unknown-linux-gnu >- else >-- echo ${UNAME_MACHINE}-unknown-linux-gnueabi >-+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ >-+ | grep -q __ARM_PCS_VFP >-+ then >-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi >-+ else >-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf >-+ fi >- fi >- exit ;; >- avr32*:Linux:*:*) >- echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >- cris:Linux:*:*) >-- echo cris-axis-linux-gnu >-+ echo ${UNAME_MACHINE}-axis-linux-gnu >- exit ;; >- crisv32:Linux:*:*) >-- echo crisv32-axis-linux-gnu >-+ echo ${UNAME_MACHINE}-axis-linux-gnu >- exit ;; >- frv:Linux:*:*) >-- echo frv-unknown-linux-gnu >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >-+ exit ;; >-+ hexagon:Linux:*:*) >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >- i*86:Linux:*:*) >- LIBC=gnu >-@@ -934,7 +960,7 @@ >- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } >- ;; >- or32:Linux:*:*) >-- echo or32-unknown-linux-gnu >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >- padre:Linux:*:*) >- echo sparc-unknown-linux-gnu >-@@ -960,7 +986,7 @@ >- echo ${UNAME_MACHINE}-ibm-linux >- exit ;; >- sh64*:Linux:*:*) >-- echo ${UNAME_MACHINE}-unknown-linux-gnu >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >- sh*:Linux:*:*) >- echo ${UNAME_MACHINE}-unknown-linux-gnu >-@@ -968,14 +994,17 @@ >- sparc:Linux:*:* | sparc64:Linux:*:*) >- echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >-+ tile*:Linux:*:*) >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >-+ exit ;; >- vax:Linux:*:*) >- echo ${UNAME_MACHINE}-dec-linux-gnu >- exit ;; >- x86_64:Linux:*:*) >-- echo x86_64-unknown-linux-gnu >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >- xtensa*:Linux:*:*) >-- echo ${UNAME_MACHINE}-unknown-linux-gnu >-+ echo ${UNAME_MACHINE}-unknown-linux-gnu >- exit ;; >- i*86:DYNIX/ptx:4*:*) >- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. >-@@ -984,11 +1013,11 @@ >- echo i386-sequent-sysv4 >- exit ;; >- i*86:UNIX_SV:4.2MP:2.*) >-- # Unixware is an offshoot of SVR4, but it has its own version >-- # number series starting with 2... >-- # I am not positive that other SVR4 systems won't match this, >-+ # Unixware is an offshoot of SVR4, but it has its own version >-+ # number series starting with 2... >-+ # I am not positive that other SVR4 systems won't match this, >- # I just have to hope. -- rms. >-- # Use sysv4.2uw... so that sysv4* matches it. >-+ # Use sysv4.2uw... so that sysv4* matches it. >- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} >- exit ;; >- i*86:OS/2:*:*) >-@@ -1020,7 +1049,7 @@ >- fi >- exit ;; >- i*86:*:5:[678]*) >-- # UnixWare 7.x, OpenUNIX and OpenServer 6. >-+ # UnixWare 7.x, OpenUNIX and OpenServer 6. >- case `/bin/uname -X | grep "^Machine"` in >- *486*) UNAME_MACHINE=i486 ;; >- *Pentium) UNAME_MACHINE=i586 ;; >-@@ -1048,13 +1077,13 @@ >- exit ;; >- pc:*:*:*) >- # Left here for compatibility: >-- # uname -m prints for DJGPP always 'pc', but it prints nothing about >-- # the processor, so we play safe by assuming i586. >-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about >-+ # the processor, so we play safe by assuming i586. >- # Note: whatever this is, it MUST be the same as what config.sub >- # prints for the "djgpp" host, or else GDB configury will decide that >- # this is a cross-build. >- echo i586-pc-msdosdjgpp >-- exit ;; >-+ exit ;; >- Intel:Mach:3*:*) >- echo i386-pc-mach3 >- exit ;; >-@@ -1089,8 +1118,8 @@ >- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ >- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; >- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) >-- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ >-- && { echo i486-ncr-sysv4; exit; } ;; >-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ >-+ && { echo i486-ncr-sysv4; exit; } ;; >- NCR*:*:4.2:* | MPRAS*:*:4.2:*) >- OS_REL='.3' >- test -r /etc/.relid \ >-@@ -1133,10 +1162,10 @@ >- echo ns32k-sni-sysv >- fi >- exit ;; >-- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort >-- # says <Richard.M.Bartel@ccMail.Census.GOV> >-- echo i586-unisys-sysv4 >-- exit ;; >-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort >-+ # says <Richard.M.Bartel@ccMail.Census.GOV> >-+ echo i586-unisys-sysv4 >-+ exit ;; >- *:UNIX_System_V:4*:FTX*) >- # From Gerald Hewes <hewes@openmarket.com>. >- # How about differentiating between stratus architectures? -djm >-@@ -1162,11 +1191,11 @@ >- exit ;; >- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) >- if [ -d /usr/nec ]; then >-- echo mips-nec-sysv${UNAME_RELEASE} >-+ echo mips-nec-sysv${UNAME_RELEASE} >- else >-- echo mips-unknown-sysv${UNAME_RELEASE} >-+ echo mips-unknown-sysv${UNAME_RELEASE} >- fi >-- exit ;; >-+ exit ;; >- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. >- echo powerpc-be-beos >- exit ;; >-@@ -1179,6 +1208,9 @@ >- BePC:Haiku:*:*) # Haiku running on Intel PC compatible. >- echo i586-pc-haiku >- exit ;; >-+ x86_64:Haiku:*:*) >-+ echo x86_64-unknown-haiku >-+ exit ;; >- SX-4:SUPER-UX:*:*) >- echo sx4-nec-superux${UNAME_RELEASE} >- exit ;; >-@@ -1231,7 +1263,10 @@ >- *:QNX:*:4*) >- echo i386-pc-qnx >- exit ;; >-- NSE-?:NONSTOP_KERNEL:*:*) >-+ NEO-?:NONSTOP_KERNEL:*:*) >-+ echo neo-tandem-nsk${UNAME_RELEASE} >-+ exit ;; >-+ NSE-*:NONSTOP_KERNEL:*:*) >- echo nse-tandem-nsk${UNAME_RELEASE} >- exit ;; >- NSR-?:NONSTOP_KERNEL:*:*) >-@@ -1276,13 +1311,13 @@ >- echo pdp10-unknown-its >- exit ;; >- SEI:*:*:SEIUX) >-- echo mips-sei-seiux${UNAME_RELEASE} >-+ echo mips-sei-seiux${UNAME_RELEASE} >- exit ;; >- *:DragonFly:*:*) >- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` >- exit ;; >- *:*VMS:*:*) >-- UNAME_MACHINE=`(uname -p) 2>/dev/null` >-+ UNAME_MACHINE=`(uname -p) 2>/dev/null` >- case "${UNAME_MACHINE}" in >- A*) echo alpha-dec-vms ; exit ;; >- I*) echo ia64-dec-vms ; exit ;; >-@@ -1300,11 +1335,11 @@ >- i*86:AROS:*:*) >- echo ${UNAME_MACHINE}-pc-aros >- exit ;; >-+ x86_64:VMkernel:*:*) >-+ echo ${UNAME_MACHINE}-unknown-esx >-+ exit ;; >- esac >- >--#echo '(No uname command or uname output not recognized.)' 1>&2 >--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 >-- >- eval $set_cc_for_build >- cat >$dummy.c <<EOF >- #ifdef _SEQUENT_ >-@@ -1322,11 +1357,11 @@ >- #include <sys/param.h> >- printf ("m68k-sony-newsos%s\n", >- #ifdef NEWSOS4 >-- "4" >-+ "4" >- #else >-- "" >-+ "" >- #endif >-- ); exit (0); >-+ ); exit (0); >- #endif >- #endif >- >-diff -urN OpenIPMI-2.0.19/config.sub OpenIPMI-2.0.19-aarch64/config.sub >---- OpenIPMI-2.0.19/config.sub 2010-05-09 08:32:53.000000000 -0500 >-+++ OpenIPMI-2.0.19-aarch64/config.sub 2013-03-03 06:56:09.276031637 -0600 >-@@ -1,10 +1,10 @@ >- #! /bin/sh >- # Configuration validation subroutine script. >- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, >--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 >--# Free Software Foundation, Inc. >-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, >-+# 2011, 2012 Free Software Foundation, Inc. >- >--timestamp='2010-01-22' >-+timestamp='2012-10-10' >- >- # This file is (in principle) common to ALL GNU software. >- # The presence of a machine in this file suggests that SOME GNU software >-@@ -21,9 +21,7 @@ >- # GNU General Public License for more details. >- # >- # You should have received a copy of the GNU General Public License >--# along with this program; if not, write to the Free Software >--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA >--# 02110-1301, USA. >-+# along with this program; if not, see <http://www.gnu.org/licenses/>. >- # >- # As a special exception to the GNU General Public License, if you >- # distribute this file as part of a program that contains a >-@@ -76,8 +74,8 @@ >- GNU config.sub ($timestamp) >- >- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, >--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free >--Software Foundation, Inc. >-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 >-+Free Software Foundation, Inc. >- >- This is free software; see the source for copying conditions. There is NO >- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." >-@@ -124,13 +122,18 @@ >- # Here we must recognize all the valid KERNEL-OS combinations. >- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` >- case $maybe_os in >-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ >-- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ >-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ >-+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ >-+ knetbsd*-gnu* | netbsd*-gnu* | \ >- kopensolaris*-gnu* | \ >- storm-chaos* | os2-emx* | rtmk-nova*) >- os=-$maybe_os >- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` >- ;; >-+ android-linux) >-+ os=-linux-android >-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown >-+ ;; >- *) >- basic_machine=`echo $1 | sed 's/-[^-]*$//'` >- if [ $basic_machine != $1 ] >-@@ -153,12 +156,12 @@ >- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ >- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ >- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ >-- -apple | -axis | -knuth | -cray | -microblaze) >-+ -apple | -axis | -knuth | -cray | -microblaze*) >- os= >- basic_machine=$1 >- ;; >-- -bluegene*) >-- os=-cnk >-+ -bluegene*) >-+ os=-cnk >- ;; >- -sim | -cisco | -oki | -wec | -winbond) >- os= >-@@ -174,10 +177,10 @@ >- os=-chorusos >- basic_machine=$1 >- ;; >-- -chorusrdb) >-- os=-chorusrdb >-+ -chorusrdb) >-+ os=-chorusrdb >- basic_machine=$1 >-- ;; >-+ ;; >- -hiux*) >- os=-hiuxwe2 >- ;; >-@@ -222,6 +225,12 @@ >- -isc*) >- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` >- ;; >-+ -lynx*178) >-+ os=-lynxos178 >-+ ;; >-+ -lynx*5) >-+ os=-lynxos5 >-+ ;; >- -lynx*) >- os=-lynxos >- ;; >-@@ -246,20 +255,25 @@ >- # Some are omitted here because they have special meanings below. >- 1750a | 580 \ >- | a29k \ >-+ | aarch64 | aarch64_be \ >- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ >- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ >- | am33_2.0 \ >- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ >-+ | be32 | be64 \ >- | bfin \ >- | c4x | clipper \ >- | d10v | d30v | dlx | dsp16xx \ >-+ | epiphany \ >- | fido | fr30 | frv \ >- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ >-+ | hexagon \ >- | i370 | i860 | i960 | ia64 \ >- | ip2k | iq2000 \ >-+ | le32 | le64 \ >- | lm32 \ >- | m32c | m32r | m32rle | m68000 | m68k | m88k \ >-- | maxq | mb | microblaze | mcore | mep | metag \ >-+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ >- | mips | mipsbe | mipseb | mipsel | mipsle \ >- | mips16 \ >- | mips64 | mips64el \ >-@@ -282,29 +296,39 @@ >- | moxie \ >- | mt \ >- | msp430 \ >-+ | nds32 | nds32le | nds32be \ >- | nios | nios2 \ >- | ns16k | ns32k \ >-+ | open8 \ >- | or32 \ >- | pdp10 | pdp11 | pj | pjl \ >-- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ >-+ | powerpc | powerpc64 | powerpc64le | powerpcle \ >- | pyramid \ >-- | rx \ >-+ | rl78 | rx \ >- | score \ >- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ >- | sh64 | sh64le \ >- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ >- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ >-- | spu | strongarm \ >-- | tahoe | thumb | tic4x | tic80 | tron \ >-+ | spu \ >-+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ >- | ubicom32 \ >-- | v850 | v850e \ >-+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ >- | we32k \ >-- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ >-+ | x86 | xc16x | xstormy16 | xtensa \ >- | z8k | z80) >- basic_machine=$basic_machine-unknown >- ;; >-- m6811 | m68hc11 | m6812 | m68hc12 | picochip) >-- # Motorola 68HC11/12. >-+ c54x) >-+ basic_machine=tic54x-unknown >-+ ;; >-+ c55x) >-+ basic_machine=tic55x-unknown >-+ ;; >-+ c6x) >-+ basic_machine=tic6x-unknown >-+ ;; >-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) >- basic_machine=$basic_machine-unknown >- os=-none >- ;; >-@@ -314,6 +338,21 @@ >- basic_machine=mt-unknown >- ;; >- >-+ strongarm | thumb | xscale) >-+ basic_machine=arm-unknown >-+ ;; >-+ xgate) >-+ basic_machine=$basic_machine-unknown >-+ os=-none >-+ ;; >-+ xscaleeb) >-+ basic_machine=armeb-unknown >-+ ;; >-+ >-+ xscaleel) >-+ basic_machine=armel-unknown >-+ ;; >-+ >- # We use `pc' rather than `unknown' >- # because (1) that's what they normally are, and >- # (2) the word "unknown" tends to confuse beginning users. >-@@ -328,25 +367,30 @@ >- # Recognize the basic CPU types with company name. >- 580-* \ >- | a29k-* \ >-+ | aarch64-* | aarch64_be-* \ >- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ >- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ >- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ >- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ >- | avr-* | avr32-* \ >-+ | be32-* | be64-* \ >- | bfin-* | bs2000-* \ >-- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ >-+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ >- | clipper-* | craynv-* | cydra-* \ >- | d10v-* | d30v-* | dlx-* \ >- | elxsi-* \ >- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ >- | h8300-* | h8500-* \ >- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ >-+ | hexagon-* \ >- | i*86-* | i860-* | i960-* | ia64-* \ >- | ip2k-* | iq2000-* \ >-+ | le32-* | le64-* \ >- | lm32-* \ >- | m32c-* | m32r-* | m32rle-* \ >- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ >-- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ >-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ >-+ | microblaze-* | microblazeel-* \ >- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ >- | mips16-* \ >- | mips64-* | mips64el-* \ >-@@ -368,26 +412,29 @@ >- | mmix-* \ >- | mt-* \ >- | msp430-* \ >-+ | nds32-* | nds32le-* | nds32be-* \ >- | nios-* | nios2-* \ >- | none-* | np1-* | ns16k-* | ns32k-* \ >-+ | open8-* \ >- | orion-* \ >- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ >-- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ >-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ >- | pyramid-* \ >-- | romp-* | rs6000-* | rx-* \ >-+ | rl78-* | romp-* | rs6000-* | rx-* \ >- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ >- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ >- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ >- | sparclite-* \ >-- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ >-- | tahoe-* | thumb-* \ >-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ >-+ | tahoe-* \ >- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ >-- | tile-* | tilegx-* \ >-+ | tile*-* \ >- | tron-* \ >- | ubicom32-* \ >-- | v850-* | v850e-* | vax-* \ >-+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ >-+ | vax-* \ >- | we32k-* \ >-- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ >-+ | x86-* | x86_64-* | xc16x-* | xps100-* \ >- | xstormy16-* | xtensa*-* \ >- | ymp-* \ >- | z8k-* | z80-*) >-@@ -412,7 +459,7 @@ >- basic_machine=a29k-amd >- os=-udi >- ;; >-- abacus) >-+ abacus) >- basic_machine=abacus-unknown >- ;; >- adobe68k) >-@@ -482,11 +529,20 @@ >- basic_machine=powerpc-ibm >- os=-cnk >- ;; >-+ c54x-*) >-+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` >-+ ;; >-+ c55x-*) >-+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` >-+ ;; >-+ c6x-*) >-+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` >-+ ;; >- c90) >- basic_machine=c90-cray >- os=-unicos >- ;; >-- cegcc) >-+ cegcc) >- basic_machine=arm-unknown >- os=-cegcc >- ;; >-@@ -518,7 +574,7 @@ >- basic_machine=craynv-cray >- os=-unicosmp >- ;; >-- cr16) >-+ cr16 | cr16-*) >- basic_machine=cr16-unknown >- os=-elf >- ;; >-@@ -676,7 +732,6 @@ >- i370-ibm* | ibm*) >- basic_machine=i370-ibm >- ;; >--# I'm not sure what "Sysv32" means. Should this be sysv3.2? >- i*86v32) >- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` >- os=-sysv32 >-@@ -734,9 +789,13 @@ >- basic_machine=ns32k-utek >- os=-sysv >- ;; >-- microblaze) >-+ microblaze*) >- basic_machine=microblaze-xilinx >- ;; >-+ mingw64) >-+ basic_machine=x86_64-pc >-+ os=-mingw64 >-+ ;; >- mingw32) >- basic_machine=i386-pc >- os=-mingw32 >-@@ -773,10 +832,18 @@ >- ms1-*) >- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` >- ;; >-+ msys) >-+ basic_machine=i386-pc >-+ os=-msys >-+ ;; >- mvs) >- basic_machine=i370-ibm >- os=-mvs >- ;; >-+ nacl) >-+ basic_machine=le32-unknown >-+ os=-nacl >-+ ;; >- ncr3000) >- basic_machine=i486-ncr >- os=-sysv4 >-@@ -841,6 +908,12 @@ >- np1) >- basic_machine=np1-gould >- ;; >-+ neo-tandem) >-+ basic_machine=neo-tandem >-+ ;; >-+ nse-tandem) >-+ basic_machine=nse-tandem >-+ ;; >- nsr-tandem) >- basic_machine=nsr-tandem >- ;; >-@@ -923,9 +996,10 @@ >- ;; >- power) basic_machine=power-ibm >- ;; >-- ppc) basic_machine=powerpc-unknown >-+ ppc | ppcbe) basic_machine=powerpc-unknown >- ;; >-- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` >-+ ppc-* | ppcbe-*) >-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` >- ;; >- ppcle | powerpclittle | ppc-le | powerpc-little) >- basic_machine=powerpcle-unknown >-@@ -1019,6 +1093,9 @@ >- basic_machine=i860-stratus >- os=-sysv4 >- ;; >-+ strongarm-* | thumb-*) >-+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` >-+ ;; >- sun2) >- basic_machine=m68000-sun >- ;; >-@@ -1075,25 +1152,8 @@ >- basic_machine=t90-cray >- os=-unicos >- ;; >-- tic54x | c54x*) >-- basic_machine=tic54x-unknown >-- os=-coff >-- ;; >-- tic55x | c55x*) >-- basic_machine=tic55x-unknown >-- os=-coff >-- ;; >-- tic6x | c6x*) >-- basic_machine=tic6x-unknown >-- os=-coff >-- ;; >-- # This must be matched before tile*. >-- tilegx*) >-- basic_machine=tilegx-unknown >-- os=-linux-gnu >-- ;; >- tile*) >-- basic_machine=tile-unknown >-+ basic_machine=$basic_machine-unknown >- os=-linux-gnu >- ;; >- tx39) >-@@ -1163,6 +1223,9 @@ >- xps | xps100) >- basic_machine=xps100-honeywell >- ;; >-+ xscale-* | xscalee[bl]-*) >-+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` >-+ ;; >- ymp) >- basic_machine=ymp-cray >- os=-unicos >-@@ -1260,11 +1323,11 @@ >- if [ x"$os" != x"" ] >- then >- case $os in >-- # First match some system type aliases >-- # that might get confused with valid system types. >-+ # First match some system type aliases >-+ # that might get confused with valid system types. >- # -solaris* is a basic system type, with this one exception. >-- -auroraux) >-- os=-auroraux >-+ -auroraux) >-+ os=-auroraux >- ;; >- -solaris1 | -solaris1.*) >- os=`echo $os | sed -e 's|solaris1|sunos4|'` >-@@ -1294,14 +1357,15 @@ >- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ >- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ >- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ >-- | -openbsd* | -solidbsd* \ >-+ | -bitrig* | -openbsd* | -solidbsd* \ >- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ >- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ >- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ >- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ >- | -chorusos* | -chorusrdb* | -cegcc* \ >-- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ >-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ >-+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ >-+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ >-+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ >- | -uxpv* | -beos* | -mpeix* | -udk* \ >- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ >- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ >-@@ -1348,7 +1412,7 @@ >- -opened*) >- os=-openedition >- ;; >-- -os400*) >-+ -os400*) >- os=-os400 >- ;; >- -wince*) >-@@ -1397,7 +1461,7 @@ >- -sinix*) >- os=-sysv4 >- ;; >-- -tpf*) >-+ -tpf*) >- os=-tpf >- ;; >- -triton*) >-@@ -1442,8 +1506,8 @@ >- -dicos*) >- os=-dicos >- ;; >-- -nacl*) >-- ;; >-+ -nacl*) >-+ ;; >- -none) >- ;; >- *) >-@@ -1466,10 +1530,10 @@ >- # system, and we'll never get to this point. >- >- case $basic_machine in >-- score-*) >-+ score-*) >- os=-elf >- ;; >-- spu-*) >-+ spu-*) >- os=-elf >- ;; >- *-acorn) >-@@ -1481,8 +1545,20 @@ >- arm*-semi) >- os=-aout >- ;; >-- c4x-* | tic4x-*) >-- os=-coff >-+ c4x-* | tic4x-*) >-+ os=-coff >-+ ;; >-+ hexagon-*) >-+ os=-elf >-+ ;; >-+ tic54x-*) >-+ os=-coff >-+ ;; >-+ tic55x-*) >-+ os=-coff >-+ ;; >-+ tic6x-*) >-+ os=-coff >- ;; >- # This must come before the *-dec entry. >- pdp10-*) >-@@ -1502,14 +1578,11 @@ >- ;; >- m68000-sun) >- os=-sunos3 >-- # This also exists in the configure program, but was not the >-- # default. >-- # os=-sunos4 >- ;; >- m68*-cisco) >- os=-aout >- ;; >-- mep-*) >-+ mep-*) >- os=-elf >- ;; >- mips*-cisco) >-@@ -1536,7 +1609,7 @@ >- *-ibm) >- os=-aix >- ;; >-- *-knuth) >-+ *-knuth) >- os=-mmixware >- ;; >- *-wec) >diff --git a/OpenIPMI.spec b/OpenIPMI.spec >index 00ec55c..562044a 100644 >--- a/OpenIPMI.spec >+++ b/OpenIPMI.spec >@@ -1,5 +1,4 @@ > %global _hardened_build 1 >-# TODO: uses private copy of libedit, should be modified to use system one > > %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} > Summary: IPMI (Intelligent Platform Management Interface) library and tools >@@ -7,7 +6,7 @@ Name: OpenIPMI > %global once %{_localstatedir}/run/%{name}/first_installation > > Version: 2.0.21 >-Release: 1%{?dist} >+Release: 2%{?dist} > License: LGPLv2+ and GPLv2+ or BSD > Group: System Environment/Base > URL: http://sourceforge.net/projects/openipmi/ >@@ -18,21 +17,16 @@ Source3: ipmi.service > Source4: openipmi.modalias > BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel > BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter >-BuildRequires: desktop-file-utils >+BuildRequires: desktop-file-utils libedit-devel > BuildRequires: systemd-units > >-# aarch64 workaround remove once released package's config.sub contains aarch64 >-BuildRequires: automake >-BuildRequires: autoconf >-BuildRequires: libtool >-# aarch64 end >- > Requires(post): systemd-units > Requires(preun): systemd-units > Requires(postun): systemd-units > Requires(post): systemd-sysv > Requires:%{name}-libs = %{version}-%{release} > >+Patch0: OpenIPMI-2.0.21-system-libedit.patch > Patch1: OpenIPMI-2.0.18-pthread-pkgconfig.patch > Patch2: OpenIPMI-2.0.19-man.patch > >@@ -99,20 +93,17 @@ This package contains a network IPMI listener. > > %prep > %setup -q >+%patch0 -p1 -b .system-libedit >+for file in $(find . -name "*.system-libedit"); do >+ touch -r $file $(basename -s .system-libedit $file) >+done >+rm -r libedit > %patch1 -p1 -b .pthread > %patch2 -p1 -b .manscan > > %build > export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing" > >-# aarch64 workaround remove once released package's config.sub contains aarch64 >-%{__libtoolize} --copy --force --automake >-%{__aclocal} >-%{__autoheader} >-%{__automake} --add-missing --copy --foreign --force-missing >-%{__autoconf} >-# aarch64 end >- > %configure \ > --with-pythoninstall=%{python_sitearch} \ > --disable-dependency-tracking \ >@@ -197,16 +188,20 @@ fi > %files > %doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ README README.Force README.MotorolaMXP > %config(noreplace) %{_sysconfdir}/sysconfig/ipmi >+%dir %{_sysconfdir}/ipmi >+%config(noreplace) %{_sysconfdir}/ipmi/ipmisim1.emu > %{_libexecdir}/openipmi-helper > %{_bindir}/ipmicmd >-%{_bindir}/ipmilan > %{_bindir}/ipmish >+%{_bindir}/ipmi_sim > %{_bindir}/ipmi_ui > %{_bindir}/openipmicmd > %{_bindir}/openipmish > %{_bindir}/rmcp_ping >+%{_bindir}/sdrcomp > %{_bindir}/solterm > %{_unitdir}/ipmi.service >+%{_mandir}/man1/ipmi_sim* > %{_mandir}/man1/ipmi_ui* > %{_mandir}/man1/openipmicmd* > %{_mandir}/man1/openipmish* >@@ -214,9 +209,9 @@ fi > %{_mandir}/man1/solterm* > %{_mandir}/man1/ipmish* > %{_mandir}/man1/ipmicmd* >+%{_mandir}/man5/ipmi_sim_cmd* > %{_mandir}/man7/ipmi_cmdlang* > %{_mandir}/man7/openipmi_conparms* >-%{_mandir}/man8/ipmilan* > > %files perl > %attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm >@@ -235,8 +230,10 @@ fi > > %files lanserv > %defattr(-,root,root) >+%config(noreplace) %{_sysconfdir}/ipmi/lan.conf > %{_bindir}/ipmilan > %{_libdir}/libIPMIlanserv.so.* >+%{_mandir}/man5/ipmi_lan* > %doc %{_mandir}/man8/ipmilan.8* > > %files modalias >@@ -244,6 +241,12 @@ fi > %{_localstatedir}/run/%{name} > > %changelog >+* Sat Mar 22 2014 Ville Skyttä <ville.skytta@iki.fi> - 2.0.21-2 >+- Use system libedit instead of bundled one >+- Drop no longer needed aarch64 hacks >+- Package all installed files (#1075696) >+- Don't ship lanserv files in main package >+ > * Wed Jan 29 2014 Ledvinka Ales <aledvink@redhat.com> - 2.0.21-1 > - Update to new upstream (fixed case 2nd) release. > >-- >1.8.3.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=877575">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1079635
: 877575