From d4d98083ac70f8c3e8590cc9b17dc69b7e604872 Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 12 Feb 2017 02:36:42 +0300 Subject: [PATCH 1/2] re-enable smcinit (#1421387) --- irda-utils-0.9.18-smcdisable.patch | 24 ------------------------ irda-utils.spec | 11 +++++++---- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 irda-utils-0.9.18-smcdisable.patch diff --git a/irda-utils-0.9.18-smcdisable.patch b/irda-utils-0.9.18-smcdisable.patch deleted file mode 100644 index d07c771..0000000 --- a/irda-utils-0.9.18-smcdisable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nrbu irda-utils-0.9.18/Makefile irda-utils-0.9.18-OK/Makefile ---- irda-utils-0.9.18/Makefile 2011-07-15 20:16:14.000000000 +0400 -+++ irda-utils-0.9.18-OK/Makefile 2011-07-15 20:15:38.000000000 +0400 -@@ -27,7 +27,7 @@ - - TARGET = test - --DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit -+DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump - CFLAGS = -O2 -W -Wall - INCLUDES = -I/usr/include/glib-2.0 -I./include -I. - -diff -Nrbu irda-utils-0.9.18/man/Makefile irda-utils-0.9.18-OK/man/Makefile ---- irda-utils-0.9.18/man/Makefile 2006-07-11 10:16:06.000000000 +0400 -+++ irda-utils-0.9.18-OK/man/Makefile 2011-07-15 20:16:01.000000000 +0400 -@@ -18,7 +18,7 @@ - MANPAGES4=irnet.4.gz - MANPAGES7=irda.7.gz - MANPAGES8=irattach.8.gz irdaping.8.gz irdadump.8.gz irpsion5.8.gz \ -- findchip.8.gz irnetd.8.gz smcinit.8.gz tosh1800-smcinit.8.gz -+ findchip.8.gz irnetd.8.gz - - # Man pages generated by DOCBOOK - SGMLMAN=irattach.8 irdaping.8 irdadump.8 irpsion5.8 findchip.8 diff --git a/irda-utils.spec b/irda-utils.spec index 65118ad..88c2e97 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -3,7 +3,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 23%{?dist} +Release: 25%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -17,7 +17,6 @@ Patch1: irda-utils-0.9.17-rootonly.patch Patch2: irda-utils-0.9.15-rh1.patch Patch3: irda-utils-0.9.16-io.patch Patch4: irda-utils-0.9.17-makefile.patch -Patch5: irda-utils-0.9.18-smcdisable.patch Patch6: irda-utils-0.9.18-root.patch Patch7: irda-utils-0.9.18-man.patch Patch8: irda-utils-0.9.18-PIE.patch @@ -53,7 +52,6 @@ actually implemented outside the kernel. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 gunzip man/irnet.4.gz man/irda.7.gz %patch7 -p1 @@ -119,13 +117,18 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/* %{_bindir}/* %{_mandir}/*/* -#%{_initrddir}/irda %{_unitdir}/* %config(noreplace) %{_sysconfdir}/sysconfig/irda %doc README* etc/ifcfg-irlan0 etc/modprobe.conf.irda %changelog +* Sun Feb 12 2017 Dmitry Butskoy - 0.9.18-25 +- enable smcinit (#1421387) + +* Fri Feb 10 2017 Fedora Release Engineering - 0.9.18-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 0.9.18-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 052052cebea6912e2fc6684c78b5e1d8cb06e5bb Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 13 Feb 2017 04:14:16 +0300 Subject: [PATCH 2/2] actually compile smcinit --- irda-utils-0.9.18-no-inline.patch | 299 ++++++++++++++++++++++++++++++ irda-utils.spec | 12 +- 2 files changed, 308 insertions(+), 3 deletions(-) create mode 100644 irda-utils-0.9.18-no-inline.patch diff --git a/irda-utils-0.9.18-no-inline.patch b/irda-utils-0.9.18-no-inline.patch new file mode 100644 index 0000000..c79ae6b --- /dev/null +++ b/irda-utils-0.9.18-no-inline.patch @@ -0,0 +1,299 @@ +diff -Nrbu irda-utils-0.9.18/irdadump/irdadump.c irda-utils-0.9.18-OK/irdadump/irdadump.c +--- irda-utils-0.9.18/irdadump/irdadump.c 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/irdadump/irdadump.c 2017-02-13 03:42:20.216303403 +0300 +@@ -71,7 +71,7 @@ + * Print current time + * + */ +-inline void print_time(const struct timeval *timev, GString *str) ++void print_time(const struct timeval *timev, GString *str) + { + int s; + +@@ -90,7 +90,7 @@ + * Print the difference in time between this frame and the previous one + * + */ +-inline void print_diff_time(struct timeval *timev, struct timeval *prev_timev, ++void print_diff_time(struct timeval *timev, struct timeval *prev_timev, + GString *str) + { + float diff; +diff -Nrbu irda-utils-0.9.18/irdadump/irdadump.h irda-utils-0.9.18-OK/irdadump/irdadump.h +--- irda-utils-0.9.18/irdadump/irdadump.h 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/irdadump/irdadump.h 2017-02-13 03:41:55.785303429 +0300 +@@ -219,10 +219,10 @@ + guint8 caddr; /* LAP connection address (for garbage collect) */ + }; + +-inline void parse_obex(GNetBuf *buf, GString *str, int cmd); +-inline void parse_irlmp(GNetBuf *buf, GString *str, ++void parse_obex(GNetBuf *buf, GString *str, int cmd); ++void parse_irlmp(GNetBuf *buf, GString *str, + guint8 caddr, int type, int cmd); +-inline void parse_ui_irlmp(GNetBuf *buf, GString *str, int type); ++void parse_ui_irlmp(GNetBuf *buf, GString *str, int type); + void parse_ircomm_params(guint8 clen, GNetBuf *buf, GString *str); + void parse_ircomm_connect(GNetBuf *buf, GString *str); + void parse_ircomm_lmp(GNetBuf *buf, GString *str); +diff -Nrbu irda-utils-0.9.18/irdadump/irlap.c irda-utils-0.9.18-OK/irdadump/irlap.c +--- irda-utils-0.9.18/irdadump/irlap.c 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/irdadump/irlap.c 2017-02-13 03:43:06.858303354 +0300 +@@ -91,7 +91,7 @@ + * Garbage collect destroyes LAP connections + * + */ +-inline void garbage_connection(guint8 caddr) ++void garbage_connection(guint8 caddr) + { + gint i; + +@@ -226,7 +226,7 @@ + * Parse and print the names of the various hint bits if they are set + * + */ +-inline void parse_hints(guint8 *hint, GString *str) ++void parse_hints(guint8 *hint, GString *str) + { + g_string_append(str, "[ "); + if (hint[0] & HINT_PNP) +@@ -261,7 +261,7 @@ + * Exchange station identification frame + * + */ +-inline void parse_xid_frame(guint8 command, guint8 pf, int type, ++void parse_xid_frame(guint8 command, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + struct xid_frame *frame = (struct xid_frame *) buf->data; +@@ -339,7 +339,7 @@ + * Information frames + * + */ +-inline void parse_i_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_i_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + int nr, ns; +@@ -396,7 +396,7 @@ + * Information frames + * + */ +-inline void parse_ui_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_ui_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + /* Remove IrLAP header */ +@@ -417,7 +417,7 @@ + * Frame reject frame + * + */ +-inline void parse_frmr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_frmr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + int nr, ns; +@@ -439,7 +439,7 @@ + * Receive ready frame + * + */ +-inline void parse_rr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_rr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + int nr; +@@ -479,7 +479,7 @@ + * Receive not ready frame + * + */ +-inline void parse_rnr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_rnr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + int nr; +@@ -497,7 +497,7 @@ + * Reject frame + * + */ +-inline void parse_rej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_rej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + int nr; +@@ -515,7 +515,7 @@ + * Selective reject frame + * + */ +-inline void parse_srej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_srej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + int nr; +@@ -533,7 +533,7 @@ + * Unnumbered acknowledgement frame + * + */ +-inline void parse_ua_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_ua_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + struct ua_frame *frame = (struct ua_frame *) buf->data; +@@ -564,7 +564,7 @@ + * Disconnect frame + * + */ +-inline void parse_disc_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_disc_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + /* Kill "unused" warning */ +@@ -582,7 +582,7 @@ + * Disconnected mode frame + * + */ +-inline void parse_dm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_dm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + /* Kill "unused" warning */ +@@ -598,7 +598,7 @@ + * Request disconnect frame + * + */ +-inline void parse_rd_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_rd_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + /* Kill "unused" warning */ +@@ -614,7 +614,7 @@ + * Test frame + * + */ +-inline void parse_test_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_test_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + struct test_frame *frame = (struct test_frame *) buf->data; +@@ -634,7 +634,7 @@ + * Set normal response mode frame + * + */ +-inline void parse_snrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_snrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + struct snrm_frame *frame = (struct snrm_frame *) buf->data; +@@ -671,7 +671,7 @@ + * Request normal response mode + * + */ +-inline void parse_rnrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, ++void parse_rnrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type, + GNetBuf *buf, GString *str) + { + gint32 saddr, daddr; +diff -Nrbu irda-utils-0.9.18/irdadump/irlmp.c irda-utils-0.9.18-OK/irdadump/irlmp.c +--- irda-utils-0.9.18/irdadump/irlmp.c 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/irdadump/irlmp.c 2017-02-13 03:41:45.654303441 +0300 +@@ -47,7 +47,7 @@ + * Try to parse and print the LM-IAS query + * + */ +-inline void parse_iriap_command(GNetBuf *buf, GString *str, guint8 slsap_sel) ++void parse_iriap_command(GNetBuf *buf, GString *str, guint8 slsap_sel) + { + guint8 opcode; + char name[255]; +@@ -193,7 +193,7 @@ + * + * + */ +-inline void parse_iriap_response(GNetBuf *buf, GString *str, guint8 dlsap_sel) ++void parse_iriap_response(GNetBuf *buf, GString *str, guint8 dlsap_sel) + { + guint8 opcode, rsp; + +@@ -239,7 +239,7 @@ + * Parse IrTTP data frame + * + */ +-inline void parse_irnet(GNetBuf *buf, GString *str) ++void parse_irnet(GNetBuf *buf, GString *str) + { + /* Kill "unused" warning */ + buf = buf; +@@ -256,7 +256,7 @@ + * Parse IrTTP data frame + * + */ +-inline void parse_irttp(GNetBuf *buf, GString *str) ++void parse_irttp(GNetBuf *buf, GString *str) + { + g_string_sprintfa(str, "TTP credits=%d ", buf->data[0] & 0x7f); + +@@ -273,7 +273,7 @@ + * Parse IrTTP connect frame + * + */ +-inline void parse_irttp_connect(GNetBuf *buf, GString *str) ++void parse_irttp_connect(GNetBuf *buf, GString *str) + { + guint8 plen, pi, pl; + guint16 tmp_cpu; +@@ -303,7 +303,7 @@ + * Parse IrLMP frame + * + */ +-inline void parse_irlmp(GNetBuf *buf, GString *str, ++void parse_irlmp(GNetBuf *buf, GString *str, + guint8 caddr, int type, int cmd) + { + guint8 slsap_sel, dlsap_sel; +@@ -437,7 +437,7 @@ + * Parse IrLMP frame in UI frame + * + */ +-inline void parse_ui_irlmp(GNetBuf *buf, GString *str, int type) ++void parse_ui_irlmp(GNetBuf *buf, GString *str, int type) + { + guint8 slsap_sel, dlsap_sel; + int ctrl; +diff -Nrbu irda-utils-0.9.18/irdadump/obex.c irda-utils-0.9.18-OK/irdadump/obex.c +--- irda-utils-0.9.18/irdadump/obex.c 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/irdadump/obex.c 2017-02-13 03:42:10.356303414 +0300 +@@ -112,7 +112,7 @@ + * Parse an OBEX put command + * + */ +-inline void parse_obex_headers(GNetBuf *buf, GString *str) ++void parse_obex_headers(GNetBuf *buf, GString *str) + { + struct obex_minimal_frame *frame; + int final; +@@ -179,7 +179,7 @@ + } + } + +-inline void parse_obex_connect(GNetBuf *buf, GString *str) ++void parse_obex_connect(GNetBuf *buf, GString *str) + { + struct obex_connect_frame *frame; + guint16 length; +@@ -210,7 +210,7 @@ + * We also need to parse the anser to GET request properly + * Jean II + */ +-inline void parse_obex_success(GNetBuf *buf, GString *str) ++void parse_obex_success(GNetBuf *buf, GString *str) + { + struct obex_connect_frame *frame; + guint16 length; +@@ -252,7 +252,7 @@ + * Parse OBEX commands and responses + * + */ +-inline void parse_obex(GNetBuf *buf, GString *str, int cmd) ++void parse_obex(GNetBuf *buf, GString *str, int cmd) + { + guint8 opcode; + int len; diff --git a/irda-utils.spec b/irda-utils.spec index 88c2e97..4602c62 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -3,7 +3,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 25%{?dist} +Release: 29%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -20,7 +20,8 @@ Patch4: irda-utils-0.9.17-makefile.patch Patch6: irda-utils-0.9.18-root.patch Patch7: irda-utils-0.9.18-man.patch Patch8: irda-utils-0.9.18-PIE.patch -BuildRequires: glib2-devel +Patch9: irda-utils-0.9.18-no-inline.patch +BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units Requires(post): systemd-units @@ -57,11 +58,12 @@ gunzip man/irnet.4.gz man/irda.7.gz %patch7 -p1 gzip -9 man/irnet.4 man/irda.7 %patch8 -p1 +%patch9 -p1 %build export LDFLAGS="%{?__global_ldflags}" -make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ +make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu89" ROOT="$RPM_BUILD_ROOT" \ LDFLAGS="%{?__global_ldflags}" \ CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -123,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-29 +- add no-inline patch for new compilers +- require pciutils-devel for smcinit + * Sun Feb 12 2017 Dmitry Butskoy - 0.9.18-25 - enable smcinit (#1421387)