From 958c880268d1e141f7596822d027358d7eb44cfa Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:22:19 +0000 Subject: [PATCH 01/95] =?UTF-8?q?auto-import=20changelog=20data=20from=20i?= =?UTF-8?q?rda-utils-0.9.10-9.src.rpm=20Wed=20Aug=2002=202000=20Bill=20Not?= =?UTF-8?q?tingham=20=20-=20fix=20start=20priority=20(?= =?UTF-8?q?345=20isn't=20right...)=20-=20fix=20condrestart=20Sun=20Jul=202?= =?UTF-8?q?3=202000=20Trond=20Eivind=20Glomsr=F8d=20=20-?= =?UTF-8?q?=20source=20files=20from=20/etc/rc.d/init.d=20Sun=20Jul=2023=20?= =?UTF-8?q?2000=20Trond=20Eivind=20Glomsr=F8d=20=20-=20don?= =?UTF-8?q?'t=20prereq=20/etc/init.d=20anymore=20-=20rename=20"rh-status"?= =?UTF-8?q?=20-=20use=20%{=5Ftmppath}=20Sat=20Jul=2015=202000=20Bill=20Not?= =?UTF-8?q?tingham=20=20-=20move=20initscript=20back?= =?UTF-8?q?=20Thu=20Jul=2013=202000=20Prospector=20?= =?UTF-8?q?=20-=20automatic=20rebuild=20Tue=20Jun=2027=202000=20Preston=20?= =?UTF-8?q?Brown=20=20-=20don't=20prereq,=20only=20requ?= =?UTF-8?q?ire=20initscripts=20Mon=20Jun=2026=202000=20Bernhard=20Rosenkra?= =?UTF-8?q?enzer=20=20-=20Fix=20up=20initscripts=20-=20ch?= =?UTF-8?q?kconfigize=20Sun=20Jun=2018=202000=20Matt=20Wilson=20=20-=20rebuilt=20for=20next=20release=20Fri=20Feb=2004=20?= =?UTF-8?q?2000=20Bernhard=20Rosenkraenzer=20=20-=200.9.1?= =?UTF-8?q?0=20-=20add=20docs=20Fri=20Feb=2004=202000=20Bernhard=20Rosenkr?= =?UTF-8?q?aenzer=20=20-=20strip=20libraries=20Mon=20Jan?= =?UTF-8?q?=2031=202000=20Bill=20Nottingham=20=20-=20f?= =?UTF-8?q?ix=20typo=20in=20initscript=20Mon=20Oct=2011=201999=20Cristian?= =?UTF-8?q?=20Gafton=20=20-=20remove=20some=20of=20the?= =?UTF-8?q?=20network=20config=20files=20(and=20hope=20that=20the=20packag?= =?UTF-8?q?e=20will=20=20=20=20=20still=20work=20:-)=20Sun=20Oct=2010=2019?= =?UTF-8?q?99=20Bernhard=20Rosenkraenzer=20=20-=20Add=20th?= =?UTF-8?q?e=20/etc/irda=20directory.=20It's=20needed.=20-=20Add=20the=20/?= =?UTF-8?q?etc/rc.d/init.d/irda=20script=20to=20start=20the=20irda=20daemo?= =?UTF-8?q?n=20-=20chkconfig'ize=20/etc/rc.d/init.d/irda=20Fri=20Sep=2017?= =?UTF-8?q?=201999=20Cristian=20Gafton=20=20-=20build?= =?UTF-8?q?=20for=20RH=206.1=20-=20add=20patch=20to=20make=20the=20damn=20?= =?UTF-8?q?package=20compile=20without=20any=20IrDA=20installed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 1 + irda-utils.spec | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 123 insertions(+) create mode 100644 irda-utils.spec diff --git a/.cvsignore b/.cvsignore index e69de29..278fb1f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +irda-utils-0.9.10.tar.gz diff --git a/irda-utils.spec b/irda-utils.spec new file mode 100644 index 0000000..6f34a06 --- /dev/null +++ b/irda-utils.spec @@ -0,0 +1,121 @@ +Summary: Utilities for infrared communication between devices. +Name: irda-utils +Version: 0.9.10 +Release: 9 +Source: http://www.cs.uit.no/~dagb/irda/irda-utils/irda-utils-%{version}.tar.gz +Patch1: irda-utils-0.9.4-chkconfig.patch +Patch2: irda-utils-typo.patch +Patch3: irda-utils-redhat.patch +Url: http://www.cs.uit.no/~dagb/irda/irda-utils/ +Copyright: GPL +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-root +Prereq: /sbin/chkconfig + +%description +IrDA(TM) (Infrared Data Association) is an industry standard for +wireless, infrared communication between devices. IrDA speeds range +from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices +including laptops, LAN adapters, PDAs, printers, and mobile phones. + +The Linux-IrDA project is a GPL'd implementation, written from +scratch, of the IrDA protocols. Supported IrDA protocols include +IrLAP, IrLMP, IrIAP, IrTTP, IrLPT, IrLAN, IrCOMM and IrOBEX. + +The irda-utils package contains a collection of programs that enable +the use of IrDA protocols. Most IrDA features are implemented in the +kernel, so IrDA support must be enabled in the kernel before any IrDA +tools or programs can be used. Some configuration outside the kernel +is required, however, and some IrDA features, like IrOBEX, are +actually implemented outside the kernel. + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -b .rh + +%build +make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/etc/rc.d/init.d +mkdir -p $RPM_BUILD_ROOT/usr/bin + +make install ROOT="$RPM_BUILD_ROOT" + +%post +/sbin/chkconfig --add irda + +%preun +if [ $1 = 0 ] ; then + /sbin/chkconfig --del irda +fi + +%files +%defattr(-,root,root) +/usr/sbin/* +/usr/bin/* +%dir /etc/irda +%config /etc/irda/network +%config /etc/irda/drivers +%config /etc/rc.d/init.d/irda +%doc README +%doc irattach/README.irattach +%doc irdadump/README.irdadump +%doc irdaping/README.irdaping +%doc irkbd/README.irkbd +%doc tekram/README.tekram + +%changelog +* Wed Aug 2 2000 Bill Nottingham +- fix start priority (345 isn't right...) +- fix condrestart + +* Sun Jul 23 2000 Trond Eivind Glomsrød +- source files from /etc/rc.d/init.d + +* Sun Jul 23 2000 Trond Eivind Glomsrød +- don't prereq /etc/init.d anymore +- rename "rh-status" +- use %%{_tmppath} + +* Sat Jul 15 2000 Bill Nottingham +- move initscript back + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Preston Brown +- don't prereq, only require initscripts + +* Mon Jun 26 2000 Bernhard Rosenkraenzer +- Fix up initscripts +- chkconfigize + +* Sun Jun 18 2000 Matt Wilson +- rebuilt for next release + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- 0.9.10 +- add docs + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- strip libraries + +* Mon Jan 31 2000 Bill Nottingham +- fix typo in initscript + +* Mon Oct 11 1999 Cristian Gafton +- remove some of the network config files (and hope that the package will + still work :-) + +* Sun Oct 10 1999 Bernhard Rosenkraenzer +- Add the /etc/irda directory. It's needed. +- Add the /etc/rc.d/init.d/irda script to start the irda daemon +- chkconfig'ize /etc/rc.d/init.d/irda + +* Fri Sep 17 1999 Cristian Gafton +- build for RH 6.1 +- add patch to make the damn package compile without any IrDA installed. diff --git a/sources b/sources index e69de29..13e1079 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +032ad55f215aac375b6a30084b7372c3 irda-utils-0.9.10.tar.gz From 4a81c79eb365d97cb6c67ed0dbab41453712e335 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:22:24 +0000 Subject: [PATCH 02/95] auto-import changelog data from irda-utils-0.9.13-7.src.rpm Thu Feb 08 2001 Bernhard Rosenkraenzer - Make init scripts more i18n friendly (use $0, $prog) Bugs #26527 and #26550 - Exclude S/390 (they don't have the needed hardware) Mon Feb 05 2001 Bernhard Rosenkraenzer - i18nize init scripts (#26077) Wed Jan 10 2001 Bernhard Rosenkraenzer - chmod -x /etc/sysconfig/irda (#22837) Sat Jan 06 2001 Bernhard Rosenkraenzer - Fix up the init script Mon Dec 25 2000 Bernhard Rosenkraenzer - Get rid of the /etc/modules.conf hack; the entries are in the latest modutils by default. (Bug #22799) - Require modutils >= 2.3.21-4 to make sure the modules.conf hack isn't needed Wed Dec 06 2000 Bernhard Rosenkraenzer - Require modutils >= 2.3.11-5 rather than /etc/modules.conf Tue Dec 05 2000 Bernhard Rosenkraenzer - 0.9.13 Tue Oct 31 2000 Bernhard Rosenkraenzer - Add necessary entries to /etc/modules.conf in %post (Bug #19960) - Update source URL - Fix build with current kernel 2.4 header files Mon Oct 02 2000 Bernhard Rosenkraenzer - make irdadump exit with an error message rather than a segfault when run as non-root - Update URL --- .cvsignore | 2 +- irda-utils-0.9.13-i18n.patch | 33 +++++++++++++++++ irda-utils.spec | 70 ++++++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 irda-utils-0.9.13-i18n.patch diff --git a/.cvsignore b/.cvsignore index 278fb1f..aec247d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -irda-utils-0.9.10.tar.gz +irda-utils-0.9.13.tar.gz diff --git a/irda-utils-0.9.13-i18n.patch b/irda-utils-0.9.13-i18n.patch new file mode 100644 index 0000000..d992045 --- /dev/null +++ b/irda-utils-0.9.13-i18n.patch @@ -0,0 +1,33 @@ +--- irda-utils-0.9.13/etc/irda.rc.i18n Thu Feb 8 14:04:06 2001 ++++ irda-utils-0.9.13/etc/irda.rc Thu Feb 8 14:05:26 2001 +@@ -13,10 +13,11 @@ + # Source IrDA networking configuration. + . /etc/sysconfig/irda + ++prog="IrDA" + + start() { + # Attach irda device +- echo -n "Starting IrDA: " ++ echo -n $"Starting $prog: " + daemon /usr/sbin/irattach ${DEVICE} ${ARGS} + touch /var/lock/subsys/irda + echo +@@ -24,7 +25,7 @@ + + stop() { + # Stop service. +- echo -n "Shutting down IrDA: " ++ echo -n $"Shutting down $prog: " + killproc irattach + rm -f /var/lock/subsys/irda + echo +@@ -62,7 +63,7 @@ + [ -e /var/lock/subsys/irda ] && (stop; start) + ;; + *) +- echo "Usage: irda {start|stop|restart|reload|condrestart|status}" ++ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 1 + esac + diff --git a/irda-utils.spec b/irda-utils.spec index 6f34a06..c61fa1b 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,16 +1,19 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.10 -Release: 9 -Source: http://www.cs.uit.no/~dagb/irda/irda-utils/irda-utils-%{version}.tar.gz -Patch1: irda-utils-0.9.4-chkconfig.patch -Patch2: irda-utils-typo.patch -Patch3: irda-utils-redhat.patch -Url: http://www.cs.uit.no/~dagb/irda/irda-utils/ +Version: 0.9.13 +Release: 7 +Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz +Patch1: irda-utils-0.9.13-chkconfig.patch +Patch2: irda-utils-0.9.13-typo.patch +Patch3: irda-utils-0.9.13-i18n.patch +Patch4: irda-utils-0.9.10-rootonly.patch +Patch5: irda-utils-0.9.10-kernel24.patch +Url: http://irda.sourceforge.net/ Copyright: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-root -Prereq: /sbin/chkconfig +Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4 +ExcludeArch: s390 s390x %description IrDA(TM) (Infrared Data Association) is an industry standard for @@ -31,9 +34,11 @@ actually implemented outside the kernel. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .rh +%patch1 -p1 -b .chkconfig +%patch2 -p1 -b .typo +%patch3 -p1 -b .i18n +%patch4 -p1 -b .root +%patch5 -p1 -b .k24 %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" @@ -44,6 +49,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/usr/bin make install ROOT="$RPM_BUILD_ROOT" +chmod -x $RPM_BUILD_ROOT/etc/sysconfig/irda %post /sbin/chkconfig --add irda @@ -57,18 +63,52 @@ fi %defattr(-,root,root) /usr/sbin/* /usr/bin/* -%dir /etc/irda -%config /etc/irda/network -%config /etc/irda/drivers %config /etc/rc.d/init.d/irda +%config /etc/sysconfig/irda +%config /etc/sysconfig/network-scripts/ifcfg-irlan0 %doc README %doc irattach/README.irattach %doc irdadump/README.irdadump %doc irdaping/README.irdaping -%doc irkbd/README.irkbd %doc tekram/README.tekram %changelog +* Thu Feb 8 2001 Bernhard Rosenkraenzer +- Make init scripts more i18n friendly (use $0, $prog) + Bugs #26527 and #26550 +- Exclude S/390 (they don't have the needed hardware) + +* Mon Feb 5 2001 Bernhard Rosenkraenzer +- i18nize init scripts (#26077) + +* Wed Jan 10 2001 Bernhard Rosenkraenzer +- chmod -x /etc/sysconfig/irda (#22837) + +* Sat Jan 6 2001 Bernhard Rosenkraenzer +- Fix up the init script + +* Mon Dec 25 2000 Bernhard Rosenkraenzer +- Get rid of the /etc/modules.conf hack; the entries are in the + latest modutils by default. (Bug #22799) +- Require modutils >= 2.3.21-4 to make sure the modules.conf hack + isn't needed + +* Wed Dec 6 2000 Bernhard Rosenkraenzer +- Require modutils >= 2.3.11-5 rather than /etc/modules.conf + +* Tue Dec 5 2000 Bernhard Rosenkraenzer +- 0.9.13 + +* Tue Oct 31 2000 Bernhard Rosenkraenzer +- Add necessary entries to /etc/modules.conf in %%post (Bug #19960) +- Update source URL +- Fix build with current kernel 2.4 header files + +* Mon Oct 2 2000 Bernhard Rosenkraenzer +- make irdadump exit with an error message rather than a segfault when + run as non-root +- Update URL + * Wed Aug 2 2000 Bill Nottingham - fix start priority (345 isn't right...) - fix condrestart diff --git a/sources b/sources index 13e1079..c70fb4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -032ad55f215aac375b6a30084b7372c3 irda-utils-0.9.10.tar.gz +c01620dd7df363d2d46e1ee5b90bc23f irda-utils-0.9.13.tar.gz From 1fdef9cdc2747ba0771340e57638ce9e960e032a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:23:04 +0000 Subject: [PATCH 03/95] auto-import changelog data from irda-utils-0.9.14-1.src.rpm Tue Apr 24 2001 Bernhard Rosenkraenzer 0.9.14-1 - 0.9.14-1 --- .cvsignore | 2 +- irda-utils-0.9.14-chkconfig.patch | 73 +++++++++++++++++++++++++++++++ irda-utils-0.9.14-typo.patch | 11 +++++ irda-utils.spec | 13 +++--- sources | 2 +- 5 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 irda-utils-0.9.14-chkconfig.patch create mode 100644 irda-utils-0.9.14-typo.patch diff --git a/.cvsignore b/.cvsignore index aec247d..ea4e13c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -irda-utils-0.9.13.tar.gz +irda-utils-0.9.14.tar.bz2 diff --git a/irda-utils-0.9.14-chkconfig.patch b/irda-utils-0.9.14-chkconfig.patch new file mode 100644 index 0000000..272b278 --- /dev/null +++ b/irda-utils-0.9.14-chkconfig.patch @@ -0,0 +1,73 @@ +--- irda-utils-0.9.14/etc/irda.rc.chkconfig Sun Jan 14 23:12:56 2001 ++++ irda-utils-0.9.14/etc/irda.rc Tue Apr 24 15:43:33 2001 +@@ -3,8 +3,7 @@ + # irda This shell script takes care of starting and stopping + # IrDA support + # +-# chkconfig: 2345 45 96 +-# ++# chkconfig: - 45 96 + # description: IrDA stack for Linux + # + +@@ -14,6 +13,23 @@ + # Source IrDA networking configuration. + . /etc/sysconfig/irda + ++ ++start() { ++ # Attach irda device ++ echo -n "Starting IrDA: " ++ daemon /usr/sbin/irattach ${DEVICE} ${ARGS} ++ touch /var/lock/subsys/irda ++ echo ++} ++ ++stop() { ++ # Stop service. ++ echo -n "Shutting down IrDA: " ++ killproc irattach ++ rm -f /var/lock/subsys/irda ++ echo ++} ++ + # Check that irda is up. + [ ${IRDA} = "no" ] && exit 0 + +@@ -30,28 +46,23 @@ + # See how we were called. + case "$1" in + start) +- # Attach irda device +- echo -n "Starting IrDA: " +- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} +- touch /var/lock/subsys/irda +- echo ++ start + ;; + stop) +- # Stop service. +- echo -n "Shutting down IrDA: " +- killproc irattach +- rm -f /var/lock/subsys/irda +- echo ++ stop + ;; + status) + status irattach + ;; + restart|reload) +- $0 stop +- $0 start ++ stop ++ start ++ ;; ++ condrestart) ++ [ -e /var/lock/subsys/irda ] && (stop; start) + ;; + *) +- echo "Usage: irda {start|stop|restart|reload|status}" ++ echo "Usage: irda {start|stop|restart|reload|condrestart|status}" + exit 1 + esac + diff --git a/irda-utils-0.9.14-typo.patch b/irda-utils-0.9.14-typo.patch new file mode 100644 index 0000000..6f21e2f --- /dev/null +++ b/irda-utils-0.9.14-typo.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.14/etc/irda.rc.typo Tue Apr 24 15:44:12 2001 ++++ irda-utils-0.9.14/etc/irda.rc Tue Apr 24 15:45:17 2001 +@@ -36,7 +36,7 @@ + [ -f /usr/sbin/irattach ] || exit 0 + + ARGS= +-if [ $DONGLE ]; then ++if [ -n "$DONGLE" ]; then + ARGS="$ARGS -d $DONGLE" + fi + if [ "$DISCOVERY" = "yes" ];then diff --git a/irda-utils.spec b/irda-utils.spec index c61fa1b..e2309c1 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,10 +1,10 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.13 -Release: 7 -Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz -Patch1: irda-utils-0.9.13-chkconfig.patch -Patch2: irda-utils-0.9.13-typo.patch +Version: 0.9.14 +Release: 1 +Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 +Patch1: irda-utils-0.9.14-chkconfig.patch +Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch Patch4: irda-utils-0.9.10-rootonly.patch Patch5: irda-utils-0.9.10-kernel24.patch @@ -73,6 +73,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Apr 24 2001 Bernhard Rosenkraenzer 0.9.14-1 +- 0.9.14-1 + * Thu Feb 8 2001 Bernhard Rosenkraenzer - Make init scripts more i18n friendly (use $0, $prog) Bugs #26527 and #26550 diff --git a/sources b/sources index c70fb4a..7376f0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c01620dd7df363d2d46e1ee5b90bc23f irda-utils-0.9.13.tar.gz +4c06411f2db8d4d5b6b9ddddd8962e09 irda-utils-0.9.14.tar.bz2 From 71dd7ca4a72a7c88292f43818dcd3a5ab537f903 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:23:07 +0000 Subject: [PATCH 04/95] auto-import changelog data from irda-utils-0.9.14-2.src.rpm Mon Jul 16 2001 Bernhard Rosenkraenzer 0.9.14-2 - Fix libtool detection (#49093) --- irda-utils.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index e2309c1..c032d76 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,13 +1,14 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.14 -Release: 1 +Release: 2 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch Patch4: irda-utils-0.9.10-rootonly.patch Patch5: irda-utils-0.9.10-kernel24.patch +Patch6: irda-utils-0.9.14-libtool.patch Url: http://irda.sourceforge.net/ Copyright: GPL Group: Applications/System @@ -39,6 +40,7 @@ actually implemented outside the kernel. %patch3 -p1 -b .i18n %patch4 -p1 -b .root %patch5 -p1 -b .k24 +%patch6 -p1 -b .lt %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" @@ -73,6 +75,9 @@ fi %doc tekram/README.tekram %changelog +* Mon Jul 16 2001 Bernhard Rosenkraenzer 0.9.14-2 +- Fix libtool detection (#49093) + * Tue Apr 24 2001 Bernhard Rosenkraenzer 0.9.14-1 - 0.9.14-1 From aa163d2ec27fdecc61e1555fee1d0c8c45b9003a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:23:43 +0000 Subject: [PATCH 05/95] auto-import changelog data from irda-utils-0.9.14-3.src.rpm Thu Apr 04 2002 Bernhard Rosenkraenzer 0.9.14-3 - Stop irda service earlier (#61777) --- irda-utils-0.9.14-chkconfig.patch | 2 +- irda-utils.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/irda-utils-0.9.14-chkconfig.patch b/irda-utils-0.9.14-chkconfig.patch index 272b278..d7d3513 100644 --- a/irda-utils-0.9.14-chkconfig.patch +++ b/irda-utils-0.9.14-chkconfig.patch @@ -6,7 +6,7 @@ # -# chkconfig: 2345 45 96 -# -+# chkconfig: - 45 96 ++# chkconfig: - 45 24 # description: IrDA stack for Linux # diff --git a/irda-utils.spec b/irda-utils.spec index c032d76..4e72e3a 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.14 -Release: 2 +Release: 3 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -10,7 +10,7 @@ Patch4: irda-utils-0.9.10-rootonly.patch Patch5: irda-utils-0.9.10-kernel24.patch Patch6: irda-utils-0.9.14-libtool.patch Url: http://irda.sourceforge.net/ -Copyright: GPL +License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-root Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4 @@ -75,6 +75,9 @@ fi %doc tekram/README.tekram %changelog +* Thu Apr 4 2002 Bernhard Rosenkraenzer 0.9.14-3 +- Stop irda service earlier (#61777) + * Mon Jul 16 2001 Bernhard Rosenkraenzer 0.9.14-2 - Fix libtool detection (#49093) From 111d12e3e6b0f017797befbc474cf468f897f388 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:23:50 +0000 Subject: [PATCH 06/95] auto-import changelog data from irda-utils-0.9.14-5.src.rpm Fri Jun 21 2002 Tim Powers - automated rebuild Thu May 23 2002 Tim Powers - automated rebuild --- irda-utils.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4e72e3a..f41d91a 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.14 -Release: 3 +Release: 5 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -75,6 +75,12 @@ fi %doc tekram/README.tekram %changelog +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + * Thu Apr 4 2002 Bernhard Rosenkraenzer 0.9.14-3 - Stop irda service earlier (#61777) From 548842659993be5f115e233b832180748c0102a3 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:23:53 +0000 Subject: [PATCH 07/95] auto-import changelog data from irda-utils-0.9.14-6.src.rpm Tue Jul 09 2002 Phil Knirsch 0.9.14-6 - Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it to the docs dir. --- irda-utils.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index f41d91a..6927e39 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.14 -Release: 5 +Release: 6 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -53,6 +53,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin make install ROOT="$RPM_BUILD_ROOT" chmod -x $RPM_BUILD_ROOT/etc/sysconfig/irda +rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 + %post /sbin/chkconfig --add irda @@ -67,18 +69,21 @@ fi /usr/bin/* %config /etc/rc.d/init.d/irda %config /etc/sysconfig/irda -%config /etc/sysconfig/network-scripts/ifcfg-irlan0 -%doc README +%doc README etc/ifcfg-irlan0 %doc irattach/README.irattach %doc irdadump/README.irdadump %doc irdaping/README.irdaping %doc tekram/README.tekram %changelog -* Fri Jun 21 2002 Tim Powers +* Tue Jul 09 2002 Phil Knirsch 0.9.14-6 +- Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it + to the docs dir. + +* Fri Jun 21 2002 Tim Powers 0.9.14-5 - automated rebuild -* Thu May 23 2002 Tim Powers +* Thu May 23 2002 Tim Powers 0.9.14-4 - automated rebuild * Thu Apr 4 2002 Bernhard Rosenkraenzer 0.9.14-3 From e1cdb8479807136df685b74169b44cec3798f94d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:23:57 +0000 Subject: [PATCH 08/95] auto-import changelog data from irda-utils-0.9.14-9.src.rpm Wed Jan 22 2003 Tim Powers - rebuilt Mon Dec 16 2002 Dan Walsh 0.9.14-8 - Fixed service script description Mon Dec 09 2002 Phil Knirsch 0.9.14-7 - Fixed problem with %doc entries. --- irda-utils-0.9.14-chkconfig.patch | 14 ++++++++++++++ irda-utils.spec | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/irda-utils-0.9.14-chkconfig.patch b/irda-utils-0.9.14-chkconfig.patch index d7d3513..00ebb0c 100644 --- a/irda-utils-0.9.14-chkconfig.patch +++ b/irda-utils-0.9.14-chkconfig.patch @@ -71,3 +71,17 @@ exit 1 esac +--- irda-utils-0.9.14/etc/irda.rc.chkconfig 2002-12-16 14:01:23.000000000 -0500 ++++ irda-utils-0.9.14/etc/irda.rc 2002-12-16 13:56:11.000000000 -0500 +@@ -4,7 +4,10 @@ + # IrDA support + # + # chkconfig: - 45 24 +-# description: IrDA stack for Linux ++# description: IrDA(TM) (Infrared Data Association) is an industry standard \ ++# for wireless, infrared communication between devices. IrDA speeds range \ ++# from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices \ ++# including laptops, LAN adapters, PDAs, printers, and mobile phones. + # + + # Source function library. diff --git a/irda-utils.spec b/irda-utils.spec index 6927e39..c5fb0bc 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.14 -Release: 6 +Release: 9 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -52,8 +52,11 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin make install ROOT="$RPM_BUILD_ROOT" chmod -x $RPM_BUILD_ROOT/etc/sysconfig/irda - rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 +mv irattach/README irattach/README.irattach +mv irdadump/README irdadump/README.irdadump +mv irdaping/README irdaping/README.irdaping +mv tekram/README tekram/README.tekram %post /sbin/chkconfig --add irda @@ -76,6 +79,15 @@ fi %doc tekram/README.tekram %changelog +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 16 2002 Dan Walsh 0.9.14-8 +- Fixed service script description + +* Mon Dec 09 2002 Phil Knirsch 0.9.14-7 +- Fixed problem with %doc entries. + * Tue Jul 09 2002 Phil Knirsch 0.9.14-6 - Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it to the docs dir. From 3f3ba0c46187f675871aa05393e7f1863fba535a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:24:25 +0000 Subject: [PATCH 09/95] auto-import changelog data from irda-utils-0.9.15-1.1.src.rpm Thu Jul 03 2003 Karsten Hopp 0.9.15-1.1 - rebuilt Wed Jul 02 2003 Karsten Hopp 0.9.15-1 - update - removed libtool patch, it's obsolete now - new root patch Wed Jun 04 2003 Elliot Lee - rebuilt --- .cvsignore | 2 +- irda-utils.spec | 21 +++++++++++++++------ sources | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index ea4e13c..69cb1e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -irda-utils-0.9.14.tar.bz2 +irda-utils-0.9.15.tar.gz diff --git a/irda-utils.spec b/irda-utils.spec index c5fb0bc..0cb2f33 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,14 +1,13 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.14 -Release: 9 -Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.bz2 +Version: 0.9.15 +Release: 1.1 +Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch -Patch4: irda-utils-0.9.10-rootonly.patch +Patch4: irda-utils-0.9.15-rootonly.patch Patch5: irda-utils-0.9.10-kernel24.patch -Patch6: irda-utils-0.9.14-libtool.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -40,7 +39,6 @@ actually implemented outside the kernel. %patch3 -p1 -b .i18n %patch4 -p1 -b .root %patch5 -p1 -b .k24 -%patch6 -p1 -b .lt %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" @@ -79,6 +77,17 @@ fi %doc tekram/README.tekram %changelog +* Thu Jul 03 2003 Karsten Hopp 0.9.15-1.1 +- rebuilt + +* Wed Jul 02 2003 Karsten Hopp 0.9.15-1 +- update +- removed libtool patch, it's obsolete now +- new root patch + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + * Wed Jan 22 2003 Tim Powers - rebuilt diff --git a/sources b/sources index 7376f0f..23d11ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c06411f2db8d4d5b6b9ddddd8962e09 irda-utils-0.9.14.tar.bz2 +b69b75464d6ee72e6600a8459d9b68ac irda-utils-0.9.15.tar.gz From c6c765096547f6359941349c3a79d177e753029f Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:25:02 +0000 Subject: [PATCH 10/95] auto-import changelog data from irda-utils-0.9.15-2.src.rpm Mon Nov 24 2003 Karsten Hopp 0.9.15-2 - fix array usage (#110791) Sun Oct 19 2003 Florian La Roche - add a %clean specfile target --- irda-utils.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 0cb2f33..987e31d 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,13 +1,14 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.15 -Release: 1.1 +Release: 2 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch Patch4: irda-utils-0.9.15-rootonly.patch Patch5: irda-utils-0.9.10-kernel24.patch +Patch6: irda-utils-0.9.15-rh1.spec Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -56,6 +57,9 @@ mv irdadump/README irdadump/README.irdadump mv irdaping/README irdaping/README.irdaping mv tekram/README tekram/README.tekram +%clean +rm -rf $RPM_BUILD_ROOT + %post /sbin/chkconfig --add irda @@ -77,6 +81,12 @@ fi %doc tekram/README.tekram %changelog +* Mon Nov 24 2003 Karsten Hopp 0.9.15-2 +- fix array usage (#110791) + +* Sun Oct 19 2003 Florian La Roche +- add a %%clean specfile target + * Thu Jul 03 2003 Karsten Hopp 0.9.15-1.1 - rebuilt From 3356de0c7a008cf1a880a1ae40176830a817ddd2 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:25:04 +0000 Subject: [PATCH 11/95] auto-import changelog data from irda-utils-0.9.15-3.src.rpm Sat Jan 24 2004 Florian La Roche - do not use *.spec as filename for a patch --- irda-utils-0.9.15-rh1.patch | 11 +++++++++++ irda-utils.spec | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 irda-utils-0.9.15-rh1.patch diff --git a/irda-utils-0.9.15-rh1.patch b/irda-utils-0.9.15-rh1.patch new file mode 100644 index 0000000..6e4bfca --- /dev/null +++ b/irda-utils-0.9.15-rh1.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.15/irattach/irattach.c.rh1 2003-11-24 17:30:21.000000000 +0100 ++++ irda-utils-0.9.15/irattach/irattach.c 2003-11-24 17:34:51.000000000 +0100 +@@ -614,7 +614,7 @@ + /* First arg is device name. Save it now, because in some cases + * getopt() will remove it... */ + strncpy(device, argv[1], 20); +- device[20] = '\0'; ++ device[19] = '\0'; + + /* Look for options */ + /* Do this before processing device, to handle "-h" and -v" diff --git a/irda-utils.spec b/irda-utils.spec index 987e31d..2374b18 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,14 +1,14 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.15 -Release: 2 +Release: 3 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch Patch4: irda-utils-0.9.15-rootonly.patch Patch5: irda-utils-0.9.10-kernel24.patch -Patch6: irda-utils-0.9.15-rh1.spec +Patch6: irda-utils-0.9.15-rh1.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -81,6 +81,9 @@ fi %doc tekram/README.tekram %changelog +* Sat Jan 24 2004 Florian La Roche +- do not use *.spec as filename for a patch + * Mon Nov 24 2003 Karsten Hopp 0.9.15-2 - fix array usage (#110791) From e2cc823f47d79038bae0f15bd019219939894fba Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:25:55 +0000 Subject: [PATCH 12/95] auto-import changelog data from irda-utils-0.9.15-5.src.rpm Wed Feb 18 2004 Karsten Hopp 0.9.15-5 - add manpages (#115972) Fri Feb 13 2004 Elliot Lee - rebuilt --- irda-utils.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 2374b18..6224445 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.15 -Release: 3 +Release: 5 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -49,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/usr/bin -make install ROOT="$RPM_BUILD_ROOT" +%makeinstall ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" chmod -x $RPM_BUILD_ROOT/etc/sysconfig/irda rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 mv irattach/README irattach/README.irattach @@ -72,6 +72,7 @@ fi %defattr(-,root,root) /usr/sbin/* /usr/bin/* +%{_mandir}/man?/* %config /etc/rc.d/init.d/irda %config /etc/sysconfig/irda %doc README etc/ifcfg-irlan0 @@ -81,6 +82,12 @@ fi %doc tekram/README.tekram %changelog +* Wed Feb 18 2004 Karsten Hopp 0.9.15-5 +- add manpages (#115972) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + * Sat Jan 24 2004 Florian La Roche - do not use *.spec as filename for a patch From 162d3cfe89c5a20869fc40a9bb6a0e2813df436c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:25:58 +0000 Subject: [PATCH 13/95] auto-import changelog data from irda-utils-0.9.16-1.src.rpm Wed Jun 02 2004 Karsten Hopp 0.9.16-1 - update --- .cvsignore | 2 +- irda-utils.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 69cb1e9..047e675 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -irda-utils-0.9.15.tar.gz +irda-utils-0.9.16.tar.gz diff --git a/irda-utils.spec b/irda-utils.spec index 6224445..b50375b 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,14 +1,13 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.15 -Release: 5 +Version: 0.9.16 +Release: 1 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch -Patch4: irda-utils-0.9.15-rootonly.patch -Patch5: irda-utils-0.9.10-kernel24.patch -Patch6: irda-utils-0.9.15-rh1.patch +Patch4: irda-utils-0.9.16-rootonly.patch +Patch5: irda-utils-0.9.15-rh1.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -39,7 +38,7 @@ actually implemented outside the kernel. %patch2 -p1 -b .typo %patch3 -p1 -b .i18n %patch4 -p1 -b .root -%patch5 -p1 -b .k24 +%patch5 -p1 -b .rh1 %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" @@ -82,6 +81,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Jun 02 2004 Karsten Hopp 0.9.16-1 +- update + * Wed Feb 18 2004 Karsten Hopp 0.9.15-5 - add manpages (#115972) diff --git a/sources b/sources index 23d11ee..ceae803 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b69b75464d6ee72e6600a8459d9b68ac irda-utils-0.9.15.tar.gz +2ff18f0571b5a331be7cd22fc3decd41 irda-utils-0.9.16.tar.gz From 716718f18e19281d3085452da0acffd6ac1afe85 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:26:02 +0000 Subject: [PATCH 14/95] auto-import changelog data from irda-utils-0.9.16-2.src.rpm Tue Jun 15 2004 Elliot Lee - rebuilt --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index b50375b..8c7c863 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 1 +Release: 2 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -81,6 +81,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Jun 15 2004 Elliot Lee +- rebuilt + * Wed Jun 02 2004 Karsten Hopp 0.9.16-1 - update From 57cd966858fe3126be2f4095fb5ad8fce2ae3b5a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 4 Oct 2004 08:57:07 +0000 Subject: [PATCH 15/95] - load irda modules to make it work with udev (#134322) --- irda-utils-0.9.16-rh2.patch | 11 +++++++++++ irda-utils.spec | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 irda-utils-0.9.16-rh2.patch diff --git a/irda-utils-0.9.16-rh2.patch b/irda-utils-0.9.16-rh2.patch new file mode 100644 index 0000000..7fd0a2c --- /dev/null +++ b/irda-utils-0.9.16-rh2.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.16/etc/irda.rc.rh2 2004-10-04 12:49:46.016198784 +0200 ++++ irda-utils-0.9.16/etc/irda.rc 2004-10-04 12:50:24.128404848 +0200 +@@ -21,6 +21,8 @@ + start() { + # Attach irda device + echo -n $"Starting $prog: " ++ /sbin/modprobe ircomm-tty 2>/dev/null ++ /sbin/modprobe irnet 2>/dev/null + daemon /usr/sbin/irattach ${DEVICE} ${ARGS} + touch /var/lock/subsys/irda + echo diff --git a/irda-utils.spec b/irda-utils.spec index 8c7c863..2c3e4e0 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,13 +1,14 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 2 +Release: 3 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch Patch4: irda-utils-0.9.16-rootonly.patch Patch5: irda-utils-0.9.15-rh1.patch +Patch6: irda-utils-0.9.16-rh2.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -39,6 +40,7 @@ actually implemented outside the kernel. %patch3 -p1 -b .i18n %patch4 -p1 -b .root %patch5 -p1 -b .rh1 +%patch6 -p1 -b .rh2 %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" @@ -55,6 +57,7 @@ mv irattach/README irattach/README.irattach mv irdadump/README irdadump/README.irdadump mv irdaping/README irdaping/README.irdaping mv tekram/README tekram/README.tekram +mv etc/modules.conf.irda etc/modprobe.conf.irda %clean rm -rf $RPM_BUILD_ROOT @@ -74,13 +77,16 @@ fi %{_mandir}/man?/* %config /etc/rc.d/init.d/irda %config /etc/sysconfig/irda -%doc README etc/ifcfg-irlan0 +%doc README etc/ifcfg-irlan0 etc/modprobe.conf.irda %doc irattach/README.irattach %doc irdadump/README.irdadump %doc irdaping/README.irdaping %doc tekram/README.tekram %changelog +* Mon Oct 04 2004 Karsten Hopp 0.9.16-3 +- load irda modules to make it work with udev (#134322) + * Tue Jun 15 2004 Elliot Lee - rebuilt From bebcd486a518249b2484815d0cbd0b81a66eacfd Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 2 Feb 2005 13:23:26 +0000 Subject: [PATCH 16/95] - use glib2 instead of glib (#136223) --- irda-utils.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 2c3e4e0..b3dff7f 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 3 +Release: 4 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -9,6 +9,7 @@ Patch3: irda-utils-0.9.13-i18n.patch Patch4: irda-utils-0.9.16-rootonly.patch Patch5: irda-utils-0.9.15-rh1.patch Patch6: irda-utils-0.9.16-rh2.patch +Patch7: irda-utils-0.9.16-glib2.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -41,6 +42,7 @@ actually implemented outside the kernel. %patch4 -p1 -b .root %patch5 -p1 -b .rh1 %patch6 -p1 -b .rh2 +%patch7 -p1 -b .glib2 %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" @@ -84,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Feb 02 2005 Karsten Hopp 0.9.16-4 +- use glib2 instead of glib (#136223) + * Mon Oct 04 2004 Karsten Hopp 0.9.16-3 - load irda modules to make it work with udev (#134322) From 58b7e1868472e1665636b5ebaa86ef1a1f8d49b5 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 15 Feb 2005 09:36:25 +0000 Subject: [PATCH 17/95] - load irtty-sir module (#148750) --- irda-utils-0.9.16-rh2.patch | 3 ++- irda-utils.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/irda-utils-0.9.16-rh2.patch b/irda-utils-0.9.16-rh2.patch index 7fd0a2c..512caf1 100644 --- a/irda-utils-0.9.16-rh2.patch +++ b/irda-utils-0.9.16-rh2.patch @@ -1,10 +1,11 @@ --- irda-utils-0.9.16/etc/irda.rc.rh2 2004-10-04 12:49:46.016198784 +0200 +++ irda-utils-0.9.16/etc/irda.rc 2004-10-04 12:50:24.128404848 +0200 -@@ -21,6 +21,8 @@ +@@ -21,6 +21,9 @@ start() { # Attach irda device echo -n $"Starting $prog: " + /sbin/modprobe ircomm-tty 2>/dev/null ++ /sbin/modprobe irtty-sir 2>/dev/null + /sbin/modprobe irnet 2>/dev/null daemon /usr/sbin/irattach ${DEVICE} ${ARGS} touch /var/lock/subsys/irda diff --git a/irda-utils.spec b/irda-utils.spec index b3dff7f..5bacec4 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 4 +Release: 5 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -86,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Feb 15 2005 Karsten Hopp 0.9.16-5 +- load irtty-sir module (#148750) + * Wed Feb 02 2005 Karsten Hopp 0.9.16-4 - use glib2 instead of glib (#136223) From d3eb897a828c9c700b845ae8b9c197fea0b46f06 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 15 Feb 2005 15:38:40 +0000 Subject: [PATCH 18/95] - use RPM_OPT_FLAGS as CFLAGS --- irda-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 5bacec4..42d75d1 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 5 +Release: 6 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -45,7 +45,7 @@ actually implemented outside the kernel. %patch7 -p1 -b .glib2 %build -make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" +make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -86,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Feb 15 2005 Karsten Hopp 0.9.16-6 +- use RPM_OPT_FLAGS as CFLAGS + * Tue Feb 15 2005 Karsten Hopp 0.9.16-5 - load irtty-sir module (#148750) From d68252c84945e6c077704120d43528a66a7d489b Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 2 Mar 2005 11:45:07 +0000 Subject: [PATCH 19/95] - build with gcc-4 --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 42d75d1..4a54804 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 6 +Release: 7 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -86,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Mar 02 2005 Karsten Hopp 0.9.16-7 +- build with gcc-4 + * Tue Feb 15 2005 Karsten Hopp 0.9.16-6 - use RPM_OPT_FLAGS as CFLAGS From 5e42d18d35d0fee38fd812206e48be35fa176801 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 9 Dec 2005 22:41:01 +0000 Subject: [PATCH 20/95] gcc update bump --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4a54804..c652a29 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 7 +Release: 7.1 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -86,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Wed Mar 02 2005 Karsten Hopp 0.9.16-7 - build with gcc-4 From aa50eeecf85e32ca50edc16860bf60850b3ba015 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 7 Feb 2006 12:18:30 +0000 Subject: [PATCH 21/95] bump for new gcc/glibc --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index c652a29..58503cc 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 7.1 +Release: 7.2 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -86,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Feb 07 2006 Jesse Keating - 0.9.16-7.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + * Fri Dec 09 2005 Jesse Keating - rebuilt From c4c6dcfa511380300b07e83f69f8a4f4a47ff0c6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 11 Feb 2006 03:39:11 +0000 Subject: [PATCH 22/95] bump for bug in double-long on ppc(64) --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 58503cc..c3c7e1b 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 7.2 +Release: 7.2.1 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -86,6 +86,9 @@ fi %doc tekram/README.tekram %changelog +* Fri Feb 10 2006 Jesse Keating - 0.9.16-7.2.1 +- bump again for double-long bug on ppc(64) + * Tue Feb 07 2006 Jesse Keating - 0.9.16-7.2 - rebuilt for new gcc4.1 snapshot and glibc changes From 5500be9a81bcd6818a1b9263337b53f499233068 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 3 Apr 2006 09:14:19 +0000 Subject: [PATCH 23/95] - don't use asm/io.h directly (Bastien Nocera #186875) --- irda-utils-0.9.16-io.patch | 35 +++++++++++++++++++++++++++++++++++ irda-utils.spec | 8 +++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 irda-utils-0.9.16-io.patch diff --git a/irda-utils-0.9.16-io.patch b/irda-utils-0.9.16-io.patch new file mode 100644 index 0000000..fdbfcae --- /dev/null +++ b/irda-utils-0.9.16-io.patch @@ -0,0 +1,35 @@ +diff -upr irda-utils-0.9.16/findchip/nsc.c irda-utils-0.9.16.new/findchip/nsc.c +--- irda-utils-0.9.16/findchip/nsc.c 2003-07-07 21:33:37.000000000 -0400 ++++ irda-utils-0.9.16.new/findchip/nsc.c 2006-03-24 07:16:14.000000000 -0500 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "findchip.h" + +diff -upr irda-utils-0.9.16/findchip/smc.c irda-utils-0.9.16.new/findchip/smc.c +--- irda-utils-0.9.16/findchip/smc.c 2003-07-07 21:33:37.000000000 -0400 ++++ irda-utils-0.9.16.new/findchip/smc.c 2006-03-24 07:14:19.000000000 -0500 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #include "findchip.h" + +diff -upr irda-utils-0.9.16/findchip/winbond.c irda-utils-0.9.16.new/findchip/winbond.c +--- irda-utils-0.9.16/findchip/winbond.c 2000-11-06 16:11:39.000000000 -0500 ++++ irda-utils-0.9.16.new/findchip/winbond.c 2006-03-24 07:16:29.000000000 -0500 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #include "findchip.h" diff --git a/irda-utils.spec b/irda-utils.spec index c3c7e1b..4360cb7 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.16 -Release: 7.2.1 +Release: 8 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch @@ -10,12 +10,14 @@ Patch4: irda-utils-0.9.16-rootonly.patch Patch5: irda-utils-0.9.15-rh1.patch Patch6: irda-utils-0.9.16-rh2.patch Patch7: irda-utils-0.9.16-glib2.patch +Patch8: irda-utils-0.9.16-io.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-root Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4 ExcludeArch: s390 s390x +BuildRequires: glib2-devel %description IrDA(TM) (Infrared Data Association) is an industry standard for @@ -43,6 +45,7 @@ actually implemented outside the kernel. %patch5 -p1 -b .rh1 %patch6 -p1 -b .rh2 %patch7 -p1 -b .glib2 +%patch8 -p1 -b .io %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS" @@ -86,6 +89,9 @@ fi %doc tekram/README.tekram %changelog +* Mon Apr 03 2006 Karsten Hopp 0.9.16-8 +- don't use asm/io.h directly (Bastien Nocera #186875) + * Fri Feb 10 2006 Jesse Keating - 0.9.16-7.2.1 - bump again for double-long bug on ppc(64) From 64c9f75bbf25103e04af0050cfd6407f10ffe83c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 19 Jun 2006 14:12:16 +0000 Subject: [PATCH 24/95] - update to 0.9.17 - makefile fixes - disable smcinit - use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted --- .cvsignore | 1 + irda-utils-0.9.17-makefile.patch | 90 ++++++++++++++++++++++++++++++ irda-utils-0.9.17-rootonly.patch | 14 +++++ irda-utils-0.9.17-smcdisable.patch | 11 ++++ irda-utils.spec | 47 ++++++++++------ sources | 3 +- 6 files changed, 149 insertions(+), 17 deletions(-) create mode 100644 irda-utils-0.9.17-makefile.patch create mode 100644 irda-utils-0.9.17-rootonly.patch create mode 100644 irda-utils-0.9.17-smcdisable.patch diff --git a/.cvsignore b/.cvsignore index 047e675..d3be3d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ irda-utils-0.9.16.tar.gz +irda-utils-0.9.17-manpages.tgz diff --git a/irda-utils-0.9.17-makefile.patch b/irda-utils-0.9.17-makefile.patch new file mode 100644 index 0000000..3de3baa --- /dev/null +++ b/irda-utils-0.9.17-makefile.patch @@ -0,0 +1,90 @@ +--- irda-utils-0.9.17/irdadump/Makefile.rh3 2006-03-09 07:25:23.000000000 +0100 ++++ irda-utils-0.9.17/irdadump/Makefile 2006-06-01 14:47:25.000000000 +0200 +@@ -8,8 +8,8 @@ + + RM_CMD = $(ECMD)$(RM) *.BAK *.bak *.o ,* *~ *.a + +-INCLUDES = $(SYS_INCLUDES) -I../include/ +-LIBRARIES = $(SYS_LIBRARIES) ++INCLUDES = $(SYS_INCLUDES) -I../include/ -I. `pkg-config --cflags glib-2.0` ++LIBRARIES = $(SYS_LIBRARIES) `pkg-config --cflags --libs glib-2.0` + LIBPATH = $(SYS_LIBPATH) + + # +@@ -27,7 +27,7 @@ + LIBIRDADUMP_TARGET = lib_irdadump.a + IRDADUMP_TARGET = irdadump + +-all: lib_irdadump.a irdadump ++all: irdadump lib_irdadump.a + + + lib_irdadump.a: $(LIBIRDADUMP_OBJS) +@@ -40,7 +40,8 @@ + + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ $(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ #$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + + + .c.o: +--- irda-utils-0.9.17/irnetd/Makefile.rh3 2006-03-09 07:25:19.000000000 +0100 ++++ irda-utils-0.9.17/irnetd/Makefile 2006-06-01 14:47:25.000000000 +0200 +@@ -55,7 +55,7 @@ + + install: irnetd + $(prn_install) +- $(ECMD) install irnetd /usr/sbin/ ++ $(ECMD) install irnetd $(ROOT)/usr/sbin/ + + + clean: +--- irda-utils-0.9.17/Makefile.rh3 2006-03-09 07:25:27.000000000 +0100 ++++ irda-utils-0.9.17/Makefile 2006-06-01 14:48:21.000000000 +0200 +@@ -28,10 +28,11 @@ + TARGET = test + + DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit +-CFLAGS= -O2 -W -Wall ++CFLAGS = -O2 -W -Wall ++INCLUDES = -I/usr/include/glib-2.0 -I./include -I. + + all: +- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done) ++ @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(INCLUDES) $(MAKE_OUTPUT) -C $$d $@ ; done) + + + install: +--- irda-utils-0.9.17/psion/Makefile.rh3 2006-03-09 07:25:19.000000000 +0100 ++++ irda-utils-0.9.17/psion/Makefile 2006-06-01 14:47:25.000000000 +0200 +@@ -5,6 +5,7 @@ + PSION_SRC= irpsion5.c + PSION_OBJS= irpsion5.o + PSION_TARGETS= irpsion5 ++CFLAGS= -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) + + all: $(PSION_TARGETS) + +@@ -22,7 +23,6 @@ + $(ECMD)install $(PSION_TARGETS) $(ROOT)/usr/bin + + +-CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) + irpsion5: + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ +\ Kein Zeilenumbruch am Dateiende. ++ $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ +--- irda-utils-0.9.17/smcinit/smcinit.c.rh3 2006-03-09 07:25:24.000000000 +0100 ++++ irda-utils-0.9.17/smcinit/smcinit.c 2006-06-01 14:47:25.000000000 +0200 +@@ -262,7 +262,7 @@ + */ + struct pci_access *acc; + struct pci_dev *dev; +- word twobyte; ++ u16 twobyte; + int i = 0, chip = 0; + int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma; + unsigned int *address, SMC_BASE = 0; diff --git a/irda-utils-0.9.17-rootonly.patch b/irda-utils-0.9.17-rootonly.patch new file mode 100644 index 0000000..2f0c78a --- /dev/null +++ b/irda-utils-0.9.17-rootonly.patch @@ -0,0 +1,14 @@ +--- irda-utils-0.9.17/irdadump/main.c.root 2006-06-01 12:53:34.000000000 +0200 ++++ irda-utils-0.9.17/irdadump/main.c 2006-06-01 12:54:03.000000000 +0200 +@@ -72,6 +72,11 @@ + char *readfilename = NULL; + int fd, c; + ++ if(geteuid()) { ++ puts("You need to be root to run this utility.\n"); ++ return 1; ++ } ++ + while ((c = getopt(argc, argv, "bc:di:lpr:s:tvw:x?")) != -1) { + switch (c) { + case 'b': /* Dumb bytes */ diff --git a/irda-utils-0.9.17-smcdisable.patch b/irda-utils-0.9.17-smcdisable.patch new file mode 100644 index 0000000..e45d890 --- /dev/null +++ b/irda-utils-0.9.17-smcdisable.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.17/Makefile.smcdisable 2006-06-01 14:49:01.000000000 +0200 ++++ irda-utils-0.9.17/Makefile 2006-06-01 14:48:52.000000000 +0200 +@@ -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 --git a/irda-utils.spec b/irda-utils.spec index 4360cb7..e60c029 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,23 +1,29 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.16 -Release: 8 -Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz +Version: 0.9.17 +Release: 1 +# Download-URL: +# http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download +Source: irda-utils-%{version}.tar.gz +# Temporary, until upstream releases a tarball with fixed manpages. These +# have been extracted from irda-utils-0.9.17-pre3 +Source1: irda-utils-%{version}-manpages.tgz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch -Patch4: irda-utils-0.9.16-rootonly.patch +Patch4: irda-utils-0.9.17-rootonly.patch Patch5: irda-utils-0.9.15-rh1.patch Patch6: irda-utils-0.9.16-rh2.patch -Patch7: irda-utils-0.9.16-glib2.patch -Patch8: irda-utils-0.9.16-io.patch +Patch7: irda-utils-0.9.16-io.patch +Patch8: irda-utils-0.9.17-makefile.patch +Patch9: irda-utils-0.9.17-smcdisable.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-root Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4 ExcludeArch: s390 s390x -BuildRequires: glib2-devel +BuildRequires: glib2-devel, libtool, automake, docbook-utils %description IrDA(TM) (Infrared Data Association) is an industry standard for @@ -38,14 +44,17 @@ actually implemented outside the kernel. %prep %setup -q -%patch1 -p1 -b .chkconfig -%patch2 -p1 -b .typo -%patch3 -p1 -b .i18n -%patch4 -p1 -b .root -%patch5 -p1 -b .rh1 -%patch6 -p1 -b .rh2 -%patch7 -p1 -b .glib2 -%patch8 -p1 -b .io +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 -b .rh3 +%patch9 -p1 +echo $PWD +tar xvf %{SOURCE1} %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS" @@ -65,7 +74,7 @@ mv tekram/README tekram/README.tekram mv etc/modules.conf.irda etc/modprobe.conf.irda %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add irda @@ -89,6 +98,12 @@ fi %doc tekram/README.tekram %changelog +* Mon Jun 19 2006 Karsten Hopp 0.9.17-1 +- update to 0.9.17 +- makefile fixes +- disable smcinit +- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted + * Mon Apr 03 2006 Karsten Hopp 0.9.16-8 - don't use asm/io.h directly (Bastien Nocera #186875) diff --git a/sources b/sources index ceae803..a2d720b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -2ff18f0571b5a331be7cd22fc3decd41 irda-utils-0.9.16.tar.gz +65f9be306d2367996e27264ef0b70bd4 irda-utils-0.9.17.tar.gz +77686ddf12ee1ec1b4f1a48586d6a9d3 irda-utils-0.9.17-manpages.tgz From 3ee2ed86dd15f982fa010d1e5984f8d2e4af2059 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 19 Jun 2006 14:15:32 +0000 Subject: [PATCH 25/95] upload new tarball --- .cvsignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index d3be3d7..4dac2cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -irda-utils-0.9.16.tar.gz +irda-utils-0.9.17.tar.gz irda-utils-0.9.17-manpages.tgz From 17b6e91ec40061496da966d438d6b0ee8f9fe974 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 06:26:32 +0000 Subject: [PATCH 26/95] bumped for rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index e60c029..0e67f13 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.17 -Release: 1 +Release: 1.1 # Download-URL: # http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download Source: irda-utils-%{version}.tar.gz @@ -98,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Jul 12 2006 Jesse Keating - 0.9.17-1.1 +- rebuild + * Mon Jun 19 2006 Karsten Hopp 0.9.17-1 - update to 0.9.17 - makefile fixes From d6276563acdcd3d26b49bf5c419e648bb0044399 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 1 Aug 2006 12:44:21 +0000 Subject: [PATCH 27/95] - initscript fix from Paul Bolle (#168325) --- irda-utils-0.9.17-initscript.patch | 31 ++++++++++++++++++++++++++++++ irda-utils.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 irda-utils-0.9.17-initscript.patch diff --git a/irda-utils-0.9.17-initscript.patch b/irda-utils-0.9.17-initscript.patch new file mode 100644 index 0000000..074546e --- /dev/null +++ b/irda-utils-0.9.17-initscript.patch @@ -0,0 +1,31 @@ +--- irda-utils-0.9.17/etc/irda.rc.rh1 2006-08-01 14:39:44.000000000 +0200 ++++ irda-utils-0.9.17/etc/irda.rc 2006-08-01 14:40:02.000000000 +0200 +@@ -24,16 +24,15 @@ + /sbin/modprobe ircomm-tty 2>/dev/null + /sbin/modprobe irtty-sir 2>/dev/null + /sbin/modprobe irnet 2>/dev/null +- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} +- touch /var/lock/subsys/irda ++ daemon /usr/sbin/irattach ${DEVICE} ${ARGS} ++ [ -f /var/run/irattach.pid ] && success $"irattach startup" || failure $"irattach startup" + echo + } + + stop() { + # Stop service. + echo -n $"Shutting down $prog: " +- killproc irattach +- rm -f /var/lock/subsys/irda ++ [ -f /var/run/irattach.pid ] && killproc irattach || success $"irattach shutdown" + echo + } + +@@ -66,7 +65,7 @@ + start + ;; + condrestart) +- [ -e /var/lock/subsys/irda ] && (stop; start) ++ [ -e /var/run/irdattach.pid ] && (stop; start) + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" diff --git a/irda-utils.spec b/irda-utils.spec index 0e67f13..3b6ac83 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.17 -Release: 1.1 +Release: 2 # Download-URL: # http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download Source: irda-utils-%{version}.tar.gz @@ -17,6 +17,7 @@ Patch6: irda-utils-0.9.16-rh2.patch Patch7: irda-utils-0.9.16-io.patch Patch8: irda-utils-0.9.17-makefile.patch Patch9: irda-utils-0.9.17-smcdisable.patch +Patch10: irda-utils-0.9.17-initscript.patch Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -53,6 +54,7 @@ actually implemented outside the kernel. %patch7 -p1 %patch8 -p1 -b .rh3 %patch9 -p1 +%patch10 -p1 echo $PWD tar xvf %{SOURCE1} @@ -98,6 +100,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Aug 01 2006 Karsten Hopp 0.9.17-2 +- initscript fix from Paul Bolle (#168325) + * Wed Jul 12 2006 Jesse Keating - 0.9.17-1.1 - rebuild From e7924e256cb0295fc68419bb558cfc278a71e4db Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 1 Aug 2006 12:45:21 +0000 Subject: [PATCH 28/95] - use disttag --- irda-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 3b6ac83..27ea480 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils Version: 0.9.17 -Release: 2 +Release: 2%{?dist} # Download-URL: # http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download Source: irda-utils-%{version}.tar.gz From 6572bf0a3451e74de172869cfbdcb513eaf031a4 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 23 Jan 2007 10:46:25 +0000 Subject: [PATCH 29/95] - update to 0.9.18 --- .cvsignore | 3 +-- irda-utils-0.9.17-makefile.patch | 11 ----------- irda-utils.spec | 12 +++++------- sources | 3 +-- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4dac2cf..1e58d0a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -irda-utils-0.9.17.tar.gz -irda-utils-0.9.17-manpages.tgz +irda-utils-0.9.18.tar.gz diff --git a/irda-utils-0.9.17-makefile.patch b/irda-utils-0.9.17-makefile.patch index 3de3baa..b0d7625 100644 --- a/irda-utils-0.9.17-makefile.patch +++ b/irda-utils-0.9.17-makefile.patch @@ -77,14 +77,3 @@ - $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ \ Kein Zeilenumbruch am Dateiende. + $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ ---- irda-utils-0.9.17/smcinit/smcinit.c.rh3 2006-03-09 07:25:24.000000000 +0100 -+++ irda-utils-0.9.17/smcinit/smcinit.c 2006-06-01 14:47:25.000000000 +0200 -@@ -262,7 +262,7 @@ - */ - struct pci_access *acc; - struct pci_dev *dev; -- word twobyte; -+ u16 twobyte; - int i = 0, chip = 0; - int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma; - unsigned int *address, SMC_BASE = 0; diff --git a/irda-utils.spec b/irda-utils.spec index 27ea480..917ee40 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,13 +1,10 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.17 -Release: 2%{?dist} +Version: 0.9.18 +Release: 1%{?dist} # Download-URL: # http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download Source: irda-utils-%{version}.tar.gz -# Temporary, until upstream releases a tarball with fixed manpages. These -# have been extracted from irda-utils-0.9.17-pre3 -Source1: irda-utils-%{version}-manpages.tgz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch @@ -55,8 +52,6 @@ actually implemented outside the kernel. %patch8 -p1 -b .rh3 %patch9 -p1 %patch10 -p1 -echo $PWD -tar xvf %{SOURCE1} %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS" @@ -100,6 +95,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Jan 23 2007 Karsten Hopp 0.9.18-1 +- update to 0.9.18 + * Tue Aug 01 2006 Karsten Hopp 0.9.17-2 - initscript fix from Paul Bolle (#168325) diff --git a/sources b/sources index a2d720b..40b238c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -65f9be306d2367996e27264ef0b70bd4 irda-utils-0.9.17.tar.gz -77686ddf12ee1ec1b4f1a48586d6a9d3 irda-utils-0.9.17-manpages.tgz +84dc12aa4c3f61fccb8d8919bf4079bb irda-utils-0.9.18.tar.gz From a0be554b3a4559d82a7359128d5fa6afe66bc630 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 21 Feb 2007 12:02:38 +0000 Subject: [PATCH 30/95] review cleanups --- irda-utils.spec | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 917ee40..4b566d6 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,16 @@ -Summary: Utilities for infrared communication between devices. -Name: irda-utils -Version: 0.9.18 -Release: 1%{?dist} +Summary: Utilities for infrared communication between devices +Name: irda-utils +Version: 0.9.18 +Release: 2%{?dist} +Url: http://irda.sourceforge.net/ +License: GPL +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: s390 s390x +BuildRequires: glib2-devel, libtool, automake, docbook-utils +Requires: grep, modutils >= 2.3.21-4 +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig # Download-URL: # http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download Source: irda-utils-%{version}.tar.gz @@ -15,13 +24,6 @@ Patch7: irda-utils-0.9.16-io.patch Patch8: irda-utils-0.9.17-makefile.patch Patch9: irda-utils-0.9.17-smcdisable.patch Patch10: irda-utils-0.9.17-initscript.patch -Url: http://irda.sourceforge.net/ -License: GPL -Group: Applications/System -BuildRoot: %{_tmppath}/%{name}-root -Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4 -ExcludeArch: s390 s390x -BuildRequires: glib2-devel, libtool, automake, docbook-utils %description IrDA(TM) (Infrared Data Association) is an industry standard for @@ -49,21 +51,22 @@ actually implemented outside the kernel. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -b .rh3 +%patch8 -p1 %patch9 -p1 %patch10 -p1 %build -make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS" +make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ + CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/usr/bin -%makeinstall ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" -chmod -x $RPM_BUILD_ROOT/etc/sysconfig/irda -rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 +make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" +chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-irlan0 mv irattach/README irattach/README.irattach mv irdadump/README irdadump/README.irdadump mv irdaping/README irdaping/README.irdaping @@ -86,8 +89,8 @@ fi /usr/sbin/* /usr/bin/* %{_mandir}/man?/* -%config /etc/rc.d/init.d/irda -%config /etc/sysconfig/irda +%config %{_sysconfdir}/rc.d/init.d/irda +%config %{_sysconfdir}/sysconfig/irda %doc README etc/ifcfg-irlan0 etc/modprobe.conf.irda %doc irattach/README.irattach %doc irdadump/README.irdadump @@ -95,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Feb 21 2007 Karsten Hopp 0.9.18-2 +- review cleanups + * Tue Jan 23 2007 Karsten Hopp 0.9.18-1 - update to 0.9.18 From 60c81e3795b314fde8a235f21ba045c8cbd9908c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 29 Aug 2007 10:07:22 +0000 Subject: [PATCH 31/95] - rebuild for buildid --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4b566d6..f41a0a5 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 2%{?dist} +Release: 3%{?dist} Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -98,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Aug 29 2007 Karsten Hopp 0.9.18-3 +- rebuild for buildid + * Wed Feb 21 2007 Karsten Hopp 0.9.18-2 - review cleanups From 725406ab708243c423b5282a6440ed37d4d05a6a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:53:34 +0000 Subject: [PATCH 32/95] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 46901db..fb6f61a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: irda-utils -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 06:22:17 cvsdist Exp $ NAME := irda-utils SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From d40b0070571a91a299095cbe9c503f9d27f090c8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 09:58:18 +0000 Subject: [PATCH 33/95] - Autorebuild for GCC 4.3 --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index f41a0a5..33fefac 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 3%{?dist} +Release: 4%{?dist} Url: http://irda.sourceforge.net/ License: GPL Group: Applications/System @@ -98,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.18-4 +- Autorebuild for GCC 4.3 + * Wed Aug 29 2007 Karsten Hopp 0.9.18-3 - rebuild for buildid From 726c698adfe188ad4cff07f3471b897bf03822f0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 31 Jul 2008 21:15:50 +0000 Subject: [PATCH 34/95] fix license tag --- irda-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 33fefac..9e5b854 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,9 +1,9 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 4%{?dist} +Release: 5%{?dist} Url: http://irda.sourceforge.net/ -License: GPL +License: GPLv2+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x @@ -98,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.9.18-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.9.18-4 - Autorebuild for GCC 4.3 From 19f24697db95702ac6b6a008cf5c4245e31a5f35 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 1 Dec 2008 15:50:47 +0000 Subject: [PATCH 35/95] - use macros, fix Source0 --- irda-utils.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 9e5b854..535b851 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 5%{?dist} +Release: 6%{?dist} Url: http://irda.sourceforge.net/ License: GPLv2+ Group: Applications/System @@ -11,9 +11,7 @@ BuildRequires: glib2-devel, libtool, automake, docbook-utils Requires: grep, modutils >= 2.3.21-4 Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -# Download-URL: -# http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download -Source: irda-utils-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch @@ -61,8 +59,8 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/etc/rc.d/init.d -mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/%{_initddir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda @@ -89,7 +87,7 @@ fi /usr/sbin/* /usr/bin/* %{_mandir}/man?/* -%config %{_sysconfdir}/rc.d/init.d/irda +%config %{_initddir}/irda %config %{_sysconfdir}/sysconfig/irda %doc README etc/ifcfg-irlan0 etc/modprobe.conf.irda %doc irattach/README.irattach @@ -98,6 +96,9 @@ fi %doc tekram/README.tekram %changelog +* Mon Dec 01 2008 Karsten Hopp 0.9.18-6 +- use macros, fix Source0 + * Thu Jul 31 2008 Tom "spot" Callaway - 0.9.18-5 - fix license tag From b9ae58712f8b33722a2abdf706a8cd0b391e2235 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 08:01:49 +0000 Subject: [PATCH 36/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 535b851..6ed713a 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 6%{?dist} +Release: 7%{?dist} Url: http://irda.sourceforge.net/ License: GPLv2+ Group: Applications/System @@ -96,6 +96,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 01 2008 Karsten Hopp 0.9.18-6 - use macros, fix Source0 From ceb16844b3bfa018ce8046ff6323eebe89fc1780 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 03:36:27 +0000 Subject: [PATCH 37/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 6ed713a..d40f100 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 7%{?dist} +Release: 8%{?dist} Url: http://irda.sourceforge.net/ License: GPLv2+ Group: Applications/System @@ -96,6 +96,9 @@ fi %doc tekram/README.tekram %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.9.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.9.18-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e6c531c65c0f302f14fa17cb2cafe5bc44e6166c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 10 Aug 2009 08:47:58 +0000 Subject: [PATCH 38/95] - Convert specfile to UTF-8. --- irda-utils.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index d40f100..a2dfbe3 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 8%{?dist} +Release: 9%{?dist} Url: http://irda.sourceforge.net/ License: GPLv2+ Group: Applications/System @@ -96,6 +96,9 @@ fi %doc tekram/README.tekram %changelog +* Mon Aug 10 2009 Ville Skyttä - 0.9.18-9 +- Convert specfile to UTF-8. + * Fri Jul 24 2009 Fedora Release Engineering - 0.9.18-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -259,10 +262,10 @@ fi - fix start priority (345 isn't right...) - fix condrestart -* Sun Jul 23 2000 Trond Eivind Glomsrød +* Sun Jul 23 2000 Trond Eivind Glomsrød - source files from /etc/rc.d/init.d -* Sun Jul 23 2000 Trond Eivind Glomsrød +* Sun Jul 23 2000 Trond Eivind Glomsrød - don't prereq /etc/init.d anymore - rename "rh-status" - use %%{_tmppath} From 21efb3757e554366fe8e8aae9c4b3cdc7401b66c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 20 Oct 2009 16:28:47 +0000 Subject: [PATCH 39/95] - Add patch to fix installing of initscript into buildroot --- irda-utils-0.9.18-root.patch | 15 +++++++++++++++ irda-utils.spec | 9 +++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 irda-utils-0.9.18-root.patch diff --git a/irda-utils-0.9.18-root.patch b/irda-utils-0.9.18-root.patch new file mode 100644 index 0000000..770cae2 --- /dev/null +++ b/irda-utils-0.9.18-root.patch @@ -0,0 +1,15 @@ +--- irda-utils-0.9.18/etc/install-etc.root 2006-07-11 00:16:06.000000000 -0600 ++++ irda-utils-0.9.18/etc/install-etc 2009-10-20 10:11:39.691877856 -0600 +@@ -1,10 +1,10 @@ + #!/bin/sh + + # Only install on SYSV for now +-if [ -d /etc/sysconfig/ ]; then ++if [ -d $ROOT/etc/sysconfig/ ]; then + install -D irda.sysconfig $ROOT/etc/sysconfig/irda + install -D ifcfg-irlan0 $ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 + fi +-if [ -d /etc/rc.d/init.d ]; then ++if [ -d $ROOT/etc/rc.d/init.d ]; then + install -D irda.rc $ROOT/etc/rc.d/init.d/irda + fi diff --git a/irda-utils.spec b/irda-utils.spec index a2dfbe3..2ee9e5d 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 9%{?dist} +Release: 10%{?dist} Url: http://irda.sourceforge.net/ License: GPLv2+ Group: Applications/System @@ -22,6 +22,7 @@ Patch7: irda-utils-0.9.16-io.patch Patch8: irda-utils-0.9.17-makefile.patch Patch9: irda-utils-0.9.17-smcdisable.patch Patch10: irda-utils-0.9.17-initscript.patch +Patch11: irda-utils-0.9.18-root.patch %description IrDA(TM) (Infrared Data Association) is an industry standard for @@ -52,6 +53,7 @@ actually implemented outside the kernel. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ @@ -60,7 +62,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/%{_initddir} -mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda @@ -96,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Tue Oct 20 2009 Orion Poplawski - 0.9.18-10 +- Add patch to fix installing of initscript into buildroot + * Mon Aug 10 2009 Ville Skyttä - 0.9.18-9 - Convert specfile to UTF-8. From 6f2ffd722a4b4beb0d85f47d035742fde772f508 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:40:41 +0000 Subject: [PATCH 40/95] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fb6f61a..7e4ccf5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: irda-utils -# $Id: Makefile,v 1.1 2004/09/09 06:22:17 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:53:34 notting Exp $ NAME := irda-utils SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e1d4da57f097f03b0367549a4f67fb16e22795fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:27:38 +0000 Subject: [PATCH 41/95] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7e4ccf5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: irda-utils -# $Id: Makefile,v 1.2 2007/10/15 18:53:34 notting Exp $ -NAME := irda-utils -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From a65a8f214b5ca05cfb6b7b5734552662489d9d75 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 07:09:19 -0600 Subject: [PATCH 42/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 2ee9e5d..a0f214a 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 10%{?dist} +Release: 11%{?dist} Url: http://irda.sourceforge.net/ License: GPLv2+ Group: Applications/System @@ -98,6 +98,9 @@ fi %doc tekram/README.tekram %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.9.18-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Oct 20 2009 Orion Poplawski - 0.9.18-10 - Add patch to fix installing of initscript into buildroot From 4f82efe912e6687c57551225306e8f3245b75775 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Fri, 15 Jul 2011 21:17:04 +0400 Subject: [PATCH 43/95] Spec file cleanup, own init script and fix for #242468, #668122, #675677 --- irda-utils-0.9.13-i18n.patch | 33 --------- irda-utils-0.9.14-chkconfig.patch | 87 ---------------------- irda-utils-0.9.14-typo.patch | 11 --- irda-utils-0.9.16-rh2.patch | 12 ---- irda-utils-0.9.17-initscript.patch | 31 -------- irda-utils-0.9.17-smcdisable.patch | 11 --- irda-utils-0.9.18-man.patch | 94 ++++++++++++++++++++++++ irda-utils-0.9.18-smcdisable.patch | 24 +++++++ irda-utils.spec | 111 ++++++++++++++++++----------- irda.init | 80 +++++++++++++++++++++ 10 files changed, 266 insertions(+), 228 deletions(-) delete mode 100644 irda-utils-0.9.13-i18n.patch delete mode 100644 irda-utils-0.9.14-chkconfig.patch delete mode 100644 irda-utils-0.9.14-typo.patch delete mode 100644 irda-utils-0.9.16-rh2.patch delete mode 100644 irda-utils-0.9.17-initscript.patch delete mode 100644 irda-utils-0.9.17-smcdisable.patch create mode 100644 irda-utils-0.9.18-man.patch create mode 100644 irda-utils-0.9.18-smcdisable.patch create mode 100644 irda.init diff --git a/irda-utils-0.9.13-i18n.patch b/irda-utils-0.9.13-i18n.patch deleted file mode 100644 index d992045..0000000 --- a/irda-utils-0.9.13-i18n.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- irda-utils-0.9.13/etc/irda.rc.i18n Thu Feb 8 14:04:06 2001 -+++ irda-utils-0.9.13/etc/irda.rc Thu Feb 8 14:05:26 2001 -@@ -13,10 +13,11 @@ - # Source IrDA networking configuration. - . /etc/sysconfig/irda - -+prog="IrDA" - - start() { - # Attach irda device -- echo -n "Starting IrDA: " -+ echo -n $"Starting $prog: " - daemon /usr/sbin/irattach ${DEVICE} ${ARGS} - touch /var/lock/subsys/irda - echo -@@ -24,7 +25,7 @@ - - stop() { - # Stop service. -- echo -n "Shutting down IrDA: " -+ echo -n $"Shutting down $prog: " - killproc irattach - rm -f /var/lock/subsys/irda - echo -@@ -62,7 +63,7 @@ - [ -e /var/lock/subsys/irda ] && (stop; start) - ;; - *) -- echo "Usage: irda {start|stop|restart|reload|condrestart|status}" -+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" - exit 1 - esac - diff --git a/irda-utils-0.9.14-chkconfig.patch b/irda-utils-0.9.14-chkconfig.patch deleted file mode 100644 index 00ebb0c..0000000 --- a/irda-utils-0.9.14-chkconfig.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- irda-utils-0.9.14/etc/irda.rc.chkconfig Sun Jan 14 23:12:56 2001 -+++ irda-utils-0.9.14/etc/irda.rc Tue Apr 24 15:43:33 2001 -@@ -3,8 +3,7 @@ - # irda This shell script takes care of starting and stopping - # IrDA support - # --# chkconfig: 2345 45 96 --# -+# chkconfig: - 45 24 - # description: IrDA stack for Linux - # - -@@ -14,6 +13,23 @@ - # Source IrDA networking configuration. - . /etc/sysconfig/irda - -+ -+start() { -+ # Attach irda device -+ echo -n "Starting IrDA: " -+ daemon /usr/sbin/irattach ${DEVICE} ${ARGS} -+ touch /var/lock/subsys/irda -+ echo -+} -+ -+stop() { -+ # Stop service. -+ echo -n "Shutting down IrDA: " -+ killproc irattach -+ rm -f /var/lock/subsys/irda -+ echo -+} -+ - # Check that irda is up. - [ ${IRDA} = "no" ] && exit 0 - -@@ -30,28 +46,23 @@ - # See how we were called. - case "$1" in - start) -- # Attach irda device -- echo -n "Starting IrDA: " -- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} -- touch /var/lock/subsys/irda -- echo -+ start - ;; - stop) -- # Stop service. -- echo -n "Shutting down IrDA: " -- killproc irattach -- rm -f /var/lock/subsys/irda -- echo -+ stop - ;; - status) - status irattach - ;; - restart|reload) -- $0 stop -- $0 start -+ stop -+ start -+ ;; -+ condrestart) -+ [ -e /var/lock/subsys/irda ] && (stop; start) - ;; - *) -- echo "Usage: irda {start|stop|restart|reload|status}" -+ echo "Usage: irda {start|stop|restart|reload|condrestart|status}" - exit 1 - esac - ---- irda-utils-0.9.14/etc/irda.rc.chkconfig 2002-12-16 14:01:23.000000000 -0500 -+++ irda-utils-0.9.14/etc/irda.rc 2002-12-16 13:56:11.000000000 -0500 -@@ -4,7 +4,10 @@ - # IrDA support - # - # chkconfig: - 45 24 --# description: IrDA stack for Linux -+# description: IrDA(TM) (Infrared Data Association) is an industry standard \ -+# for wireless, infrared communication between devices. IrDA speeds range \ -+# from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices \ -+# including laptops, LAN adapters, PDAs, printers, and mobile phones. - # - - # Source function library. diff --git a/irda-utils-0.9.14-typo.patch b/irda-utils-0.9.14-typo.patch deleted file mode 100644 index 6f21e2f..0000000 --- a/irda-utils-0.9.14-typo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- irda-utils-0.9.14/etc/irda.rc.typo Tue Apr 24 15:44:12 2001 -+++ irda-utils-0.9.14/etc/irda.rc Tue Apr 24 15:45:17 2001 -@@ -36,7 +36,7 @@ - [ -f /usr/sbin/irattach ] || exit 0 - - ARGS= --if [ $DONGLE ]; then -+if [ -n "$DONGLE" ]; then - ARGS="$ARGS -d $DONGLE" - fi - if [ "$DISCOVERY" = "yes" ];then diff --git a/irda-utils-0.9.16-rh2.patch b/irda-utils-0.9.16-rh2.patch deleted file mode 100644 index 512caf1..0000000 --- a/irda-utils-0.9.16-rh2.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- irda-utils-0.9.16/etc/irda.rc.rh2 2004-10-04 12:49:46.016198784 +0200 -+++ irda-utils-0.9.16/etc/irda.rc 2004-10-04 12:50:24.128404848 +0200 -@@ -21,6 +21,9 @@ - start() { - # Attach irda device - echo -n $"Starting $prog: " -+ /sbin/modprobe ircomm-tty 2>/dev/null -+ /sbin/modprobe irtty-sir 2>/dev/null -+ /sbin/modprobe irnet 2>/dev/null - daemon /usr/sbin/irattach ${DEVICE} ${ARGS} - touch /var/lock/subsys/irda - echo diff --git a/irda-utils-0.9.17-initscript.patch b/irda-utils-0.9.17-initscript.patch deleted file mode 100644 index 074546e..0000000 --- a/irda-utils-0.9.17-initscript.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- irda-utils-0.9.17/etc/irda.rc.rh1 2006-08-01 14:39:44.000000000 +0200 -+++ irda-utils-0.9.17/etc/irda.rc 2006-08-01 14:40:02.000000000 +0200 -@@ -24,16 +24,15 @@ - /sbin/modprobe ircomm-tty 2>/dev/null - /sbin/modprobe irtty-sir 2>/dev/null - /sbin/modprobe irnet 2>/dev/null -- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} -- touch /var/lock/subsys/irda -+ daemon /usr/sbin/irattach ${DEVICE} ${ARGS} -+ [ -f /var/run/irattach.pid ] && success $"irattach startup" || failure $"irattach startup" - echo - } - - stop() { - # Stop service. - echo -n $"Shutting down $prog: " -- killproc irattach -- rm -f /var/lock/subsys/irda -+ [ -f /var/run/irattach.pid ] && killproc irattach || success $"irattach shutdown" - echo - } - -@@ -66,7 +65,7 @@ - start - ;; - condrestart) -- [ -e /var/lock/subsys/irda ] && (stop; start) -+ [ -e /var/run/irdattach.pid ] && (stop; start) - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" diff --git a/irda-utils-0.9.17-smcdisable.patch b/irda-utils-0.9.17-smcdisable.patch deleted file mode 100644 index e45d890..0000000 --- a/irda-utils-0.9.17-smcdisable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- irda-utils-0.9.17/Makefile.smcdisable 2006-06-01 14:49:01.000000000 +0200 -+++ irda-utils-0.9.17/Makefile 2006-06-01 14:48:52.000000000 +0200 -@@ -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 --git a/irda-utils-0.9.18-man.patch b/irda-utils-0.9.18-man.patch new file mode 100644 index 0000000..36eb0d1 --- /dev/null +++ b/irda-utils-0.9.18-man.patch @@ -0,0 +1,94 @@ +diff -Nrbu irda-utils-0.9.18/man/irda.7 irda-utils-0.9.18-OK/man/irda.7 +--- irda-utils-0.9.18/man/irda.7 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/man/irda.7 2011-07-15 20:31:58.000000000 +0400 +@@ -61,7 +61,7 @@ + connection between two sockets on top of + .IR IrTTP , + similar to TCP sockets. IrTTP guarantees that the data arrives in +-order and manages flow contol, IrLAP retransmits lost packets. ++order and manages flow control, IrLAP retransmits lost packets. + .br + Stream sockets does not preserve record boundaries. + .TP +@@ -70,7 +70,7 @@ + connection between two sockets on top of + .IR IrTTP . + IrTTP guarantees that the data arrives in order and manages flow +-contol, IrLAP retransmits lost packets. ++control, IrLAP retransmits lost packets. + .br + SeqPacket sockets preserve record boundaries. Large datagrams will be + fragmented as needed. +@@ -79,8 +79,8 @@ + SeqPacket sockets provides a reliable, datagram oriented, full duplex + connection between two sockets on top of + .IR IrLMP . +-There is no guarantees that the data arrives in order and there is no +-flow contol, however IrLAP retransmits lost packets. ++There is no guarantee that the data arrives in order and there is no ++flow control, however IrLAP retransmits lost packets. + .br + Datagram sockets preserve record boundaries. No fragmentation is + provided, datagrams larger than the IrDA link MTU are truncated or +@@ -90,9 +90,9 @@ + Ultra sockets provides a connectionless, unreliable datagram packet + service on top of + .IR IrLAP-Ultra . +-Ultra datagrams are sent and receive only when no IrLAP connection is ++Ultra datagrams are sent and received only when no IrLAP connection is + established and otherwise discarded. They are always transmitted at +-9600 bauds. Datagrams may be lost, reordered, and there is no flow ++9600 bauds. Datagrams may be lost or reordered, and there is no flow + control. + .br + Ultra sockets preserve record boundaries. No fragmentation is +@@ -124,8 +124,8 @@ + .I sir_lsap_sel + is usually not used. + .I sir_addr +-is the address of the peer and optional (and that case the first peer +-discoverd will be used). ++is the optional address of the peer (if no given the first peer ++discovered will be used). + .I sir_name + is the service name of the socket. + .\" +diff -Nrbu irda-utils-0.9.18/man/irnet.4 irda-utils-0.9.18-OK/man/irnet.4 +--- irda-utils-0.9.18/man/irnet.4 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/man/irnet.4 2011-07-15 20:33:14.000000000 +0400 +@@ -31,7 +31,7 @@ + .I PPP over IrCOMM + is that it avoids the framing and serial emulation which are a + performance bottleneck. It also allows multipoint communications in a +-sensible fashion. And finally, it can automatically handle incomming ++sensible fashion. And finally, it can automatically handle incoming + connections through + .B irnetd. + .PP +@@ -84,7 +84,7 @@ + .IR "control channel" , + other use are unsupported. + .B IrNET +-support multiple concurent connections (limited by the IrDA stack), ++support multiple concurrent connections (limited by the IrDA stack), + all those connections are multiplexed on a single + .B /dev/irnet + device (as opposed to IrCOMM which as one device per connection). +@@ -164,7 +164,7 @@ + .\" EXAMPLE part + .\" + .SH EXAMPLE +-Start a IrNET server accepting any incomming connection: ++Start a IrNET server accepting any incoming connection: + .br + .B " pppd /dev/irnet 9600 local noauth nolock passive" + .PP +@@ -177,7 +177,7 @@ + .br + .B " pppd /dev/irnet 9600 local noauth nolock connect ""echo name MyIrDANode"" + .PP +-Start a IrNET server accepting incomming connection from peer with IrDA address 0x12345678 only on IrDA port 0x87654321: ++Start a IrNET server accepting incoming connection from peer with IrDA address 0x12345678 only on IrDA port 0x87654321: + .br + .B " pppd /dev/irnet 9600 local noauth nolock passive connect ""echo daddr 0x12345678 , saddr 0x87654321""" + .\" diff --git a/irda-utils-0.9.18-smcdisable.patch b/irda-utils-0.9.18-smcdisable.patch new file mode 100644 index 0000000..d07c771 --- /dev/null +++ b/irda-utils-0.9.18-smcdisable.patch @@ -0,0 +1,24 @@ +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 a0f214a..089d59d 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,28 +1,27 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 11%{?dist} -Url: http://irda.sourceforge.net/ +Release: 12%{?dist} +Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x -BuildRequires: glib2-devel, libtool, automake, docbook-utils -Requires: grep, modutils >= 2.3.21-4 -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch1: irda-utils-0.9.14-chkconfig.patch -Patch2: irda-utils-0.9.14-typo.patch -Patch3: irda-utils-0.9.13-i18n.patch -Patch4: irda-utils-0.9.17-rootonly.patch -Patch5: irda-utils-0.9.15-rh1.patch -Patch6: irda-utils-0.9.16-rh2.patch -Patch7: irda-utils-0.9.16-io.patch -Patch8: irda-utils-0.9.17-makefile.patch -Patch9: irda-utils-0.9.17-smcdisable.patch -Patch10: irda-utils-0.9.17-initscript.patch -Patch11: irda-utils-0.9.18-root.patch +Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz +Source1: irda.init +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 +BuildRequires: glib2-devel + +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig, /sbin/service +Requires(postun): /sbin/service + %description IrDA(TM) (Infrared Data Association) is an industry standard for @@ -41,6 +40,7 @@ tools or programs can be used. Some configuration outside the kernel is required, however, and some IrDA features, like IrOBEX, are actually implemented outside the kernel. + %prep %setup -q %patch1 -p1 @@ -49,55 +49,80 @@ actually implemented outside the kernel. %patch4 -p1 %patch5 -p1 %patch6 -p1 +gunzip man/irnet.4.gz man/irda.7.gz %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 +gzip -9 man/irnet.4 man/irda.7 + %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT/%{_initddir} -mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig + +for dir in %{_sbindir} %{_bindir} %{_initddir} %{_sysconfdir}/sysconfig +do + install -d $RPM_BUILD_ROOT$dir +done make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" + +install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda + rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-irlan0 -mv irattach/README irattach/README.irattach -mv irdadump/README irdadump/README.irdadump -mv irdaping/README irdaping/README.irdaping -mv tekram/README tekram/README.tekram + +for i in irattach irdadump irdaping tekram +do + [ -f $i/README ] && ln $i/README README.$i +done +iconv -f ISO8859-1 -t UTF-8 README.irdadump.new && \ + mv -f README.irdadump.new README.irdadump mv etc/modules.conf.irda etc/modprobe.conf.irda +chmod -x etc/ifcfg-irlan0 + %clean -#rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT + %post /sbin/chkconfig --add irda + %preun -if [ $1 = 0 ] ; then - /sbin/chkconfig --del irda +if [ $1 = 0 ]; then + /sbin/service irda stop >/dev/null 2>&1 + /sbin/chkconfig --del irda fi + +%postun +if [ $1 != 0 ]; then + /sbin/service irda condrestart >/dev/null 2>&1 +fi + + %files -%defattr(-,root,root) -/usr/sbin/* -/usr/bin/* -%{_mandir}/man?/* -%config %{_initddir}/irda -%config %{_sysconfdir}/sysconfig/irda -%doc README etc/ifcfg-irlan0 etc/modprobe.conf.irda -%doc irattach/README.irattach -%doc irdadump/README.irdadump -%doc irdaping/README.irdaping -%doc tekram/README.tekram +%defattr(-,root,root,-) +%{_sbindir}/* +%{_bindir}/* +%{_mandir}/*/* +%{_initddir}/irda +%config(noreplace) %{_sysconfdir}/sysconfig/irda +%doc README* etc/ifcfg-irlan0 etc/modprobe.conf.irda + %changelog +* Fri Jul 15 2011 Dmitry Butskoy - 0.9.18-12 +- spec file cleanup +- add own init script instead of huge patched original one + (and fix #242468) +- disable smcinit manuals in smcdisable patch as well +- fix typos in man pages (#668122, #675677) + * Wed Feb 09 2011 Fedora Release Engineering - 0.9.18-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -209,7 +234,7 @@ fi - Fixed service script description * Mon Dec 09 2002 Phil Knirsch 0.9.14-7 -- Fixed problem with %doc entries. +- Fixed problem with %%doc entries. * Tue Jul 09 2002 Phil Knirsch 0.9.14-6 - Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it diff --git a/irda.init b/irda.init new file mode 100644 index 0000000..d6bef3c --- /dev/null +++ b/irda.init @@ -0,0 +1,80 @@ +#!/bin/sh +# +# irda This shell script takes care of starting and stopping +# IrDA support +# +# chkconfig: - 45 24 +# description: IrDA(TM) (Infrared Data Association) is an industry standard \ +# for wireless, infrared communication between devices. IrDA speeds range \ +# from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices \ +# including laptops, LAN adapters, PDAs, printers, and mobile phones. +# + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source IrDA networking configuration. +. /etc/sysconfig/irda + + +# Check that irda is up. +[ ${IRDA} = "no" ] && exit 6 + +[ -f /usr/sbin/irattach ] || exit 5 + +args= +[ -n "$DONGLE" ] && args="$args -d $DONGLE" +[ "$DISCOVERY" = "yes" ] && args="$args -s" + + +RETVAL=0 + +start() { + echo -n $"Starting IrDA: " + /sbin/modprobe ircomm-tty 2>/dev/null + /sbin/modprobe irtty-sir 2>/dev/null + /sbin/modprobe irnet 2>/dev/null + daemon /usr/sbin/irattach ${DEVICE} ${args} + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/irda + echo +} + +stop() { + echo -n $"Shutting down IrDA: " + killproc irattach + RETVAL=$? + rm -f /var/lock/subsys/irda + echo +} + +restart() { + stop + start +} + + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status irattach + RETVAL=$? + ;; + restart|reload|force-reload) + restart + ;; + condrestart|try-restart) + [ -f /var/lock/subsys/irda ] && restart + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 3 +esac + +exit $RETVAL From dd367ec2c30a43d049a1d45f557c7369de499c70 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Mon, 18 Jul 2011 18:30:51 +0400 Subject: [PATCH 44/95] migrate to systemd --- irda-utils.spec | 39 ++++++++++++++++++++++++++------------- irda.service | 16 ++++++++++++++++ irda.sysconfig | 8 ++++++++ 3 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 irda.service create mode 100644 irda.sysconfig diff --git a/irda-utils.spec b/irda-utils.spec index 089d59d..01f5b63 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 12%{?dist} +Release: 13%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -9,6 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: irda.init +Source2: irda.service +Source3: irda.sysconfig Patch1: irda-utils-0.9.17-rootonly.patch Patch2: irda-utils-0.9.15-rh1.patch Patch3: irda-utils-0.9.16-io.patch @@ -16,11 +18,12 @@ 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 -BuildRequires: glib2-devel +BuildRequires: glib2-devel +BuildRequires: systemd-units -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig, /sbin/service -Requires(postun): /sbin/service +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units %description @@ -62,15 +65,18 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ %install rm -rf $RPM_BUILD_ROOT -for dir in %{_sbindir} %{_bindir} %{_initddir} %{_sysconfdir}/sysconfig +for dir in %{_sbindir} %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig do install -d $RPM_BUILD_ROOT$dir done make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" -install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda -chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda +#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda +#chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda +install -d $RPM_BUILD_ROOT%{_unitdir} +install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/irda.service +install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-irlan0 @@ -89,19 +95,22 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add irda +if [ $1 = 1 ]; then + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun if [ $1 = 0 ]; then - /sbin/service irda stop >/dev/null 2>&1 - /sbin/chkconfig --del irda + /bin/systemctl --no-reload disable irda.service >/dev/null 2>&1 || : + /bin/systemctl stop irda.service >/dev/null 2>&1 || : fi %postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 != 0 ]; then - /sbin/service irda condrestart >/dev/null 2>&1 + /bin/systemctl try-restart irda.service >/dev/null 2>&1 || : fi @@ -110,12 +119,16 @@ fi %{_sbindir}/* %{_bindir}/* %{_mandir}/*/* -%{_initddir}/irda +#%{_initrddir}/irda +%{_unitdir}/* %config(noreplace) %{_sysconfdir}/sysconfig/irda %doc README* etc/ifcfg-irlan0 etc/modprobe.conf.irda %changelog +* Mon Jul 18 2011 Dmitry Butskoy - 0.9.18-13 +- migrate from SysV to Systemd init system (#694940) + * Fri Jul 15 2011 Dmitry Butskoy - 0.9.18-12 - spec file cleanup - add own init script instead of huge patched original one diff --git a/irda.service b/irda.service new file mode 100644 index 0000000..ad48ef4 --- /dev/null +++ b/irda.service @@ -0,0 +1,16 @@ +[Unit] +Description=Irda Support +After=syslog.target + +[Service] +Type=forking +PIDFile=/var/run/irattach.pid +EnvironmentFile=-/etc/sysconfig/irda +ExecStartPre=-/sbin/modprobe -qab ircomm-tty irtty-sir irnet +ExecStart=/usr/sbin/irattach ${DEVICE} ${OPTIONS} +StandardOutput=syslog +StandardError=syslog + + +[Install] +WantedBy=multi-user.target diff --git a/irda.sysconfig b/irda.sysconfig new file mode 100644 index 0000000..db86728 --- /dev/null +++ b/irda.sysconfig @@ -0,0 +1,8 @@ +# Either a tty name, or IrDA interface name, or FIR module name. +# See irattach(8) for more info +DEVICE=/dev/ttyS2 + +# `-s' starts discovery of remote devices +# `-d dongle' attaches an additional dongle driver `dobgle' to the IrDA port +#OPTIONS="-s -d actisys+" +OPTIONS="-s" From d3ad631726c5f2fdfa0571074f91d011ddef7c6a Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Mon, 18 Jul 2011 18:43:43 +0400 Subject: [PATCH 45/95] . --- irda-utils.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/irda-utils.spec b/irda-utils.spec index 01f5b63..81653d7 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -74,6 +74,8 @@ make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" #install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda #chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda +rm -f $RPM_BUILD_ROOT/%{_initrddir}/irda + install -d $RPM_BUILD_ROOT%{_unitdir} install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/irda.service install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda From da6ab7be0f65a244572cba5bdd7386942e783953 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 00:00:55 -0600 Subject: [PATCH 46/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 81653d7..d618cdc 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 13%{?dist} +Release: 14%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -128,6 +128,9 @@ fi %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.9.18-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Jul 18 2011 Dmitry Butskoy - 0.9.18-13 - migrate from SysV to Systemd init system (#694940) From 5a8bf1c7c0008fd86e5b8c7f4e2b3981cba2f9e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 10:08:15 -0500 Subject: [PATCH 47/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index d618cdc..f9db9ee 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 14%{?dist} +Release: 15%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -128,6 +128,9 @@ fi %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.9.18-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.9.18-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From ad266f35063dd43936f7120a31f38caf833385cc Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Mon, 24 Sep 2012 17:53:10 +0400 Subject: [PATCH 48/95] . --- irda-utils.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index f9db9ee..c64acf8 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 15%{?dist} +Release: 16%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -97,23 +97,15 @@ rm -rf $RPM_BUILD_ROOT %post -if [ $1 = 1 ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post irda.service %preun -if [ $1 = 0 ]; then - /bin/systemctl --no-reload disable irda.service >/dev/null 2>&1 || : - /bin/systemctl stop irda.service >/dev/null 2>&1 || : -fi +%systemd_preun irda.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 != 0 ]; then - /bin/systemctl try-restart irda.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart irda.service %files @@ -128,6 +120,9 @@ fi %changelog +* Mon Sep 24 2012 Dmitry Butskoy - 0.9.18-16 +- new systemd-rpm macros (#850171) + * Thu Jul 19 2012 Fedora Release Engineering - 0.9.18-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 49fe18a9113fce90599aa2ee2f78415b0415f7a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 20:15:50 -0600 Subject: [PATCH 49/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index c64acf8..339ff9c 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 16%{?dist} +Release: 17%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -120,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.9.18-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Sep 24 2012 Dmitry Butskoy - 0.9.18-16 - new systemd-rpm macros (#850171) From d6b016fceecbe1f2d94c778dd9e7f2ffbbd52bbd Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Thu, 13 Jun 2013 16:28:27 +0400 Subject: [PATCH 50/95] build with PIE flags --- irda-utils-0.9.18-PIE.patch | 113 ++++++++++++++++++++++++++++++++++++ irda-utils.spec | 11 +++- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 irda-utils-0.9.18-PIE.patch diff --git a/irda-utils-0.9.18-PIE.patch b/irda-utils-0.9.18-PIE.patch new file mode 100644 index 0000000..52bd241 --- /dev/null +++ b/irda-utils-0.9.18-PIE.patch @@ -0,0 +1,113 @@ +diff --git a/findchip/Makefile b/findchip/Makefile +index 7428617..0937827 100644 +--- a/findchip/Makefile ++++ b/findchip/Makefile +@@ -47,7 +47,7 @@ all: findchip + + findchip: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@ ++ $(ECMD)$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) -o $@ + + + clean: +diff --git a/irattach/Makefile b/irattach/Makefile +index e70de61..76383c2 100644 +--- a/irattach/Makefile ++++ b/irattach/Makefile +@@ -28,7 +28,7 @@ include ../output.mak + CC = gcc + LD = ld + RM = rm -f +-CFLAGS = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES) ++CFLAGS = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES) $(RPM_OPT_FLAGS) + + SYS_INCLUDES = -I/usr/include + SYS_LIBPATH = -L/usr/lib -L/usr/local/lib +@@ -49,13 +49,13 @@ all: $(TARGETS) + + irattach: irattach.o util.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@ + + + + dongle_attach: dongle_attach.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@ + + + install: $(TARGETS) +diff --git a/irdadump/Makefile b/irdadump/Makefile +index bd21abb..e7d8929 100644 +--- a/irdadump/Makefile ++++ b/irdadump/Makefile +@@ -19,7 +19,7 @@ SYS_INCLUDES = -I/usr/include + SYS_LIBRARIES = + SYS_LIBPATH = -L/usr/lib -L/usr/local/lib + +-CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0` ++CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0` $(RPM_OPT_FLAGS) + + LIBIRDADUMP_OBJS = irdadump.o irlap.o irlmp.o obex.o ircomm.o netbuf.o capture.o + IRDADUMP_OBJS = main.o +@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS) + + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + #$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + + +diff --git a/irdaping/Makefile b/irdaping/Makefile +index ef84acd..cd64c90 100644 +--- a/irdaping/Makefile ++++ b/irdaping/Makefile +@@ -56,7 +56,7 @@ all: $(TARGETS) + + irdaping: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + .c.o: +diff --git a/irnetd/Makefile b/irnetd/Makefile +index 1fb1571..5efbc4a 100644 +--- a/irnetd/Makefile ++++ b/irnetd/Makefile +@@ -50,7 +50,7 @@ all: $(TARGETS) + + irnetd: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + install: irnetd +diff --git a/psion/Makefile b/psion/Makefile +index 001926c..5d7cd7f 100644 +--- a/psion/Makefile ++++ b/psion/Makefile +@@ -25,4 +25,4 @@ install: $(PSION_TARGETS) + + irpsion5: + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ +diff --git a/tekram/Makefile b/tekram/Makefile +index e10d116..65996e6 100644 +--- a/tekram/Makefile ++++ b/tekram/Makefile +@@ -55,7 +55,7 @@ all: irkbd + + irkbd: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(LDFLAGS) $(OBJS) -o $@ + + + .c.o: diff --git a/irda-utils.spec b/irda-utils.spec index 339ff9c..3b7ab94 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -1,7 +1,9 @@ +%global _hardened_build 1 + Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 17%{?dist} +Release: 18%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -18,6 +20,7 @@ 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 BuildRequires: glib2-devel BuildRequires: systemd-units @@ -55,10 +58,13 @@ actually implemented outside the kernel. gunzip man/irnet.4.gz man/irda.7.gz %patch7 -p1 gzip -9 man/irnet.4 man/irda.7 +%patch8 -p1 %build +export LDFLAGS="%{?__global_ldflags}" make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \ + LDFLAGS="%{?__global_ldflags}" \ CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -120,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 13 2013 Dmitry Butskoy - 0.9.18-18 +- build with PIE flags (#955165) + * Thu Feb 14 2013 Fedora Release Engineering - 0.9.18-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From d012d7053eecd1d1697f61fdcae1338187f80178 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 14:57:23 -0500 Subject: [PATCH 51/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 3b7ab94..be7fd66 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: 18%{?dist} +Release: 19%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.18-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jun 13 2013 Dmitry Butskoy - 0.9.18-18 - build with PIE flags (#955165) From d3e7173463989dc7a5094041d4ee88e40f6d62c8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 17:44:40 -0500 Subject: [PATCH 52/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index be7fd66..c828cb2 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: 19%{?dist} +Release: 20%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.18-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 0.9.18-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 6bb6b841a07716459d8b62bb154d4d70ca75b160 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 21:52:57 +0000 Subject: [PATCH 53/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index c828cb2..7248111 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: 20%{?dist} +Release: 21%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.9.18-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.9.18-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a9f26f0a5e6261ea4a3f249cba7cbfb2529193ec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 11:34:45 +0000 Subject: [PATCH 54/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 7248111..6e20925 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: 21%{?dist} +Release: 22%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.18-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Aug 16 2014 Fedora Release Engineering - 0.9.18-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From df2a4b2eaff446730cd25186387fd32db869d638 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 00:39:44 +0000 Subject: [PATCH 55/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 6e20925..65118ad 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: 22%{?dist} +Release: 23%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.9.18-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.9.18-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From cdda5d52ad38f5988e52bb4655dda66cf0b3e27e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 16:34:14 +0000 Subject: [PATCH 56/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 65118ad..24cf092 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: 24%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -126,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 06f0cb64e5dbf9aa7b9ae07bda31a459011aa24e Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 12 Feb 2017 02:27:37 +0300 Subject: [PATCH 57/95] enable smcinit again (#1421387) --- irda-utils.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 24cf092..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: 24%{?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,15 @@ 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 From 12b54a15e53bfcd36bac632cd8e89e9c6edeb851 Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 12 Feb 2017 02:35:51 +0300 Subject: [PATCH 58/95] remove unneeded patch --- irda-utils-0.9.18-smcdisable.patch | 24 ------------------------ 1 file changed, 24 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 From ce9a61a3a4d7becbea50ec860579d86c13daa6d6 Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 13 Feb 2017 03:07:38 +0300 Subject: [PATCH 59/95] add -fgnu89-inline --- irda-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 88c2e97..ede51f0 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: 26%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -61,7 +61,7 @@ gzip -9 man/irnet.4 man/irda.7 %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 -fgnu89-inline" ROOT="$RPM_BUILD_ROOT" \ LDFLAGS="%{?__global_ldflags}" \ CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -123,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-26 +- add -fgnu89-inline to CFLAGS for new compilers + * Sun Feb 12 2017 Dmitry Butskoy - 0.9.18-25 - enable smcinit (#1421387) From c6e4213bf4a65abc83feb973a09d1265299a784c Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 13 Feb 2017 03:20:50 +0300 Subject: [PATCH 60/95] use -std=gnu89 instead --- irda-utils.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index ede51f0..a7082bc 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: 26%{?dist} +Release: 27%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -61,7 +61,7 @@ gzip -9 man/irnet.4 man/irda.7 %build export LDFLAGS="%{?__global_ldflags}" -make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fgnu89-inline" 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,8 +123,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-26 -- add -fgnu89-inline to CFLAGS for new compilers +* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-27 +- add -std=gnu89 to CFLAGS for new compilers * Sun Feb 12 2017 Dmitry Butskoy - 0.9.18-25 - enable smcinit (#1421387) From 16604ed1a10cac721a58549202bbb16448ea6374 Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 13 Feb 2017 03:47:25 +0300 Subject: [PATCH 61/95] add no-inline patch instead --- irda-utils.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index a7082bc..4dd5dc2 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: 27%{?dist} +Release: 28%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -20,6 +20,7 @@ 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 +Patch9: irda-utils-0.9.18-no-inline.patch BuildRequires: glib2-devel BuildRequires: systemd-units @@ -57,6 +58,7 @@ gunzip man/irnet.4.gz man/irda.7.gz %patch7 -p1 gzip -9 man/irnet.4 man/irda.7 %patch8 -p1 +%patch9 -p1 %build @@ -123,8 +125,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-27 -- add -std=gnu89 to CFLAGS for new compilers +* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-28 +- add no-inline patch for new compilers * Sun Feb 12 2017 Dmitry Butskoy - 0.9.18-25 - enable smcinit (#1421387) From 850f87332f21041b8270bb6e5d9320c03d2b9695 Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 13 Feb 2017 03:52:35 +0300 Subject: [PATCH 62/95] . --- irda-utils-0.9.18-no-inline.patch | 299 ++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+) 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; From 6dc66e3361e967371667980aeefcad4f7f04c759 Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 13 Feb 2017 04:01:08 +0300 Subject: [PATCH 63/95] require pciutils-devel --- irda-utils.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4dd5dc2..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: 28%{?dist} +Release: 29%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -21,7 +21,7 @@ Patch6: irda-utils-0.9.18-root.patch Patch7: irda-utils-0.9.18-man.patch Patch8: irda-utils-0.9.18-PIE.patch Patch9: irda-utils-0.9.18-no-inline.patch -BuildRequires: glib2-devel +BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units Requires(post): systemd-units @@ -125,8 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-28 +* 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) From 364297a17101e53788bef234226a45031ff3f912 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 13:42:27 +0000 Subject: [PATCH 64/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4602c62..337a1ed 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: 29%{?dist} +Release: 30%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.18-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Feb 13 2017 Dmitry Butskoy - 0.9.18-29 - add no-inline patch for new compilers - require pciutils-devel for smcinit From b0566f11174b0bae746246bc0acb3265b7988672 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 23:52:29 +0000 Subject: [PATCH 65/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 337a1ed..5d66484 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: 30%{?dist} +Release: 31%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.9.18-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.9.18-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 678da4716f2c17c446ba89921a75b622253e679c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 17:40:28 +0000 Subject: [PATCH 66/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 5d66484..4ff21c8 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: 31%{?dist} +Release: 32%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.9.18-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.9.18-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 2b95a36917c0643f8b36b5beb04dad58561dae60 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:33:21 +0100 Subject: [PATCH 67/95] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- irda-utils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4ff21c8..240a9a1 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -7,7 +7,6 @@ Release: 32%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: irda.init From 50f41c308711bcf1af3c6de0f9fabb1c84f61ea2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:09:05 +0100 Subject: [PATCH 68/95] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- irda-utils.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 240a9a1..a8ce9aa 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -97,9 +97,6 @@ mv etc/modules.conf.irda etc/modprobe.conf.irda chmod -x etc/ifcfg-irlan0 -%clean -rm -rf $RPM_BUILD_ROOT - %post %systemd_post irda.service From 6348ccad5454839f4a56f28ca4e236490036e657 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:24:45 -0500 Subject: [PATCH 69/95] Remove needless use of %defattr --- irda-utils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index a8ce9aa..a2bfc76 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -111,7 +111,6 @@ chmod -x etc/ifcfg-irlan0 %files -%defattr(-,root,root,-) %{_sbindir}/* %{_bindir}/* %{_mandir}/*/* From f9aaf47c487eb30c9b4512c71b30282efd22bbff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:51:10 +0000 Subject: [PATCH 70/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index a2bfc76..1485092 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: 32%{?dist} +Release: 33%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ Group: Applications/System @@ -120,6 +120,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.18-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.9.18-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7f1ee5fc173a87ee76ca91ae555b54fff278de6d Mon Sep 17 00:00:00 2001 From: buc Date: Sat, 14 Jul 2018 21:39:31 +0300 Subject: [PATCH 71/95] BR: gcc --- irda-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/irda-utils.spec b/irda-utils.spec index 1485092..974a894 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -20,6 +20,7 @@ Patch6: irda-utils-0.9.18-root.patch Patch7: irda-utils-0.9.18-man.patch Patch8: irda-utils-0.9.18-PIE.patch Patch9: irda-utils-0.9.18-no-inline.patch +BuildRequires: gcc BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units From 045bb8a14755b4dae9d0873c40d7c251b9298a8d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:48 +0100 Subject: [PATCH 72/95] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- irda-utils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 974a894..b6057b7 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -6,7 +6,6 @@ Version: 0.9.18 Release: 33%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ -Group: Applications/System ExcludeArch: s390 s390x Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: irda.init From 5fe507e3b5596dd4c99a73f2f1fdac3a9c387230 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:33:46 +0000 Subject: [PATCH 73/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index b6057b7..72d38f8 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: 33%{?dist} +Release: 34%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -120,6 +120,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.9.18-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.9.18-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 40e5e693989bc2ef1790d625e4fc20c08acc453b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:43:26 +0000 Subject: [PATCH 74/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 72d38f8..01155b9 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: 34%{?dist} +Release: 35%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -120,6 +120,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.9.18-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.9.18-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d2a0592b2fd91312ac4ed0355858384d12e478ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:39:43 +0000 Subject: [PATCH 75/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 01155b9..4245238 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: 35%{?dist} +Release: 36%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -120,6 +120,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.9.18-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.9.18-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2e501bd19e8604ac60c188018db4eb33c618584a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:58:36 +0000 Subject: [PATCH 76/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4245238..565b7da 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: 36%{?dist} +Release: 37%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -120,6 +120,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.9.18-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.9.18-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d6717fb46fbb562fd09cba92d86b2ad85ddc4b91 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:56:11 +0000 Subject: [PATCH 77/95] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- irda-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/irda-utils.spec b/irda-utils.spec index 565b7da..9c9b537 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -22,6 +22,7 @@ Patch9: irda-utils-0.9.18-no-inline.patch BuildRequires: gcc BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units +BuildRequires: make Requires(post): systemd-units Requires(preun): systemd-units From 67cc17dcf4e9a2d4e37b5fad64c20a16b2a0d9af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:30:20 +0000 Subject: [PATCH 78/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 9c9b537..e3bb002 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: 37%{?dist} +Release: 38%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -121,6 +121,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.18-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.9.18-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 266cc00b2c75f7b267a6e715369eb753a87fed17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:35 +0100 Subject: [PATCH 79/95] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- irda-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index e3bb002..04730dc 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: 38%{?dist} +Release: 39%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -121,6 +121,10 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Tue Mar 02 2021 Zbigniew JÄ™drzejewski-Szmek - 0.9.18-39 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 0.9.18-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d6ab817a47a6c4dd38c05209fd6e2d2a8428aa2f Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Mon, 17 May 2021 02:09:42 +0300 Subject: [PATCH 80/95] Fix #1960900 --- irda-utils-0.9.18-run.patch | 11 +++++++++++ irda-utils.spec | 7 ++++++- irda.service | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 irda-utils-0.9.18-run.patch diff --git a/irda-utils-0.9.18-run.patch b/irda-utils-0.9.18-run.patch new file mode 100644 index 0000000..aa67ea7 --- /dev/null +++ b/irda-utils-0.9.18-run.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.18/irattach/irattach.c.orig 2021-05-17 01:58:48.781587723 +0300 ++++ irda-utils-0.9.18/irattach/irattach.c 2021-05-17 02:01:21.738344238 +0300 +@@ -68,7 +68,7 @@ + static int termvalid = -1; /* If termsave is valid */ + + /* Default path for pid file */ +-char *pidfile = "/var/run/irattach.pid"; ++char *pidfile = "/run/irattach.pid"; + + /* Used by ioctl to the tty to obtain the network device name */ + struct irtty_info { diff --git a/irda-utils.spec b/irda-utils.spec index 04730dc..35f5574 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: 39%{?dist} +Release: 40%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -19,6 +19,7 @@ Patch6: irda-utils-0.9.18-root.patch Patch7: irda-utils-0.9.18-man.patch Patch8: irda-utils-0.9.18-PIE.patch Patch9: irda-utils-0.9.18-no-inline.patch +Patch10: irda-utils-0.9.18-run.patch BuildRequires: gcc BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units @@ -59,6 +60,7 @@ gunzip man/irnet.4.gz man/irda.7.gz gzip -9 man/irnet.4 man/irda.7 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build @@ -121,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Mon May 17 2021 Dmitry Butskoy - 0.9.18-40 +- move /var/run to /run and fix systemd service file (#1960900) + * Tue Mar 02 2021 Zbigniew JÄ™drzejewski-Szmek - 0.9.18-39 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/irda.service b/irda.service index ad48ef4..85ec7bb 100644 --- a/irda.service +++ b/irda.service @@ -4,12 +4,12 @@ After=syslog.target [Service] Type=forking -PIDFile=/var/run/irattach.pid +PIDFile=/run/irattach.pid EnvironmentFile=-/etc/sysconfig/irda ExecStartPre=-/sbin/modprobe -qab ircomm-tty irtty-sir irnet ExecStart=/usr/sbin/irattach ${DEVICE} ${OPTIONS} -StandardOutput=syslog -StandardError=syslog +StandardOutput=journal +StandardError=journal [Install] From 1c54fbbe469f38bde445041d4516286ba05db072 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:44:43 +0000 Subject: [PATCH 81/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 35f5574..642a02d 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: 40%{?dist} +Release: 41%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.9.18-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Dmitry Butskoy - 0.9.18-40 - move /var/run to /run and fix systemd service file (#1960900) From aa87e5338059fee3a03b4f293caeac09cc1e5ea5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:27:32 +0000 Subject: [PATCH 82/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 642a02d..f88ca3e 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: 41%{?dist} +Release: 42%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.9.18-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.9.18-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0585b573f8e10002fcef34950b58f5ac621eab72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:51:36 +0000 Subject: [PATCH 83/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index f88ca3e..45999be 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: 42%{?dist} +Release: 43%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.9.18-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.9.18-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From be08c51b2c8c56b8c9c667f94d91aeec4b71695a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:21:22 +0000 Subject: [PATCH 84/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 45999be..6dedc76 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: 43%{?dist} +Release: 44%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.9.18-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.9.18-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 70b2b39c0bdd97be49fb48b3b4a009b048caf158 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:37:34 +0000 Subject: [PATCH 85/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 6dedc76..4ff087f 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: 44%{?dist} +Release: 45%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.9.18-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.9.18-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c1e553b396ea7b0b6f0c9b4f22d1da08ad89c565 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:17:01 +0000 Subject: [PATCH 86/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 4ff087f..5bfeea0 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: 45%{?dist} +Release: 46%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 0.9.18-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.9.18-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From dc9dc29c3b63a2ea19924f7a64fb2a77f65eb9de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:56:09 +0000 Subject: [PATCH 87/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 5bfeea0..9197a26 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: 46%{?dist} +Release: 47%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.9.18-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 0.9.18-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f3e39629dc9771d7ef1fac13a5132416317fb1fd Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 88/95] Eliminate use of obsolete %patchN syntax (#2283636) --- irda-utils.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index 9197a26..5c120a6 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -50,17 +50,17 @@ actually implemented outside the kernel. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P6 -p1 gunzip man/irnet.4.gz man/irda.7.gz -%patch7 -p1 +%patch -P7 -p1 gzip -9 man/irnet.4 man/irda.7 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%patch -P8 -p1 +%patch -P9 -p1 +%patch -P10 -p1 %build From 48ee7734fa45940b27e8794a425126794d5e6449 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:35:36 +0000 Subject: [PATCH 89/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 5c120a6..e109eb4 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: 47%{?dist} +Release: 48%{?dist} Url: http://irda.sourceforge.net License: GPLv2+ ExcludeArch: s390 s390x @@ -123,6 +123,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.9.18-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 0.9.18-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dd424e983b4ad270cdf9394c0cafccaf04b1efcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 00:23:24 +0200 Subject: [PATCH 90/95] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- irda-utils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/irda-utils.spec b/irda-utils.spec index e109eb4..b240ccf 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -3,9 +3,10 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 48%{?dist} +Release: 49%{?dist} Url: http://irda.sourceforge.net -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later ExcludeArch: s390 s390x Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: irda.init @@ -123,6 +124,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0.9.18-49 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0.9.18-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0e3af87c3db42ad64fbc1204d542c83758626967 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:24:27 +0000 Subject: [PATCH 91/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index b240ccf..ccffb4e 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: 49%{?dist} +Release: 50%{?dist} Url: http://irda.sourceforge.net # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -124,6 +124,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.9.18-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 0.9.18-49 - convert license to SPDX From e02ca41f6d1190d3ae4577540cb102f2ba3527a0 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Thu, 23 Jan 2025 19:05:46 +0300 Subject: [PATCH 92/95] Use /usr/bin instead of /usr/sbin (#2340661) --- irda-utils-0.9.18-sbin.patch | 123 +++++++++++++++++++++++++++++++++++ irda-utils.spec | 10 ++- 2 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 irda-utils-0.9.18-sbin.patch diff --git a/irda-utils-0.9.18-sbin.patch b/irda-utils-0.9.18-sbin.patch new file mode 100644 index 0000000..55e8b70 --- /dev/null +++ b/irda-utils-0.9.18-sbin.patch @@ -0,0 +1,123 @@ +diff -Nrbu irda-utils-0.9.18/README irda-utils-0.9.18-OK/README +--- irda-utils-0.9.18/README 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/README 2025-01-23 18:58:15.456409010 +0300 +@@ -28,7 +28,7 @@ + + First of all you need to install the tools in this package. Make and + make install should do that for you. By default it will install the +-files in /etc/irda, and in /usr/sbin. If you don't like that, you ++files in /etc/irda, and in /usr/bin. If you don't like that, you + should edit the makefile. + + 2.2 irattach +diff -Nrbu irda-utils-0.9.18/etc/irda.rc irda-utils-0.9.18-OK/etc/irda.rc +--- irda-utils-0.9.18/etc/irda.rc 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/etc/irda.rc 2025-01-23 18:59:07.746012761 +0300 +@@ -17,7 +17,7 @@ + # Check that irda is up. + [ ${IRDA} = "no" ] && exit 0 + +-[ -f /usr/sbin/irattach ] || exit 0 ++[ -f /usr/bin/irattach ] || exit 0 + + ARGS= + if [ $DONGLE ]; then +@@ -32,7 +32,7 @@ + start) + # Attach irda device + echo -n "Starting IrDA: " +- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} ++ daemon /usr/bin/irattach ${DEVICE} ${ARGS} + touch /var/lock/subsys/irda + echo + ;; +diff -Nrbu irda-utils-0.9.18/findchip/Makefile irda-utils-0.9.18-OK/findchip/Makefile +--- irda-utils-0.9.18/findchip/Makefile 2025-01-23 18:49:11.278515528 +0300 ++++ irda-utils-0.9.18-OK/findchip/Makefile 2025-01-23 18:58:49.747149179 +0300 +@@ -60,7 +60,7 @@ + + install: findchip + $(prn_install) +- $(ECMD)install findchip $(ROOT)/usr/sbin/ ++ $(ECMD)install findchip $(ROOT)/usr/bin/ + + + gfindchip: gfindchip.c +diff -Nrbu irda-utils-0.9.18/irattach/Makefile irda-utils-0.9.18-OK/irattach/Makefile +--- irda-utils-0.9.18/irattach/Makefile 2025-01-23 18:49:11.278515528 +0300 ++++ irda-utils-0.9.18-OK/irattach/Makefile 2025-01-23 19:00:28.246402814 +0300 +@@ -60,8 +60,8 @@ + + install: $(TARGETS) + $(prn_install) +- $(ECMD)install irattach $(ROOT)/usr/sbin +- $(ECMD)install dongle_attach $(ROOT)/usr/sbin ++ $(ECMD)install irattach $(ROOT)/usr/bin ++ $(ECMD)install dongle_attach $(ROOT)/usr/bin + + + clean: +diff -Nrbu irda-utils-0.9.18/irattach/irattach.c irda-utils-0.9.18-OK/irattach/irattach.c +--- irda-utils-0.9.18/irattach/irattach.c 2025-01-23 18:49:11.285515475 +0300 ++++ irda-utils-0.9.18-OK/irattach/irattach.c 2025-01-23 19:00:18.207478893 +0300 +@@ -262,7 +262,7 @@ + int ret; + + sprintf(msg, "Trying to load module %s", name); +- sprintf(cmd, "/sbin/modprobe %s", name); ++ sprintf(cmd, "modprobe %s", name); + + ret = execute(msg, cmd); + +diff -Nrbu irda-utils-0.9.18/irdadump/Makefile irda-utils-0.9.18-OK/irdadump/Makefile +--- irda-utils-0.9.18/irdadump/Makefile 2025-01-23 18:49:11.278515528 +0300 ++++ irda-utils-0.9.18-OK/irdadump/Makefile 2025-01-23 18:58:43.057199840 +0300 +@@ -50,7 +50,7 @@ + + install: $(IRDADUMP_TARGET) + $(prn_install) +- $(ECMD)install $(IRDADUMP_TARGET) $(ROOT)/usr/sbin ++ $(ECMD)install $(IRDADUMP_TARGET) $(ROOT)/usr/bin + + clean: + $(RM_CMD) +diff -Nrbu irda-utils-0.9.18/irdaping/Makefile irda-utils-0.9.18-OK/irdaping/Makefile +--- irda-utils-0.9.18/irdaping/Makefile 2025-01-23 18:49:11.278515528 +0300 ++++ irda-utils-0.9.18-OK/irdaping/Makefile 2025-01-23 19:00:00.446613473 +0300 +@@ -65,7 +65,7 @@ + + install: $(TARGETS) + $(prn_install) +- $(ECMD)install irdaping $(ROOT)/usr/sbin ++ $(ECMD)install irdaping $(ROOT)/usr/bin + + clean: + $(RM_CMD) +diff -Nrbu irda-utils-0.9.18/irnetd/Makefile irda-utils-0.9.18-OK/irnetd/Makefile +--- irda-utils-0.9.18/irnetd/Makefile 2025-01-23 18:49:11.279515520 +0300 ++++ irda-utils-0.9.18-OK/irnetd/Makefile 2025-01-23 18:58:29.216304738 +0300 +@@ -55,7 +55,7 @@ + + install: irnetd + $(prn_install) +- $(ECMD) install irnetd $(ROOT)/usr/sbin/ ++ $(ECMD) install irnetd $(ROOT)/usr/bin/ + + + clean: +diff -Nrbu irda-utils-0.9.18/smcinit/Makefile irda-utils-0.9.18-OK/smcinit/Makefile +--- irda-utils-0.9.18/smcinit/Makefile 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/smcinit/Makefile 2025-01-23 18:59:49.557695945 +0300 +@@ -45,9 +45,9 @@ + + install: $(SMCINIT_TARGETS) + $(prn_install) +- $(ECMD)install smcinit $(ROOT)/usr/sbin +- $(ECMD)install tosh1800-smcinit $(ROOT)/usr/sbin +- $(ECMD)install tosh2450-smcinit $(ROOT)/usr/sbin ++ $(ECMD)install smcinit $(ROOT)/usr/bin ++ $(ECMD)install tosh1800-smcinit $(ROOT)/usr/bin ++ $(ECMD)install tosh2450-smcinit $(ROOT)/usr/bin + + clean: + $(RM_CMD) diff --git a/irda-utils.spec b/irda-utils.spec index ccffb4e..c2e9b0f 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: 50%{?dist} +Release: 51%{?dist} Url: http://irda.sourceforge.net # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -21,6 +21,7 @@ Patch7: irda-utils-0.9.18-man.patch Patch8: irda-utils-0.9.18-PIE.patch Patch9: irda-utils-0.9.18-no-inline.patch Patch10: irda-utils-0.9.18-run.patch +Patch11: irda-utils-0.9.18-sbin.patch BuildRequires: gcc BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units @@ -62,6 +63,7 @@ gzip -9 man/irnet.4 man/irda.7 %patch -P8 -p1 %patch -P9 -p1 %patch -P10 -p1 +%patch -P11 -p1 %build @@ -74,7 +76,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu89" ROOT="$RPM_BUILD_ROOT" \ %install rm -rf $RPM_BUILD_ROOT -for dir in %{_sbindir} %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig +for dir in %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig do install -d $RPM_BUILD_ROOT$dir done @@ -115,7 +117,6 @@ chmod -x etc/ifcfg-irlan0 %files -%{_sbindir}/* %{_bindir}/* %{_mandir}/*/* %{_unitdir}/* @@ -124,6 +125,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jan 23 2025 Dmitry Butskoy - 0.9.18-51 +- Use /usr/bin instead of /usr/sbin (#2340661) + * Fri Jan 17 2025 Fedora Release Engineering - 0.9.18-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b41727f229bbdbb3868f87b7dda25fc590f36346 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Thu, 19 Jun 2025 14:53:56 +0300 Subject: [PATCH 93/95] port to epel8 --- .cvsignore | 0 Makefile | 6 - irda-utils-0.9.15-rh1.patch | 11 + irda-utils-0.9.16-io.patch | 35 +++ irda-utils-0.9.17-makefile.patch | 79 ++++++ irda-utils-0.9.17-rootonly.patch | 14 + irda-utils-0.9.18-PIE.patch | 113 ++++++++ irda-utils-0.9.18-man.patch | 94 +++++++ irda-utils-0.9.18-no-inline.patch | 299 +++++++++++++++++++++ irda-utils-0.9.18-root.patch | 15 ++ irda-utils-0.9.18-run.patch | 11 + irda-utils.spec | 429 ++++++++++++++++++++++++++++++ irda.init | 80 ++++++ irda.service | 16 ++ irda.sysconfig | 8 + sources | 1 + 16 files changed, 1205 insertions(+), 6 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 irda-utils-0.9.15-rh1.patch create mode 100644 irda-utils-0.9.16-io.patch create mode 100644 irda-utils-0.9.17-makefile.patch create mode 100644 irda-utils-0.9.17-rootonly.patch create mode 100644 irda-utils-0.9.18-PIE.patch create mode 100644 irda-utils-0.9.18-man.patch create mode 100644 irda-utils-0.9.18-no-inline.patch create mode 100644 irda-utils-0.9.18-root.patch create mode 100644 irda-utils-0.9.18-run.patch create mode 100644 irda-utils.spec create mode 100644 irda.init create mode 100644 irda.service create mode 100644 irda.sysconfig diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 46901db..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: irda-utils -# $Id$ -NAME := irda-utils -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/irda-utils-0.9.15-rh1.patch b/irda-utils-0.9.15-rh1.patch new file mode 100644 index 0000000..6e4bfca --- /dev/null +++ b/irda-utils-0.9.15-rh1.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.15/irattach/irattach.c.rh1 2003-11-24 17:30:21.000000000 +0100 ++++ irda-utils-0.9.15/irattach/irattach.c 2003-11-24 17:34:51.000000000 +0100 +@@ -614,7 +614,7 @@ + /* First arg is device name. Save it now, because in some cases + * getopt() will remove it... */ + strncpy(device, argv[1], 20); +- device[20] = '\0'; ++ device[19] = '\0'; + + /* Look for options */ + /* Do this before processing device, to handle "-h" and -v" diff --git a/irda-utils-0.9.16-io.patch b/irda-utils-0.9.16-io.patch new file mode 100644 index 0000000..fdbfcae --- /dev/null +++ b/irda-utils-0.9.16-io.patch @@ -0,0 +1,35 @@ +diff -upr irda-utils-0.9.16/findchip/nsc.c irda-utils-0.9.16.new/findchip/nsc.c +--- irda-utils-0.9.16/findchip/nsc.c 2003-07-07 21:33:37.000000000 -0400 ++++ irda-utils-0.9.16.new/findchip/nsc.c 2006-03-24 07:16:14.000000000 -0500 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + #include "findchip.h" + +diff -upr irda-utils-0.9.16/findchip/smc.c irda-utils-0.9.16.new/findchip/smc.c +--- irda-utils-0.9.16/findchip/smc.c 2003-07-07 21:33:37.000000000 -0400 ++++ irda-utils-0.9.16.new/findchip/smc.c 2006-03-24 07:14:19.000000000 -0500 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #include "findchip.h" + +diff -upr irda-utils-0.9.16/findchip/winbond.c irda-utils-0.9.16.new/findchip/winbond.c +--- irda-utils-0.9.16/findchip/winbond.c 2000-11-06 16:11:39.000000000 -0500 ++++ irda-utils-0.9.16.new/findchip/winbond.c 2006-03-24 07:16:29.000000000 -0500 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #include "findchip.h" diff --git a/irda-utils-0.9.17-makefile.patch b/irda-utils-0.9.17-makefile.patch new file mode 100644 index 0000000..b0d7625 --- /dev/null +++ b/irda-utils-0.9.17-makefile.patch @@ -0,0 +1,79 @@ +--- irda-utils-0.9.17/irdadump/Makefile.rh3 2006-03-09 07:25:23.000000000 +0100 ++++ irda-utils-0.9.17/irdadump/Makefile 2006-06-01 14:47:25.000000000 +0200 +@@ -8,8 +8,8 @@ + + RM_CMD = $(ECMD)$(RM) *.BAK *.bak *.o ,* *~ *.a + +-INCLUDES = $(SYS_INCLUDES) -I../include/ +-LIBRARIES = $(SYS_LIBRARIES) ++INCLUDES = $(SYS_INCLUDES) -I../include/ -I. `pkg-config --cflags glib-2.0` ++LIBRARIES = $(SYS_LIBRARIES) `pkg-config --cflags --libs glib-2.0` + LIBPATH = $(SYS_LIBPATH) + + # +@@ -27,7 +27,7 @@ + LIBIRDADUMP_TARGET = lib_irdadump.a + IRDADUMP_TARGET = irdadump + +-all: lib_irdadump.a irdadump ++all: irdadump lib_irdadump.a + + + lib_irdadump.a: $(LIBIRDADUMP_OBJS) +@@ -40,7 +40,8 @@ + + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ $(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ #$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + + + .c.o: +--- irda-utils-0.9.17/irnetd/Makefile.rh3 2006-03-09 07:25:19.000000000 +0100 ++++ irda-utils-0.9.17/irnetd/Makefile 2006-06-01 14:47:25.000000000 +0200 +@@ -55,7 +55,7 @@ + + install: irnetd + $(prn_install) +- $(ECMD) install irnetd /usr/sbin/ ++ $(ECMD) install irnetd $(ROOT)/usr/sbin/ + + + clean: +--- irda-utils-0.9.17/Makefile.rh3 2006-03-09 07:25:27.000000000 +0100 ++++ irda-utils-0.9.17/Makefile 2006-06-01 14:48:21.000000000 +0200 +@@ -28,10 +28,11 @@ + TARGET = test + + DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit +-CFLAGS= -O2 -W -Wall ++CFLAGS = -O2 -W -Wall ++INCLUDES = -I/usr/include/glib-2.0 -I./include -I. + + all: +- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done) ++ @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(INCLUDES) $(MAKE_OUTPUT) -C $$d $@ ; done) + + + install: +--- irda-utils-0.9.17/psion/Makefile.rh3 2006-03-09 07:25:19.000000000 +0100 ++++ irda-utils-0.9.17/psion/Makefile 2006-06-01 14:47:25.000000000 +0200 +@@ -5,6 +5,7 @@ + PSION_SRC= irpsion5.c + PSION_OBJS= irpsion5.o + PSION_TARGETS= irpsion5 ++CFLAGS= -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) + + all: $(PSION_TARGETS) + +@@ -22,7 +23,6 @@ + $(ECMD)install $(PSION_TARGETS) $(ROOT)/usr/bin + + +-CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) + irpsion5: + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ +\ Kein Zeilenumbruch am Dateiende. ++ $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ diff --git a/irda-utils-0.9.17-rootonly.patch b/irda-utils-0.9.17-rootonly.patch new file mode 100644 index 0000000..2f0c78a --- /dev/null +++ b/irda-utils-0.9.17-rootonly.patch @@ -0,0 +1,14 @@ +--- irda-utils-0.9.17/irdadump/main.c.root 2006-06-01 12:53:34.000000000 +0200 ++++ irda-utils-0.9.17/irdadump/main.c 2006-06-01 12:54:03.000000000 +0200 +@@ -72,6 +72,11 @@ + char *readfilename = NULL; + int fd, c; + ++ if(geteuid()) { ++ puts("You need to be root to run this utility.\n"); ++ return 1; ++ } ++ + while ((c = getopt(argc, argv, "bc:di:lpr:s:tvw:x?")) != -1) { + switch (c) { + case 'b': /* Dumb bytes */ diff --git a/irda-utils-0.9.18-PIE.patch b/irda-utils-0.9.18-PIE.patch new file mode 100644 index 0000000..52bd241 --- /dev/null +++ b/irda-utils-0.9.18-PIE.patch @@ -0,0 +1,113 @@ +diff --git a/findchip/Makefile b/findchip/Makefile +index 7428617..0937827 100644 +--- a/findchip/Makefile ++++ b/findchip/Makefile +@@ -47,7 +47,7 @@ all: findchip + + findchip: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@ ++ $(ECMD)$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) -o $@ + + + clean: +diff --git a/irattach/Makefile b/irattach/Makefile +index e70de61..76383c2 100644 +--- a/irattach/Makefile ++++ b/irattach/Makefile +@@ -28,7 +28,7 @@ include ../output.mak + CC = gcc + LD = ld + RM = rm -f +-CFLAGS = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES) ++CFLAGS = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES) $(RPM_OPT_FLAGS) + + SYS_INCLUDES = -I/usr/include + SYS_LIBPATH = -L/usr/lib -L/usr/local/lib +@@ -49,13 +49,13 @@ all: $(TARGETS) + + irattach: irattach.o util.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@ + + + + dongle_attach: dongle_attach.o + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@ + + + install: $(TARGETS) +diff --git a/irdadump/Makefile b/irdadump/Makefile +index bd21abb..e7d8929 100644 +--- a/irdadump/Makefile ++++ b/irdadump/Makefile +@@ -19,7 +19,7 @@ SYS_INCLUDES = -I/usr/include + SYS_LIBRARIES = + SYS_LIBPATH = -L/usr/lib -L/usr/local/lib + +-CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0` ++CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0` $(RPM_OPT_FLAGS) + + LIBIRDADUMP_OBJS = irdadump.o irlap.o irlmp.o obex.o ircomm.o netbuf.o capture.o + IRDADUMP_OBJS = main.o +@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS) + + irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + #$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) + + +diff --git a/irdaping/Makefile b/irdaping/Makefile +index ef84acd..cd64c90 100644 +--- a/irdaping/Makefile ++++ b/irdaping/Makefile +@@ -56,7 +56,7 @@ all: $(TARGETS) + + irdaping: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + .c.o: +diff --git a/irnetd/Makefile b/irnetd/Makefile +index 1fb1571..5efbc4a 100644 +--- a/irnetd/Makefile ++++ b/irnetd/Makefile +@@ -50,7 +50,7 @@ all: $(TARGETS) + + irnetd: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + + + install: irnetd +diff --git a/psion/Makefile b/psion/Makefile +index 001926c..5d7cd7f 100644 +--- a/psion/Makefile ++++ b/psion/Makefile +@@ -25,4 +25,4 @@ install: $(PSION_TARGETS) + + irpsion5: + $(prn_cc_o) +- $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ ++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ +diff --git a/tekram/Makefile b/tekram/Makefile +index e10d116..65996e6 100644 +--- a/tekram/Makefile ++++ b/tekram/Makefile +@@ -55,7 +55,7 @@ all: irkbd + + irkbd: $(OBJS) + $(prn_cc_o) +- $(ECMD)$(CC) $(OBJS) -o $@ ++ $(ECMD)$(CC) $(LDFLAGS) $(OBJS) -o $@ + + + .c.o: diff --git a/irda-utils-0.9.18-man.patch b/irda-utils-0.9.18-man.patch new file mode 100644 index 0000000..36eb0d1 --- /dev/null +++ b/irda-utils-0.9.18-man.patch @@ -0,0 +1,94 @@ +diff -Nrbu irda-utils-0.9.18/man/irda.7 irda-utils-0.9.18-OK/man/irda.7 +--- irda-utils-0.9.18/man/irda.7 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/man/irda.7 2011-07-15 20:31:58.000000000 +0400 +@@ -61,7 +61,7 @@ + connection between two sockets on top of + .IR IrTTP , + similar to TCP sockets. IrTTP guarantees that the data arrives in +-order and manages flow contol, IrLAP retransmits lost packets. ++order and manages flow control, IrLAP retransmits lost packets. + .br + Stream sockets does not preserve record boundaries. + .TP +@@ -70,7 +70,7 @@ + connection between two sockets on top of + .IR IrTTP . + IrTTP guarantees that the data arrives in order and manages flow +-contol, IrLAP retransmits lost packets. ++control, IrLAP retransmits lost packets. + .br + SeqPacket sockets preserve record boundaries. Large datagrams will be + fragmented as needed. +@@ -79,8 +79,8 @@ + SeqPacket sockets provides a reliable, datagram oriented, full duplex + connection between two sockets on top of + .IR IrLMP . +-There is no guarantees that the data arrives in order and there is no +-flow contol, however IrLAP retransmits lost packets. ++There is no guarantee that the data arrives in order and there is no ++flow control, however IrLAP retransmits lost packets. + .br + Datagram sockets preserve record boundaries. No fragmentation is + provided, datagrams larger than the IrDA link MTU are truncated or +@@ -90,9 +90,9 @@ + Ultra sockets provides a connectionless, unreliable datagram packet + service on top of + .IR IrLAP-Ultra . +-Ultra datagrams are sent and receive only when no IrLAP connection is ++Ultra datagrams are sent and received only when no IrLAP connection is + established and otherwise discarded. They are always transmitted at +-9600 bauds. Datagrams may be lost, reordered, and there is no flow ++9600 bauds. Datagrams may be lost or reordered, and there is no flow + control. + .br + Ultra sockets preserve record boundaries. No fragmentation is +@@ -124,8 +124,8 @@ + .I sir_lsap_sel + is usually not used. + .I sir_addr +-is the address of the peer and optional (and that case the first peer +-discoverd will be used). ++is the optional address of the peer (if no given the first peer ++discovered will be used). + .I sir_name + is the service name of the socket. + .\" +diff -Nrbu irda-utils-0.9.18/man/irnet.4 irda-utils-0.9.18-OK/man/irnet.4 +--- irda-utils-0.9.18/man/irnet.4 2006-07-11 10:16:06.000000000 +0400 ++++ irda-utils-0.9.18-OK/man/irnet.4 2011-07-15 20:33:14.000000000 +0400 +@@ -31,7 +31,7 @@ + .I PPP over IrCOMM + is that it avoids the framing and serial emulation which are a + performance bottleneck. It also allows multipoint communications in a +-sensible fashion. And finally, it can automatically handle incomming ++sensible fashion. And finally, it can automatically handle incoming + connections through + .B irnetd. + .PP +@@ -84,7 +84,7 @@ + .IR "control channel" , + other use are unsupported. + .B IrNET +-support multiple concurent connections (limited by the IrDA stack), ++support multiple concurrent connections (limited by the IrDA stack), + all those connections are multiplexed on a single + .B /dev/irnet + device (as opposed to IrCOMM which as one device per connection). +@@ -164,7 +164,7 @@ + .\" EXAMPLE part + .\" + .SH EXAMPLE +-Start a IrNET server accepting any incomming connection: ++Start a IrNET server accepting any incoming connection: + .br + .B " pppd /dev/irnet 9600 local noauth nolock passive" + .PP +@@ -177,7 +177,7 @@ + .br + .B " pppd /dev/irnet 9600 local noauth nolock connect ""echo name MyIrDANode"" + .PP +-Start a IrNET server accepting incomming connection from peer with IrDA address 0x12345678 only on IrDA port 0x87654321: ++Start a IrNET server accepting incoming connection from peer with IrDA address 0x12345678 only on IrDA port 0x87654321: + .br + .B " pppd /dev/irnet 9600 local noauth nolock passive connect ""echo daddr 0x12345678 , saddr 0x87654321""" + .\" 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-0.9.18-root.patch b/irda-utils-0.9.18-root.patch new file mode 100644 index 0000000..770cae2 --- /dev/null +++ b/irda-utils-0.9.18-root.patch @@ -0,0 +1,15 @@ +--- irda-utils-0.9.18/etc/install-etc.root 2006-07-11 00:16:06.000000000 -0600 ++++ irda-utils-0.9.18/etc/install-etc 2009-10-20 10:11:39.691877856 -0600 +@@ -1,10 +1,10 @@ + #!/bin/sh + + # Only install on SYSV for now +-if [ -d /etc/sysconfig/ ]; then ++if [ -d $ROOT/etc/sysconfig/ ]; then + install -D irda.sysconfig $ROOT/etc/sysconfig/irda + install -D ifcfg-irlan0 $ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0 + fi +-if [ -d /etc/rc.d/init.d ]; then ++if [ -d $ROOT/etc/rc.d/init.d ]; then + install -D irda.rc $ROOT/etc/rc.d/init.d/irda + fi diff --git a/irda-utils-0.9.18-run.patch b/irda-utils-0.9.18-run.patch new file mode 100644 index 0000000..aa67ea7 --- /dev/null +++ b/irda-utils-0.9.18-run.patch @@ -0,0 +1,11 @@ +--- irda-utils-0.9.18/irattach/irattach.c.orig 2021-05-17 01:58:48.781587723 +0300 ++++ irda-utils-0.9.18/irattach/irattach.c 2021-05-17 02:01:21.738344238 +0300 +@@ -68,7 +68,7 @@ + static int termvalid = -1; /* If termsave is valid */ + + /* Default path for pid file */ +-char *pidfile = "/var/run/irattach.pid"; ++char *pidfile = "/run/irattach.pid"; + + /* Used by ioctl to the tty to obtain the network device name */ + struct irtty_info { diff --git a/irda-utils.spec b/irda-utils.spec new file mode 100644 index 0000000..7c441ea --- /dev/null +++ b/irda-utils.spec @@ -0,0 +1,429 @@ + +Summary: Utilities for infrared communication between devices +Name: irda-utils +Version: 0.9.18 +Release: 41%{?dist} +Url: http://irda.sourceforge.net +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later +ExcludeArch: s390 s390x +Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz +Source1: irda.init +Source2: irda.service +Source3: irda.sysconfig +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 +Patch6: irda-utils-0.9.18-root.patch +Patch7: irda-utils-0.9.18-man.patch +Patch8: irda-utils-0.9.18-PIE.patch +Patch9: irda-utils-0.9.18-no-inline.patch +Patch10: irda-utils-0.9.18-run.patch +BuildRequires: gcc +BuildRequires: glib2-devel, pciutils-devel +BuildRequires: systemd-units +BuildRequires: make + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + + +%description +IrDA(TM) (Infrared Data Association) is an industry standard for +wireless, infrared communication between devices. IrDA speeds range +from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices +including laptops, LAN adapters, PDAs, printers, and mobile phones. + +The Linux-IrDA project is a GPL'd implementation, written from +scratch, of the IrDA protocols. Supported IrDA protocols include +IrLAP, IrLMP, IrIAP, IrTTP, IrLPT, IrLAN, IrCOMM and IrOBEX. + +The irda-utils package contains a collection of programs that enable +the use of IrDA protocols. Most IrDA features are implemented in the +kernel, so IrDA support must be enabled in the kernel before any IrDA +tools or programs can be used. Some configuration outside the kernel +is required, however, and some IrDA features, like IrOBEX, are +actually implemented outside the kernel. + + +%prep +%setup -q +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P6 -p1 +gunzip man/irnet.4.gz man/irda.7.gz +%patch -P7 -p1 +gzip -9 man/irnet.4 man/irda.7 +%patch -P8 -p1 +%patch -P9 -p1 +%patch -P10 -p1 + + +%build +export LDFLAGS="%{?__global_ldflags}" +make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu89" ROOT="$RPM_BUILD_ROOT" \ + LDFLAGS="%{?__global_ldflags}" \ + CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +for dir in %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig +do + install -d $RPM_BUILD_ROOT$dir +done + +make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}" + +#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda +#chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda +rm -f $RPM_BUILD_ROOT/%{_initrddir}/irda + +install -d $RPM_BUILD_ROOT%{_unitdir} +install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/irda.service +install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda + +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-irlan0 + +for i in irattach irdadump irdaping tekram +do + [ -f $i/README ] && ln $i/README README.$i +done +iconv -f ISO8859-1 -t UTF-8 README.irdadump.new && \ + mv -f README.irdadump.new README.irdadump +mv etc/modules.conf.irda etc/modprobe.conf.irda +chmod -x etc/ifcfg-irlan0 + + + +%post +%systemd_post irda.service + + +%preun +%systemd_preun irda.service + + +%postun +%systemd_postun_with_restart irda.service + + +%files +%{_bindir}/* +%{_mandir}/*/* +%{_unitdir}/* +%config(noreplace) %{_sysconfdir}/sysconfig/irda +%doc README* etc/ifcfg-irlan0 etc/modprobe.conf.irda + + +%changelog +* Thu Jun 19 2025 Dmitry Butskoy - 0.9.18-41 +- port to EPEL8 + +* Mon May 17 2021 Dmitry Butskoy - 0.9.18-40 +- move /var/run to /run and fix systemd service file (#1960900) + +* Tue Mar 02 2021 Zbigniew JÄ™drzejewski-Szmek - 0.9.18-39 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.18-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.9.18-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.9.18-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.9.18-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.9.18-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.9.18-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.9.18-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0.9.18-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.18-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* 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) + +* 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 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.18-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 0.9.18-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.18-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9.18-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jun 13 2013 Dmitry Butskoy - 0.9.18-18 +- build with PIE flags (#955165) + +* Thu Feb 14 2013 Fedora Release Engineering - 0.9.18-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 24 2012 Dmitry Butskoy - 0.9.18-16 +- new systemd-rpm macros (#850171) + +* Thu Jul 19 2012 Fedora Release Engineering - 0.9.18-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.9.18-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jul 18 2011 Dmitry Butskoy - 0.9.18-13 +- migrate from SysV to Systemd init system (#694940) + +* Fri Jul 15 2011 Dmitry Butskoy - 0.9.18-12 +- spec file cleanup +- add own init script instead of huge patched original one + (and fix #242468) +- disable smcinit manuals in smcdisable patch as well +- fix typos in man pages (#668122, #675677) + +* Wed Feb 09 2011 Fedora Release Engineering - 0.9.18-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Oct 20 2009 Orion Poplawski - 0.9.18-10 +- Add patch to fix installing of initscript into buildroot + +* Mon Aug 10 2009 Ville Skyttä - 0.9.18-9 +- Convert specfile to UTF-8. + +* Fri Jul 24 2009 Fedora Release Engineering - 0.9.18-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 01 2008 Karsten Hopp 0.9.18-6 +- use macros, fix Source0 + +* Thu Jul 31 2008 Tom "spot" Callaway - 0.9.18-5 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 0.9.18-4 +- Autorebuild for GCC 4.3 + +* Wed Aug 29 2007 Karsten Hopp 0.9.18-3 +- rebuild for buildid + +* Wed Feb 21 2007 Karsten Hopp 0.9.18-2 +- review cleanups + +* Tue Jan 23 2007 Karsten Hopp 0.9.18-1 +- update to 0.9.18 + +* Tue Aug 01 2006 Karsten Hopp 0.9.17-2 +- initscript fix from Paul Bolle (#168325) + +* Wed Jul 12 2006 Jesse Keating - 0.9.17-1.1 +- rebuild + +* Mon Jun 19 2006 Karsten Hopp 0.9.17-1 +- update to 0.9.17 +- makefile fixes +- disable smcinit +- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted + +* Mon Apr 03 2006 Karsten Hopp 0.9.16-8 +- don't use asm/io.h directly (Bastien Nocera #186875) + +* Fri Feb 10 2006 Jesse Keating - 0.9.16-7.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0.9.16-7.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Mar 02 2005 Karsten Hopp 0.9.16-7 +- build with gcc-4 + +* Tue Feb 15 2005 Karsten Hopp 0.9.16-6 +- use RPM_OPT_FLAGS as CFLAGS + +* Tue Feb 15 2005 Karsten Hopp 0.9.16-5 +- load irtty-sir module (#148750) + +* Wed Feb 02 2005 Karsten Hopp 0.9.16-4 +- use glib2 instead of glib (#136223) + +* Mon Oct 04 2004 Karsten Hopp 0.9.16-3 +- load irda modules to make it work with udev (#134322) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Jun 02 2004 Karsten Hopp 0.9.16-1 +- update + +* Wed Feb 18 2004 Karsten Hopp 0.9.15-5 +- add manpages (#115972) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 24 2004 Florian La Roche +- do not use *.spec as filename for a patch + +* Mon Nov 24 2003 Karsten Hopp 0.9.15-2 +- fix array usage (#110791) + +* Sun Oct 19 2003 Florian La Roche +- add a %%clean specfile target + +* Thu Jul 03 2003 Karsten Hopp 0.9.15-1.1 +- rebuilt + +* Wed Jul 02 2003 Karsten Hopp 0.9.15-1 +- update +- removed libtool patch, it's obsolete now +- new root patch + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 16 2002 Dan Walsh 0.9.14-8 +- Fixed service script description + +* Mon Dec 09 2002 Phil Knirsch 0.9.14-7 +- Fixed problem with %%doc entries. + +* Tue Jul 09 2002 Phil Knirsch 0.9.14-6 +- Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it + to the docs dir. + +* Fri Jun 21 2002 Tim Powers 0.9.14-5 +- automated rebuild + +* Thu May 23 2002 Tim Powers 0.9.14-4 +- automated rebuild + +* Thu Apr 4 2002 Bernhard Rosenkraenzer 0.9.14-3 +- Stop irda service earlier (#61777) + +* Mon Jul 16 2001 Bernhard Rosenkraenzer 0.9.14-2 +- Fix libtool detection (#49093) + +* Tue Apr 24 2001 Bernhard Rosenkraenzer 0.9.14-1 +- 0.9.14-1 + +* Thu Feb 8 2001 Bernhard Rosenkraenzer +- Make init scripts more i18n friendly (use $0, $prog) + Bugs #26527 and #26550 +- Exclude S/390 (they don't have the needed hardware) + +* Mon Feb 5 2001 Bernhard Rosenkraenzer +- i18nize init scripts (#26077) + +* Wed Jan 10 2001 Bernhard Rosenkraenzer +- chmod -x /etc/sysconfig/irda (#22837) + +* Sat Jan 6 2001 Bernhard Rosenkraenzer +- Fix up the init script + +* Mon Dec 25 2000 Bernhard Rosenkraenzer +- Get rid of the /etc/modules.conf hack; the entries are in the + latest modutils by default. (Bug #22799) +- Require modutils >= 2.3.21-4 to make sure the modules.conf hack + isn't needed + +* Wed Dec 6 2000 Bernhard Rosenkraenzer +- Require modutils >= 2.3.11-5 rather than /etc/modules.conf + +* Tue Dec 5 2000 Bernhard Rosenkraenzer +- 0.9.13 + +* Tue Oct 31 2000 Bernhard Rosenkraenzer +- Add necessary entries to /etc/modules.conf in %%post (Bug #19960) +- Update source URL +- Fix build with current kernel 2.4 header files + +* Mon Oct 2 2000 Bernhard Rosenkraenzer +- make irdadump exit with an error message rather than a segfault when + run as non-root +- Update URL + +* Wed Aug 2 2000 Bill Nottingham +- fix start priority (345 isn't right...) +- fix condrestart + +* Sun Jul 23 2000 Trond Eivind Glomsrød +- source files from /etc/rc.d/init.d + +* Sun Jul 23 2000 Trond Eivind Glomsrød +- don't prereq /etc/init.d anymore +- rename "rh-status" +- use %%{_tmppath} + +* Sat Jul 15 2000 Bill Nottingham +- move initscript back + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Tue Jun 27 2000 Preston Brown +- don't prereq, only require initscripts + +* Mon Jun 26 2000 Bernhard Rosenkraenzer +- Fix up initscripts +- chkconfigize + +* Sun Jun 18 2000 Matt Wilson +- rebuilt for next release + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- 0.9.10 +- add docs + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- strip libraries + +* Mon Jan 31 2000 Bill Nottingham +- fix typo in initscript + +* Mon Oct 11 1999 Cristian Gafton +- remove some of the network config files (and hope that the package will + still work :-) + +* Sun Oct 10 1999 Bernhard Rosenkraenzer +- Add the /etc/irda directory. It's needed. +- Add the /etc/rc.d/init.d/irda script to start the irda daemon +- chkconfig'ize /etc/rc.d/init.d/irda + +* Fri Sep 17 1999 Cristian Gafton +- build for RH 6.1 +- add patch to make the damn package compile without any IrDA installed. diff --git a/irda.init b/irda.init new file mode 100644 index 0000000..d6bef3c --- /dev/null +++ b/irda.init @@ -0,0 +1,80 @@ +#!/bin/sh +# +# irda This shell script takes care of starting and stopping +# IrDA support +# +# chkconfig: - 45 24 +# description: IrDA(TM) (Infrared Data Association) is an industry standard \ +# for wireless, infrared communication between devices. IrDA speeds range \ +# from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices \ +# including laptops, LAN adapters, PDAs, printers, and mobile phones. +# + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source IrDA networking configuration. +. /etc/sysconfig/irda + + +# Check that irda is up. +[ ${IRDA} = "no" ] && exit 6 + +[ -f /usr/sbin/irattach ] || exit 5 + +args= +[ -n "$DONGLE" ] && args="$args -d $DONGLE" +[ "$DISCOVERY" = "yes" ] && args="$args -s" + + +RETVAL=0 + +start() { + echo -n $"Starting IrDA: " + /sbin/modprobe ircomm-tty 2>/dev/null + /sbin/modprobe irtty-sir 2>/dev/null + /sbin/modprobe irnet 2>/dev/null + daemon /usr/sbin/irattach ${DEVICE} ${args} + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/irda + echo +} + +stop() { + echo -n $"Shutting down IrDA: " + killproc irattach + RETVAL=$? + rm -f /var/lock/subsys/irda + echo +} + +restart() { + stop + start +} + + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status irattach + RETVAL=$? + ;; + restart|reload|force-reload) + restart + ;; + condrestart|try-restart) + [ -f /var/lock/subsys/irda ] && restart + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" + exit 3 +esac + +exit $RETVAL diff --git a/irda.service b/irda.service new file mode 100644 index 0000000..85ec7bb --- /dev/null +++ b/irda.service @@ -0,0 +1,16 @@ +[Unit] +Description=Irda Support +After=syslog.target + +[Service] +Type=forking +PIDFile=/run/irattach.pid +EnvironmentFile=-/etc/sysconfig/irda +ExecStartPre=-/sbin/modprobe -qab ircomm-tty irtty-sir irnet +ExecStart=/usr/sbin/irattach ${DEVICE} ${OPTIONS} +StandardOutput=journal +StandardError=journal + + +[Install] +WantedBy=multi-user.target diff --git a/irda.sysconfig b/irda.sysconfig new file mode 100644 index 0000000..db86728 --- /dev/null +++ b/irda.sysconfig @@ -0,0 +1,8 @@ +# Either a tty name, or IrDA interface name, or FIR module name. +# See irattach(8) for more info +DEVICE=/dev/ttyS2 + +# `-s' starts discovery of remote devices +# `-d dongle' attaches an additional dongle driver `dobgle' to the IrDA port +#OPTIONS="-s -d actisys+" +OPTIONS="-s" diff --git a/sources b/sources index e69de29..40b238c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +84dc12aa4c3f61fccb8d8919bf4079bb irda-utils-0.9.18.tar.gz From 1c126dbd2201e37665987ea757982ababbaf05c6 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Thu, 19 Jun 2025 15:10:34 +0300 Subject: [PATCH 94/95] . --- irda-utils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index 7c441ea..7dd4f8d 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -73,7 +73,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu89" ROOT="$RPM_BUILD_ROOT" \ %install rm -rf $RPM_BUILD_ROOT -for dir in %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig +for dir in %{_sbindir} %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig do install -d $RPM_BUILD_ROOT$dir done @@ -114,6 +114,7 @@ chmod -x etc/ifcfg-irlan0 %files +%{_sbindir}/* %{_bindir}/* %{_mandir}/*/* %{_unitdir}/* From df5ffc467a2bc499f199dc2207bae45a74d7af22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:47:17 +0000 Subject: [PATCH 95/95] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- irda-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/irda-utils.spec b/irda-utils.spec index c2e9b0f..7af8a05 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: 51%{?dist} +Release: 52%{?dist} Url: http://irda.sourceforge.net # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -125,6 +125,9 @@ chmod -x etc/ifcfg-irlan0 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.9.18-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 23 2025 Dmitry Butskoy - 0.9.18-51 - Use /usr/bin instead of /usr/sbin (#2340661)