From 1eb450c46020d44d6ec455848a262412a9925cdc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 1 Nov 2005 02:59:11 +0000 Subject: [PATCH 001/139] auto-import apcupsd-3.10.18-3 on branch devel from apcupsd-3.10.18-3.src.rpm --- .cvsignore | 1 + apcupsd-3.10.18-init.patch | 20 ++++++ apcupsd.spec | 139 +++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 161 insertions(+) create mode 100644 apcupsd-3.10.18-init.patch create mode 100644 apcupsd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..00746ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +apcupsd-3.10.18.tar.gz diff --git a/apcupsd-3.10.18-init.patch b/apcupsd-3.10.18-init.patch new file mode 100644 index 0000000..9c36f93 --- /dev/null +++ b/apcupsd-3.10.18-init.patch @@ -0,0 +1,20 @@ +--- apcupsd-3.10.18/platforms/redhat/apcupsd.in.orig 2005-01-09 15:55:41.000000000 -0700 ++++ apcupsd-3.10.18/platforms/redhat/apcupsd.in 2005-10-31 10:35:05.000000000 -0700 +@@ -3,7 +3,7 @@ + # apcupsd This shell script takes care of starting and stopping + # the apcupsd UPS monitoring daemon. + # +-# chkconfig: 2345 60 99 ++# chkconfig: - 60 99 + # description: apcupsd monitors power and takes action if necessary + # + APCPID=@PIDDIR@/apcupsd.pid +@@ -42,7 +42,7 @@ + rm -f $APCPID + rm -f @LOCKDIR@/subsys/apcupsd + ;; +- restart) ++ restart|reload) + $0 stop + sleep 15 + $0 start diff --git a/apcupsd.spec b/apcupsd.spec new file mode 100644 index 0000000..3a9b51e --- /dev/null +++ b/apcupsd.spec @@ -0,0 +1,139 @@ +Name: apcupsd +Version: 3.10.18 +Release: 3%{?dist} +Summary: APC UPS Power Control Daemon for Linux + +Group: System Environment/Daemons +License: GPL +URL: http://www.apcupsd.com +Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz +Patch0: apcupsd-3.10.18-init.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix +Requires: /bin/mail +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig + +%description +Apcupsd can be used for controlling most APC UPSes. During a +power failure, apcupsd will inform the users about the power +failure and that a shutdown may occur. If power is not restored, +a system shutdown will follow when the battery is exausted, a +timeout (seconds) expires, or the battery runtime expires based +on internal APC calculations determined by power consumption +rates. If the power is restored before one of the above shutdown +conditions is met, apcupsd will inform users about this fact. +Some features depend on what UPS model you have (simple or smart). + + +%package cgi +Summary: Web interface for apcupsd +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +Requires: httpd + +%description cgi +A CGI interface to the APC UPS monitoring daemon. + + +%prep +%setup -q +%patch -p1 -b .init +dos2unix examples/*status + + +%build +%configure \ + --sysconfdir="%{_sysconfdir}/apcupsd" \ + --with-cgi-bin="%{_localstatedir}/www/cgi-bin/apcupsd" \ + --enable-cgi \ + --enable-pthreads \ + --enable-net \ + --enable-master-slave \ + --enable-apcsmart \ + --enable-dumb \ + --enable-usb \ + --with-serial-dev= \ + --with-upstype=usb \ + --with-upscable=usb \ + APCUPSD_MAIL=/bin/mail + +make + + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/apcupsd + +make DESTDIR=$RPM_BUILD_ROOT install + +rm $RPM_BUILD_ROOT%{_initrddir}/halt +rm $RPM_BUILD_ROOT%{_initrddir}/halt.old + +install -m744 platforms/apccontrol \ + $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol + +install -m755 platforms/redhat/apcupsd $RPM_BUILD_ROOT%{_initrddir} + +chmod -x examples/*.conf +rm examples/*.in + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING ChangeLog doc/README.apcaccess doc/developers_manual examples ReleaseNotes +%dir %{_sysconfdir}/apcupsd +%{_initrddir}/apcupsd +%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf +%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf +%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf +%attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol +%{_sysconfdir}/apcupsd/changeme +%{_sysconfdir}/apcupsd/commfailure +%{_sysconfdir}/apcupsd/commok +%{_sysconfdir}/apcupsd/onbattery +%{_sysconfdir}/apcupsd/mainsback +%{_sysconfdir}/apcupsd/masterconnect +%{_sysconfdir}/apcupsd/mastertimeout +%attr(0755,root,root) %{_sbindir}/* +%{_mandir}/*/* + +%files cgi +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css +%{_localstatedir}/www/cgi-bin/apcupsd/ + + +%post +# add our links +if [ "$1" -ge 1 ] ; then +/sbin/chkconfig --add apcupsd +fi + + +%preun +if [ $1 = 0 ] ; then + # remove startup links + /sbin/chkconfig --del apcupsd +fi + + +%changelog +* Mon Oct 17 2005 - Orion Poplawski - 3.10.18-3 +- Removed %{_smp_mflags} from make, broke builds +- Patch init file to not start automatically and add reload +- Mark css file config +- Require /sbin/chkconfig + +* Mon Oct 17 2005 - Orion Poplawski - 3.10.18-2 +- Add %defattr to -cgi package + +* Wed Aug 17 2005 - Orion Poplawski - 3.10.18-1 +- Initial Fedora Version diff --git a/sources b/sources index e69de29..fccbc2f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +64104a1fface0253e77318ca84948bac apcupsd-3.10.18.tar.gz From 0bdd316b6985ad90a3446e648b682635cb7cf6c8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 4 Nov 2005 23:42:56 +0000 Subject: [PATCH 002/139] Apache configuration script for apcupsd CGI scripts --- apcupsd-httpd.conf | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 apcupsd-httpd.conf diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf new file mode 100644 index 0000000..30c5679 --- /dev/null +++ b/apcupsd-httpd.conf @@ -0,0 +1,22 @@ +# +# apcupsd configuration file for Apache Web server +# + +# files are off the documentroot of Web server +ScriptAlias /apcupsd/ "/var/www/apcupsd/" + +# +# Allow only local access at default +# Change the ".example.com" to match your domain or modify +# access rights to your needs to enable remote access also. +# + + DirectoryIndex upsstats.cgi + AllowOverride None + Options ExecCGI + Order deny,allow + Deny from all + Allow from 127.0.0.1 + Allow from ::1 + # Allow from .example.com + From 94364209ebd3a263e5e14fac74625176d19f8f76 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 4 Nov 2005 23:43:25 +0000 Subject: [PATCH 003/139] logrotate script for /var/log/apcupsd.events --- apcupsd.logrotate | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 apcupsd.logrotate diff --git a/apcupsd.logrotate b/apcupsd.logrotate new file mode 100644 index 0000000..0bfef2a --- /dev/null +++ b/apcupsd.logrotate @@ -0,0 +1,5 @@ +/var/log/apcupsd.events { + missingok + copytruncate + notifempty +} From 390086c4e714d35bd7b7685dc75c96df66a8fbaf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 4 Nov 2005 23:43:44 +0000 Subject: [PATCH 004/139] - Add logrotate script for /var/log/apcupsd.events - Add apache configuration script and change cgi directory to /var/www/apcupsd - Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support --- apcupsd.spec | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 3a9b51e..51cd066 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,16 +1,19 @@ Name: apcupsd Version: 3.10.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons License: GPL URL: http://www.apcupsd.com Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz +Source1: apcupsd.logrotate +Source2: apcupsd-httpd.conf Patch0: apcupsd-3.10.18-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix +BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers Requires: /bin/mail Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -46,19 +49,25 @@ dos2unix examples/*status %build %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ - --with-cgi-bin="%{_localstatedir}/www/cgi-bin/apcupsd" \ + --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ --enable-cgi \ --enable-pthreads \ --enable-net \ --enable-master-slave \ --enable-apcsmart \ --enable-dumb \ + --enable-net-snmp \ + --enable-snmp \ --enable-usb \ + --enable-powerflute \ + --enable-nls \ + --with-libwrap=%{_libdir} \ --with-serial-dev= \ --with-upstype=usb \ --with-upscable=usb \ APCUPSD_MAIL=/bin/mail + make @@ -66,7 +75,7 @@ make rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_initrddir} -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/apcupsd +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd make DESTDIR=$RPM_BUILD_ROOT install @@ -78,6 +87,11 @@ install -m744 platforms/apccontrol \ install -m755 platforms/redhat/apcupsd $RPM_BUILD_ROOT%{_initrddir} +install -d %{buildroot}%{_sysconfdir}/logrotate.d +install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -d %{buildroot}%{_sysconfdir}/httpd/conf.d +install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf + chmod -x examples/*.conf rm examples/*.in @@ -102,13 +116,15 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/apcupsd/mainsback %{_sysconfdir}/apcupsd/masterconnect %{_sysconfdir}/apcupsd/mastertimeout +%config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* %files cgi %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css -%{_localstatedir}/www/cgi-bin/apcupsd/ +%config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf +%{_localstatedir}/www/apcupsd/ %post @@ -126,6 +142,12 @@ fi %changelog +* Fri Nov 4 2005 - Orion Poplawski - 3.10.18-4 +- Add logrotate script for /var/log/apcupsd.events +- Add apache configuration script and change cgi directory to + /var/www/apcupsd +- Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support + * Mon Oct 17 2005 - Orion Poplawski - 3.10.18-3 - Removed %{_smp_mflags} from make, broke builds - Patch init file to not start automatically and add reload From 61de78e74ed90baa1c83a162f5a70a4ffeee8df5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 16 Nov 2005 21:37:25 +0000 Subject: [PATCH 005/139] Bump for new openssl --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 51cd066..0614d23 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.10.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -142,6 +142,9 @@ fi %changelog +* Wed Nov 16 2005 - Orion Poplawski - 3.10.18-5 +- Bump for new openssl + * Fri Nov 4 2005 - Orion Poplawski - 3.10.18-4 - Add logrotate script for /var/log/apcupsd.events - Add apache configuration script and change cgi directory to From eb89ad744d25bbfb5ad87f762a689bf24812b53c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 21 Dec 2005 17:02:50 +0000 Subject: [PATCH 006/139] Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 0614d23..656762e 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.10.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -142,6 +142,9 @@ fi %changelog +* Wed Dec 21 2005 - Orion Poplawski - 3.10.18-6 +- Rebuild + * Wed Nov 16 2005 - Orion Poplawski - 3.10.18-5 - Bump for new openssl From 0b3ed40a4389b08f65ceeb3610ebf547c62f320c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 3 Jan 2006 17:53:58 +0000 Subject: [PATCH 007/139] Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 656762e..02fcea1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.10.18 -Release: 6%{?dist} +Release: 7%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -142,6 +142,9 @@ fi %changelog +* Tue Jan 3 2006 - Orion Poplawski - 3.10.18-7 +- Rebuild + * Wed Dec 21 2005 - Orion Poplawski - 3.10.18-6 - Rebuild From 1769f5779a9d855e9d0fc3e9f252a920508e71a1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Jan 2006 00:09:56 +0000 Subject: [PATCH 008/139] Update to 3.12.0 --- .cvsignore | 2 +- apcupsd.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 00746ef..48a6087 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.10.18.tar.gz +apcupsd-3.12.0.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 02fcea1..1c749c3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.10.18 -Release: 7%{?dist} +Version: 3.12.0 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -43,7 +43,7 @@ A CGI interface to the APC UPS monitoring daemon. %prep %setup -q %patch -p1 -b .init -dos2unix examples/*status +dos2unix examples/*status examples/*.c %build @@ -92,7 +92,7 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf -chmod -x examples/*.conf +chmod -x examples/*.conf examples/*.c rm examples/*.in @@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog doc/README.apcaccess doc/developers_manual examples ReleaseNotes +%doc COPYING ChangeLog examples ReleaseNotes %dir %{_sysconfdir}/apcupsd %{_initrddir}/apcupsd %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf @@ -112,8 +112,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/apcupsd/changeme %{_sysconfdir}/apcupsd/commfailure %{_sysconfdir}/apcupsd/commok +%{_sysconfdir}/apcupsd/offbattery %{_sysconfdir}/apcupsd/onbattery -%{_sysconfdir}/apcupsd/mainsback %{_sysconfdir}/apcupsd/masterconnect %{_sysconfdir}/apcupsd/mastertimeout %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd @@ -142,6 +142,9 @@ fi %changelog +* Wed Jan 4 2006 - Orion Poplawski - 3.12.0-1 +- Update to 3.12.0 + * Tue Jan 3 2006 - Orion Poplawski - 3.10.18-7 - Rebuild diff --git a/sources b/sources index fccbc2f..76b9111 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64104a1fface0253e77318ca84948bac apcupsd-3.10.18.tar.gz +7adb6274ede9dfaec7b6641105ae7a3a apcupsd-3.12.0.tar.gz From 70c71f8be52ecf25c164ea7e820cb224e8789979 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Jan 2006 16:56:55 +0000 Subject: [PATCH 009/139] Update to 3.12.1 --- .cvsignore | 2 +- apcupsd.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 48a6087..9475032 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.12.0.tar.gz +apcupsd-3.12.1.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 1c749c3..30a59d7 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,5 +1,5 @@ Name: apcupsd -Version: 3.12.0 +Version: 3.12.1 Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux @@ -142,6 +142,9 @@ fi %changelog +* Tue Jan 10 2006 - Orion Poplawski - 3.12.1-1 +- Update to 3.12.1 + * Wed Jan 4 2006 - Orion Poplawski - 3.12.0-1 - Update to 3.12.0 diff --git a/sources b/sources index 76b9111..0ce9ad8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7adb6274ede9dfaec7b6641105ae7a3a apcupsd-3.12.0.tar.gz +d2e710176430a28d624500e145d9ffe3 apcupsd-3.12.1.tar.gz From d2850135ec8e0cb72ecb85bf93b072d257705437 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 13 Feb 2006 18:31:17 +0000 Subject: [PATCH 010/139] -Update to 3.12.2 - Don't strip binaries --- .cvsignore | 2 +- apcupsd.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9475032..d2823d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.12.1.tar.gz +apcupsd-3.12.2.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 30a59d7..0e6e46b 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,5 +1,5 @@ Name: apcupsd -Version: 3.12.1 +Version: 3.12.2 Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux @@ -44,7 +44,8 @@ A CGI interface to the APC UPS monitoring daemon. %setup -q %patch -p1 -b .init dos2unix examples/*status examples/*.c - +# Don't strip binaries +sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in %build %configure \ @@ -142,6 +143,10 @@ fi %changelog +* Tue Jan 10 2006 - Orion Poplawski - 3.12.2-1 +- Update to 3.12.2 +- Don't strip binaries + * Tue Jan 10 2006 - Orion Poplawski - 3.12.1-1 - Update to 3.12.1 diff --git a/sources b/sources index 0ce9ad8..85f2f57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2e710176430a28d624500e145d9ffe3 apcupsd-3.12.1.tar.gz +f771fafbc06551e7820bd3d277b5cce3 apcupsd-3.12.2.tar.gz From a6ddb1b3b57c7d75e6d0c5acede52b57a5387680 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 21 Aug 2006 16:43:01 +0000 Subject: [PATCH 011/139] Update to 3.12.4 --- .cvsignore | 2 +- apcupsd.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d2823d7..1c0030b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.12.2.tar.gz +apcupsd-3.12.4.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 0e6e46b..1547f18 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,5 +1,5 @@ Name: apcupsd -Version: 3.12.2 +Version: 3.12.4 Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux @@ -143,6 +143,9 @@ fi %changelog +* Mon Aug 21 2006 - Orion Poplawski - 3.12.4-1 +- Update to 3.12.4 + * Tue Jan 10 2006 - Orion Poplawski - 3.12.2-1 - Update to 3.12.2 - Don't strip binaries diff --git a/sources b/sources index 85f2f57..77ac446 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f771fafbc06551e7820bd3d277b5cce3 apcupsd-3.12.2.tar.gz +669c833ec02a2bc29fa98f845e5f5de5 apcupsd-3.12.4.tar.gz From ca3419284fa8de28bb1ea9172e84d49ee3810385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:15:01 +0000 Subject: [PATCH 012/139] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 42129059dc03671101e94d8c09c8979060a29c0e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 30 Aug 2006 02:23:37 +0000 Subject: [PATCH 013/139] Rebuild for FC6 --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1547f18..2fbc31e 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.12.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -143,6 +143,9 @@ fi %changelog +* Tue Aug 29 2006 - Orion Poplawski - 3.12.4-2 +- Rebuild for FC6 + * Mon Aug 21 2006 - Orion Poplawski - 3.12.4-1 - Update to 3.12.4 From 8910e0132f107f7d611f5efabdd169b1d5de4abe Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 5 Sep 2006 20:08:02 +0000 Subject: [PATCH 014/139] Rebuilt for FC6 --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 29cc87160ff8d23935e7bc81c5fe028f6578f29c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Oct 2006 16:47:43 +0000 Subject: [PATCH 015/139] - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952). Patch from Clive Messer (clive@vacuumtube.org.uk) --- apcupsd-httpd.conf | 4 ++-- apcupsd.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf index 30c5679..9e5ff87 100644 --- a/apcupsd-httpd.conf +++ b/apcupsd-httpd.conf @@ -10,10 +10,10 @@ ScriptAlias /apcupsd/ "/var/www/apcupsd/" # Change the ".example.com" to match your domain or modify # access rights to your needs to enable remote access also. # - + DirectoryIndex upsstats.cgi AllowOverride None - Options ExecCGI + Options ExecCGI Indexes Order deny,allow Deny from all Allow from 127.0.0.1 diff --git a/apcupsd.spec b/apcupsd.spec index 2fbc31e..4e69cbf 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.12.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -143,6 +143,10 @@ fi %changelog +* Mon Oct 9 2006 - Orion Poplawski - 3.12.4-3 +- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952). + Patch from Clive Messer (clive@vacuumtube.org.uk) + * Tue Aug 29 2006 - Orion Poplawski - 3.12.4-2 - Rebuild for FC6 From bb7a6096532d8055899e953d6955bf16ca5d3cf4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 30 Nov 2006 17:26:26 +0000 Subject: [PATCH 016/139] Update to 3.13.9, add gui package --- .cvsignore | 2 +- apcupsd-net-snmp.patch | 10 +++++++++ apcupsd.spec | 46 +++++++++++++++++++++++++++++++++++------- sources | 2 +- 4 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 apcupsd-net-snmp.patch diff --git a/.cvsignore b/.cvsignore index 1c0030b..1da4b6c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.12.4.tar.gz +apcupsd-3.13.9.tar.gz diff --git a/apcupsd-net-snmp.patch b/apcupsd-net-snmp.patch new file mode 100644 index 0000000..f14956b --- /dev/null +++ b/apcupsd-net-snmp.patch @@ -0,0 +1,10 @@ +--- apcupsd-3.13.9/src/drivers/snmp/snmp.h.net-snmp 2006-07-07 07:06:57.000000000 -0600 ++++ apcupsd-3.13.9/src/drivers/snmp/snmp.h 2006-11-29 13:42:14.000000000 -0700 +@@ -39,6 +39,7 @@ + #else + + # ifdef HAVE_NET_SNMP ++# include + # include + # include + # include diff --git a/apcupsd.spec b/apcupsd.spec index 4e69cbf..cc83020 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.12.4 -Release: 3%{?dist} +Version: 3.13.9 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -10,10 +10,12 @@ Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.10.18-init.patch +Patch1: apcupsd-net-snmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers +BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -40,13 +42,24 @@ Requires: httpd A CGI interface to the APC UPS monitoring daemon. +%package gui +Summary: GUI interface for apcupsd +Group: Applications/System +Requires: %{name} = %{version}-%{release} + +%description gui +A GUI interface to the APC UPS monitoring daemon. + + %prep %setup -q %patch -p1 -b .init +%patch1 -p1 -b .net-snmp dos2unix examples/*status examples/*.c # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in + %build %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ @@ -54,7 +67,6 @@ sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in --enable-cgi \ --enable-pthreads \ --enable-net \ - --enable-master-slave \ --enable-apcsmart \ --enable-dumb \ --enable-net-snmp \ @@ -62,13 +74,13 @@ sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in --enable-usb \ --enable-powerflute \ --enable-nls \ + --enable-gapcmon \ + --enable-pcnet \ --with-libwrap=%{_libdir} \ --with-serial-dev= \ --with-upstype=usb \ --with-upscable=usb \ APCUPSD_MAIL=/bin/mail - - make @@ -93,6 +105,12 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --delete-original \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop + +# Cleanup for later %doc processing chmod -x examples/*.conf examples/*.c rm examples/*.in @@ -127,6 +145,17 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf %{_localstatedir}/www/apcupsd/ +%files gui +%defattr(-,root,root,-) +%{_bindir}/gapcmon +%{_datadir}/applications/fedora-gapcmon.desktop +%{_datadir}/pixmaps/apcupsd.png +%{_datadir}/pixmaps/charging.png +%{_datadir}/pixmaps/gapc_prefs.png +%{_datadir}/pixmaps/onbatt.png +%{_datadir}/pixmaps/online.png +%{_datadir}/pixmaps/unplugged.png + %post # add our links @@ -143,6 +172,9 @@ fi %changelog +* Thu Nov 30 2006 - Orion Poplawski - 3.13.9-1 +- Update to 3.13.9, add gui package + * Mon Oct 9 2006 - Orion Poplawski - 3.12.4-3 - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952). Patch from Clive Messer (clive@vacuumtube.org.uk) @@ -179,13 +211,13 @@ fi - Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support * Mon Oct 17 2005 - Orion Poplawski - 3.10.18-3 -- Removed %{_smp_mflags} from make, broke builds +- Removed %%{_smp_mflags} from make, broke builds - Patch init file to not start automatically and add reload - Mark css file config - Require /sbin/chkconfig * Mon Oct 17 2005 - Orion Poplawski - 3.10.18-2 -- Add %defattr to -cgi package +- Add %%defattr to -cgi package * Wed Aug 17 2005 - Orion Poplawski - 3.10.18-1 - Initial Fedora Version diff --git a/sources b/sources index 77ac446..4b0403c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -669c833ec02a2bc29fa98f845e5f5de5 apcupsd-3.12.4.tar.gz +a58f1a1c4387da5b2fa3666a246c8165 apcupsd-3.13.9.tar.gz From a4b039cb24604e509e98b4087c25522e48debad3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 5 Jan 2007 18:31:20 +0000 Subject: [PATCH 017/139] - Mark everything in /etc/apcupsd noreplace - Change BR to tcp_wrappers-devel --- apcupsd.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index cc83020..a013f19 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.13.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -14,7 +14,7 @@ Patch1: apcupsd-net-snmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix -BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers +BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): /sbin/chkconfig @@ -128,13 +128,13 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf %config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol -%{_sysconfdir}/apcupsd/changeme -%{_sysconfdir}/apcupsd/commfailure -%{_sysconfdir}/apcupsd/commok -%{_sysconfdir}/apcupsd/offbattery -%{_sysconfdir}/apcupsd/onbattery -%{_sysconfdir}/apcupsd/masterconnect -%{_sysconfdir}/apcupsd/mastertimeout +%config(noreplace) %{_sysconfdir}/apcupsd/changeme +%config(noreplace) %{_sysconfdir}/apcupsd/commfailure +%config(noreplace) %{_sysconfdir}/apcupsd/commok +%config(noreplace) %{_sysconfdir}/apcupsd/offbattery +%config(noreplace) %{_sysconfdir}/apcupsd/onbattery +%config(noreplace) %{_sysconfdir}/apcupsd/masterconnect +%config(noreplace) %{_sysconfdir}/apcupsd/mastertimeout %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* @@ -172,6 +172,10 @@ fi %changelog +* Fri Jan 5 2007 - Orion Poplawski - 3.13.9-2 +- Mark everything in /etc/apcupsd noreplace +- Change BR to tcp_wrappers-devel + * Thu Nov 30 2006 - Orion Poplawski - 3.13.9-1 - Update to 3.13.9, add gui package From d813a0394bee6486e5cb659cf99f74f598dc7654 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 12 Feb 2007 16:58:12 +0000 Subject: [PATCH 018/139] Update to 3.14.0 --- .cvsignore | 2 +- apcupsd-net-snmp.patch | 10 ---------- apcupsd.spec | 12 ++++++------ sources | 2 +- 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 apcupsd-net-snmp.patch diff --git a/.cvsignore b/.cvsignore index 1da4b6c..70f8e67 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.13.9.tar.gz +apcupsd-3.14.0.tar.gz diff --git a/apcupsd-net-snmp.patch b/apcupsd-net-snmp.patch deleted file mode 100644 index f14956b..0000000 --- a/apcupsd-net-snmp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- apcupsd-3.13.9/src/drivers/snmp/snmp.h.net-snmp 2006-07-07 07:06:57.000000000 -0600 -+++ apcupsd-3.13.9/src/drivers/snmp/snmp.h 2006-11-29 13:42:14.000000000 -0700 -@@ -39,6 +39,7 @@ - #else - - # ifdef HAVE_NET_SNMP -+# include - # include - # include - # include diff --git a/apcupsd.spec b/apcupsd.spec index a013f19..02733f8 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.13.9 -Release: 2%{?dist} +Version: 3.14.0 +Release: 0%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -10,10 +10,9 @@ Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.10.18-init.patch -Patch1: apcupsd-net-snmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix +BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail @@ -54,8 +53,6 @@ A GUI interface to the APC UPS monitoring daemon. %prep %setup -q %patch -p1 -b .init -%patch1 -p1 -b .net-snmp -dos2unix examples/*status examples/*.c # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in @@ -172,6 +169,9 @@ fi %changelog +* Mon Feb 12 2007 - Orion Poplawski - 3.14.0-1 +- Update to 3.14.0 + * Fri Jan 5 2007 - Orion Poplawski - 3.13.9-2 - Mark everything in /etc/apcupsd noreplace - Change BR to tcp_wrappers-devel diff --git a/sources b/sources index 4b0403c..774c582 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a58f1a1c4387da5b2fa3666a246c8165 apcupsd-3.13.9.tar.gz +334fe3413c08f14acec0226e71e98e0a apcupsd-3.14.0.tar.gz From 758ab1614f150230e8b2a9291c73d91f81325c21 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 12 Feb 2007 17:12:55 +0000 Subject: [PATCH 019/139] Remove old master/slave stuff --- apcupsd.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 02733f8..726abe3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -130,8 +130,6 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/commok %config(noreplace) %{_sysconfdir}/apcupsd/offbattery %config(noreplace) %{_sysconfdir}/apcupsd/onbattery -%config(noreplace) %{_sysconfdir}/apcupsd/masterconnect -%config(noreplace) %{_sysconfdir}/apcupsd/mastertimeout %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* From e393118aa9f7bd8cc243ebbd4f9f4bf3daec0a5c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 17 Apr 2007 17:32:17 +0000 Subject: [PATCH 020/139] Fix release number --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 726abe3..b7d241a 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons From 7ea1ac089390aefcd919770c7e8ffaa0f587fca3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 23 Apr 2007 20:01:28 +0000 Subject: [PATCH 021/139] Fix init script for LSB compliance (bug #237532) --- apcupsd-3.10.18-init.patch | 20 -------------------- apcupsd-3.14.0-init.patch | 38 ++++++++++++++++++++++++++++++++++++++ apcupsd.spec | 7 +++++-- 3 files changed, 43 insertions(+), 22 deletions(-) delete mode 100644 apcupsd-3.10.18-init.patch create mode 100644 apcupsd-3.14.0-init.patch diff --git a/apcupsd-3.10.18-init.patch b/apcupsd-3.10.18-init.patch deleted file mode 100644 index 9c36f93..0000000 --- a/apcupsd-3.10.18-init.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- apcupsd-3.10.18/platforms/redhat/apcupsd.in.orig 2005-01-09 15:55:41.000000000 -0700 -+++ apcupsd-3.10.18/platforms/redhat/apcupsd.in 2005-10-31 10:35:05.000000000 -0700 -@@ -3,7 +3,7 @@ - # apcupsd This shell script takes care of starting and stopping - # the apcupsd UPS monitoring daemon. - # --# chkconfig: 2345 60 99 -+# chkconfig: - 60 99 - # description: apcupsd monitors power and takes action if necessary - # - APCPID=@PIDDIR@/apcupsd.pid -@@ -42,7 +42,7 @@ - rm -f $APCPID - rm -f @LOCKDIR@/subsys/apcupsd - ;; -- restart) -+ restart|reload) - $0 stop - sleep 15 - $0 start diff --git a/apcupsd-3.14.0-init.patch b/apcupsd-3.14.0-init.patch new file mode 100644 index 0000000..86062d9 --- /dev/null +++ b/apcupsd-3.14.0-init.patch @@ -0,0 +1,38 @@ +--- apcupsd-3.14.0/platforms/redhat/apcupsd.in.init 2005-01-09 15:55:41.000000000 -0700 ++++ apcupsd-3.14.0/platforms/redhat/apcupsd.in 2007-04-23 12:13:35.000000000 -0600 +@@ -3,7 +3,7 @@ + # apcupsd This shell script takes care of starting and stopping + # the apcupsd UPS monitoring daemon. + # +-# chkconfig: 2345 60 99 ++# chkconfig: - 60 99 + # description: apcupsd monitors power and takes action if necessary + # + APCPID=@PIDDIR@/apcupsd.pid +@@ -42,13 +42,24 @@ + rm -f $APCPID + rm -f @LOCKDIR@/subsys/apcupsd + ;; +- restart) ++ restart|force-reload) + $0 stop + sleep 15 + $0 start + ;; ++ reload) ++ echo "$0: reload not implemented" ++ exit 3 ++ ;; + status) +- @sbindir@/apcaccess status ++ status apcupsd ++ RETVAL=$? ++ if [ $RETVAL -eq 0 ] ++ then ++ @sbindir@/apcaccess status ++ else ++ exit $RETVAL ++ fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" diff --git a/apcupsd.spec b/apcupsd.spec index b7d241a..23d52c0 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,7 +9,7 @@ URL: http://www.apcupsd.com Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf -Patch0: apcupsd-3.10.18-init.patch +Patch0: apcupsd-3.14.0-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -167,6 +167,9 @@ fi %changelog +* Mon Apr 23 2007 - Orion Poplawski - 3.14.0-2 +- Fix init script for LSB compliance (bug #237532) + * Mon Feb 12 2007 - Orion Poplawski - 3.14.0-1 - Update to 3.14.0 From 50b40585f8fef072960d22b177751199d0027780 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 4 Jun 2007 22:55:10 +0000 Subject: [PATCH 022/139] Update to 3.14.1 --- .cvsignore | 2 +- apcupsd.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 70f8e67..a7afce8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.0.tar.gz +apcupsd-3.14.1.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 23d52c0..85ab1d5 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,12 +1,12 @@ Name: apcupsd -Version: 3.14.0 -Release: 2%{?dist} +Version: 3.14.1 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons License: GPL URL: http://www.apcupsd.com -Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.0-init.patch @@ -167,6 +167,9 @@ fi %changelog +* Tue May 29 2007 - Orion Poplawski - 3.14.1-1 +- Update to 3.14.1 + * Mon Apr 23 2007 - Orion Poplawski - 3.14.0-2 - Fix init script for LSB compliance (bug #237532) diff --git a/sources b/sources index 774c582..a0bcb26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -334fe3413c08f14acec0226e71e98e0a apcupsd-3.14.0.tar.gz +258eb7515a12de493bb8952bc6d2f4e1 apcupsd-3.14.1.tar.gz From 248a367108471324e28a57e6f5607689ba091fbf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 5 Jun 2007 17:36:40 +0000 Subject: [PATCH 023/139] Remove parts applied upstream --- apcupsd-3.14.0-init.patch | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/apcupsd-3.14.0-init.patch b/apcupsd-3.14.0-init.patch index 86062d9..3ea38f6 100644 --- a/apcupsd-3.14.0-init.patch +++ b/apcupsd-3.14.0-init.patch @@ -9,30 +9,3 @@ # description: apcupsd monitors power and takes action if necessary # APCPID=@PIDDIR@/apcupsd.pid -@@ -42,13 +42,24 @@ - rm -f $APCPID - rm -f @LOCKDIR@/subsys/apcupsd - ;; -- restart) -+ restart|force-reload) - $0 stop - sleep 15 - $0 start - ;; -+ reload) -+ echo "$0: reload not implemented" -+ exit 3 -+ ;; - status) -- @sbindir@/apcaccess status -+ status apcupsd -+ RETVAL=$? -+ if [ $RETVAL -eq 0 ] -+ then -+ @sbindir@/apcaccess status -+ else -+ exit $RETVAL -+ fi - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" From 6784ab3deca8dc5d04e21309db008b12621490ea Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 2 Jul 2007 15:20:26 +0000 Subject: [PATCH 024/139] Add patch for linux USB UPS detection (bug #245864) --- apcupsd-3.14.1-linux-usb.patch | 33 +++++++++++++++++++++++++++++++++ apcupsd.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 apcupsd-3.14.1-linux-usb.patch diff --git a/apcupsd-3.14.1-linux-usb.patch b/apcupsd-3.14.1-linux-usb.patch new file mode 100644 index 0000000..8ad7652 --- /dev/null +++ b/apcupsd-3.14.1-linux-usb.patch @@ -0,0 +1,33 @@ +--- apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c.linux-usb 2007/05/02 00:26:52 1.26.6.1 ++++ apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c 2007/06/29 22:18:41 1.26.6.2 +@@ -114,20 +114,17 @@ + if (fd >= 0) { + /* Check for the UPS application HID usage */ + for (i = 0; (ret = ioctl(fd, HIDIOCAPPLICATION, i)) > 0; i++) { +- if ((ret & 0xffff000) == (UPS_USAGE & 0xffff0000)) +- break; +- } +- /* If we found the UPS application usage, we're good to go */ +- if (ret) { +- /* Request full uref reporting from read() */ +- if (FORCE_COMPAT24 || ioctl(fd, HIDIOCSFLAG, &flaguref)) { +- Dmsg0(100, "HIDIOCSFLAG failed; enabling linux-2.4 " +- "compatibility mode\n"); +- my_data->compat24 = true; ++ if ((ret & 0xffff000) == (UPS_USAGE & 0xffff0000)) { ++ /* Request full uref reporting from read() */ ++ if (FORCE_COMPAT24 || ioctl(fd, HIDIOCSFLAG, &flaguref)) { ++ Dmsg0(100, "HIDIOCSFLAG failed; enabling linux-2.4 " ++ "compatibility mode\n"); ++ my_data->compat24 = true; ++ } ++ /* Successfully opened the device */ ++ Dmsg1(200, "Successfully opened \"%s\"\n", dev); ++ return fd; + } +- /* Successfully opened the device */ +- Dmsg1(200, "Successfully opened \"%s\"\n", dev); +- return fd; + } + close(fd); + } diff --git a/apcupsd.spec b/apcupsd.spec index 85ab1d5..6bddc90 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.0-init.patch +Patch1: apcupsd-3.14.1-linux-usb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -53,6 +54,7 @@ A GUI interface to the APC UPS monitoring daemon. %prep %setup -q %patch -p1 -b .init +%patch1 -p1 -b .linux-usb # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in @@ -167,6 +169,9 @@ fi %changelog +* Mon Jun 02 2007 - Orion Poplawski - 3.14.1-2 +- Add patch for linux USB UPS detection (bug #245864) + * Tue May 29 2007 - Orion Poplawski - 3.14.1-1 - Update to 3.14.1 From 602b28def55078ca80ae8b67bb0b0cfa0a33e576 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 2 Aug 2007 15:16:23 +0000 Subject: [PATCH 025/139] - Add patch to close open file descriptors (bug #247162) - Stop/restart service as needed on removal/upgrade --- apcupsd-3.14.0-init.patch | 11 --------- apcupsd-3.14.1-cloexec.patch | 48 ++++++++++++++++++++++++++++++++++++ apcupsd-3.14.1-init.patch | 33 +++++++++++++++++++++++++ apcupsd.spec | 27 +++++++++++++------- 4 files changed, 99 insertions(+), 20 deletions(-) delete mode 100644 apcupsd-3.14.0-init.patch create mode 100644 apcupsd-3.14.1-cloexec.patch create mode 100644 apcupsd-3.14.1-init.patch diff --git a/apcupsd-3.14.0-init.patch b/apcupsd-3.14.0-init.patch deleted file mode 100644 index 3ea38f6..0000000 --- a/apcupsd-3.14.0-init.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apcupsd-3.14.0/platforms/redhat/apcupsd.in.init 2005-01-09 15:55:41.000000000 -0700 -+++ apcupsd-3.14.0/platforms/redhat/apcupsd.in 2007-04-23 12:13:35.000000000 -0600 -@@ -3,7 +3,7 @@ - # apcupsd This shell script takes care of starting and stopping - # the apcupsd UPS monitoring daemon. - # --# chkconfig: 2345 60 99 -+# chkconfig: - 60 99 - # description: apcupsd monitors power and takes action if necessary - # - APCPID=@PIDDIR@/apcupsd.pid diff --git a/apcupsd-3.14.1-cloexec.patch b/apcupsd-3.14.1-cloexec.patch new file mode 100644 index 0000000..2ab9c1f --- /dev/null +++ b/apcupsd-3.14.1-cloexec.patch @@ -0,0 +1,48 @@ +--- apcupsd-3.14.1/src/apcnis.c.cloexec 2006-08-13 11:00:15.000000000 -0600 ++++ apcupsd-3.14.1/src/apcnis.c 2007-08-01 16:26:35.000000000 -0600 +@@ -155,6 +155,9 @@ + sleep(5 * 60); + } + ++ /* Close the socket on exec - avoid leaked file descriptors */ ++ fcntl(sockfd, F_SETFD, FD_CLOEXEC); ++ + /* Reuse old sockets */ + #ifndef HAVE_MINGW + if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*)&turnon, sizeof(turnon)) < 0) { +--- apcupsd-3.14.1/src/apcupsd.c.cloexec 2006-09-23 11:42:47.000000000 -0600 ++++ apcupsd-3.14.1/src/apcupsd.c 2007-08-01 16:27:14.000000000 -0600 +@@ -280,6 +280,9 @@ + if (ups->event_fd < 0) { + log_event(ups, LOG_WARNING, "Could not open events file %s: %s\n", + ups->eventfile, strerror(errno)); ++ } else { ++ /* Close the file on exec - avoid leaked file descriptors */ ++ fcntl(ups->event_fd, F_SETFD, FD_CLOEXEC); + } + } + +--- apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c.cloexec 2007-08-01 16:30:28.000000000 -0600 ++++ apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c 2007-08-01 16:42:55.000000000 -0600 +@@ -182,8 +182,11 @@ + /* Retry 10 times */ + for (i = 0; i < 10; i++) { + my_data->fd = open_device(ups->device, ups); +- if (my_data->fd != -1) ++ if (my_data->fd != -1) { ++ /* Close the device on exec - avoid leaked file descriptors */ ++ fcntl(my_data->fd, F_SETFD, FD_CLOEXEC); + return 1; ++ } + sleep(1); + } + +@@ -206,6 +209,8 @@ + asnprintf(devname, sizeof(devname), "%s%d", hiddev[j], k); + my_data->fd = open_device(devname, ups); + if (my_data->fd != -1) { ++ /* Close the device on exec - avoid leaked file descriptors */ ++ fcntl(my_data->fd, F_SETFD, FD_CLOEXEC); + /* Successful open, save device name and return */ + astrncpy(ups->device, devname, sizeof(ups->device)); + return 1; diff --git a/apcupsd-3.14.1-init.patch b/apcupsd-3.14.1-init.patch new file mode 100644 index 0000000..7b62872 --- /dev/null +++ b/apcupsd-3.14.1-init.patch @@ -0,0 +1,33 @@ +--- apcupsd-3.14.1/platforms/redhat/apcupsd.in.init 2007-04-23 17:35:33.000000000 -0600 ++++ apcupsd-3.14.1/platforms/redhat/apcupsd.in 2007-08-02 09:05:48.000000000 -0600 +@@ -3,7 +3,7 @@ + # apcupsd This shell script takes care of starting and stopping + # the apcupsd UPS monitoring daemon. + # +-# chkconfig: 2345 60 99 ++# chkconfig: - 60 99 + # description: apcupsd monitors power and takes action if necessary + # + APCPID=@PIDDIR@/apcupsd.pid +@@ -44,9 +44,11 @@ + ;; + restart|force-reload) + $0 stop +- sleep 15 + $0 start + ;; ++ condrestart) ++ [ -f /var/lock/subsys/ypbind ] && $0 restart || : ++ ;; + reload) + echo "$0: reload not implemented" + exit 3 +@@ -62,7 +64,7 @@ + fi + ;; + *) +- echo "Usage: $0 {start|stop|restart|status}" ++ echo "Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 + ;; + esac diff --git a/apcupsd.spec b/apcupsd.spec index 6bddc90..5d238aa 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,8 +9,9 @@ URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf -Patch0: apcupsd-3.14.0-init.patch +Patch0: apcupsd-3.14.1-init.patch Patch1: apcupsd-3.14.1-linux-usb.patch +Patch2: apcupsd-3.14.1-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -19,6 +20,8 @@ BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service %description Apcupsd can be used for controlling most APC UPSes. During a @@ -55,6 +58,7 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch -p1 -b .init %patch1 -p1 -b .linux-usb +%patch2 -p1 -b .cloexec # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in @@ -155,20 +159,25 @@ rm -rf $RPM_BUILD_ROOT %post -# add our links -if [ "$1" -ge 1 ] ; then /sbin/chkconfig --add apcupsd -fi - %preun -if [ $1 = 0 ] ; then - # remove startup links - /sbin/chkconfig --del apcupsd +if [ $1 = 0 ]; then + /sbin/service apcupsd stop >/dev/null 2>&1 + /sbin/chkconfig --del apcupsd +fi + +%postun +if [ $1 -ge 1 ]; then + /sbin/service apcupsd condrestart >/dev/null 2>&1 || : fi %changelog +* Wed Aug 1 2007 - Orion Poplawski - 3.14.1-3 +- Add patch to close open file descriptors (bug #247162) +- Stop/restart service as needed on removal/upgrade + * Mon Jun 02 2007 - Orion Poplawski - 3.14.1-2 - Add patch for linux USB UPS detection (bug #245864) From d0774aadbccb7fc3e3bfe925be4a50c66723f1e9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 10 Oct 2007 22:52:56 +0000 Subject: [PATCH 026/139] - Update to 3.14.2, remove upstreamed patches --- .cvsignore | 2 +- apcupsd-3.14.1-linux-usb.patch | 33 --------------------------------- apcupsd.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 apcupsd-3.14.1-linux-usb.patch diff --git a/.cvsignore b/.cvsignore index a7afce8..b297b22 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.1.tar.gz +apcupsd-3.14.2.tar.gz diff --git a/apcupsd-3.14.1-linux-usb.patch b/apcupsd-3.14.1-linux-usb.patch deleted file mode 100644 index 8ad7652..0000000 --- a/apcupsd-3.14.1-linux-usb.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c.linux-usb 2007/05/02 00:26:52 1.26.6.1 -+++ apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c 2007/06/29 22:18:41 1.26.6.2 -@@ -114,20 +114,17 @@ - if (fd >= 0) { - /* Check for the UPS application HID usage */ - for (i = 0; (ret = ioctl(fd, HIDIOCAPPLICATION, i)) > 0; i++) { -- if ((ret & 0xffff000) == (UPS_USAGE & 0xffff0000)) -- break; -- } -- /* If we found the UPS application usage, we're good to go */ -- if (ret) { -- /* Request full uref reporting from read() */ -- if (FORCE_COMPAT24 || ioctl(fd, HIDIOCSFLAG, &flaguref)) { -- Dmsg0(100, "HIDIOCSFLAG failed; enabling linux-2.4 " -- "compatibility mode\n"); -- my_data->compat24 = true; -+ if ((ret & 0xffff000) == (UPS_USAGE & 0xffff0000)) { -+ /* Request full uref reporting from read() */ -+ if (FORCE_COMPAT24 || ioctl(fd, HIDIOCSFLAG, &flaguref)) { -+ Dmsg0(100, "HIDIOCSFLAG failed; enabling linux-2.4 " -+ "compatibility mode\n"); -+ my_data->compat24 = true; -+ } -+ /* Successfully opened the device */ -+ Dmsg1(200, "Successfully opened \"%s\"\n", dev); -+ return fd; - } -- /* Successfully opened the device */ -- Dmsg1(200, "Successfully opened \"%s\"\n", dev); -- return fd; - } - close(fd); - } diff --git a/apcupsd.spec b/apcupsd.spec index 5d238aa..f2fce38 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.1 -Release: 3%{?dist} +Version: 3.14.2 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -10,8 +10,6 @@ Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.1-init.patch -Patch1: apcupsd-3.14.1-linux-usb.patch -Patch2: apcupsd-3.14.1-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -57,8 +55,6 @@ A GUI interface to the APC UPS monitoring daemon. %prep %setup -q %patch -p1 -b .init -%patch1 -p1 -b .linux-usb -%patch2 -p1 -b .cloexec # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in @@ -174,6 +170,9 @@ fi %changelog +* Wed Oct 10 2007 - Orion Poplawski - 3.14.2-1 +- Update to 3.14.2, remove upstreamed patches + * Wed Aug 1 2007 - Orion Poplawski - 3.14.1-3 - Add patch to close open file descriptors (bug #247162) - Stop/restart service as needed on removal/upgrade diff --git a/sources b/sources index a0bcb26..fb67d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -258eb7515a12de493bb8952bc6d2f4e1 apcupsd-3.14.1.tar.gz +fd8785e7607d20cefa68dc20e44eebc4 apcupsd-3.14.2.tar.gz From b4949ce6268b30e0dca260a6991944c87447794e Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Wed, 23 Jan 2008 14:43:28 +0000 Subject: [PATCH 027/139] - Update to 3.14.3 --- .cvsignore | 2 +- apcupsd.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b297b22..5f66354 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.2.tar.gz +apcupsd-3.14.3.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index f2fce38..c1c0a48 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,5 +1,5 @@ Name: apcupsd -Version: 3.14.2 +Version: 3.14.3 Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux @@ -133,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/offbattery %config(noreplace) %{_sysconfdir}/apcupsd/onbattery %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd +%{_datadir}/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* @@ -170,6 +171,9 @@ fi %changelog +* Wed Jan 23 2008 Tomas Smetana - 3.14.3-1 +- Update to 3.14.3 + * Wed Oct 10 2007 - Orion Poplawski - 3.14.2-1 - Update to 3.14.2, remove upstreamed patches diff --git a/sources b/sources index fb67d8c..096d3f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd8785e7607d20cefa68dc20e44eebc4 apcupsd-3.14.2.tar.gz +a212351d21828e9344264614c7ad8ba1 apcupsd-3.14.3.tar.gz From c0206750f4a4dc2ef7915fa64c4ddd2578e8ff3f Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Wed, 30 Jan 2008 13:14:19 +0000 Subject: [PATCH 028/139] - fix #348701 - apcupsd control script does not invoke shutdown properly --- apcupsd-3.14.2-shutdown.patch | 12 ++++++++++++ apcupsd.spec | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 apcupsd-3.14.2-shutdown.patch diff --git a/apcupsd-3.14.2-shutdown.patch b/apcupsd-3.14.2-shutdown.patch new file mode 100644 index 0000000..e8c4f81 --- /dev/null +++ b/apcupsd-3.14.2-shutdown.patch @@ -0,0 +1,12 @@ +diff -up apcupsd-3.14.2/platforms/apccontrol.in.shutdown apcupsd-3.14.2/platforms/apccontrol.in +--- apcupsd-3.14.2/platforms/apccontrol.in.shutdown 2008-01-30 13:39:33.000000000 +0100 ++++ apcupsd-3.14.2/platforms/apccontrol.in 2008-01-30 13:45:00.000000000 +0100 +@@ -104,7 +104,7 @@ case "$1" in + ;; + doshutdown) + echo "UPS ${2} initiated Shutdown Sequence" | ${WALL} +- ${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown" ++ ${SHUTDOWN} -h -H now "apcupsd UPS ${2} initiated shutdown" + ;; + annoyme) + echo "Power problems with UPS ${2}. Please logoff." | ${WALL} diff --git a/apcupsd.spec b/apcupsd.spec index c1c0a48..53203c0 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.1-init.patch +Patch1: apcupsd-3.14.2-shutdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -54,7 +55,9 @@ A GUI interface to the APC UPS monitoring daemon. %prep %setup -q -%patch -p1 -b .init +%patch0 -p1 -b .init +%patch1 -p1 -b .shutdown + # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in @@ -171,6 +174,9 @@ fi %changelog +* Wed Jan 30 2008 Tomas Smetana - 3.14.3-2 +- fix #348701 - apcupsd control script does not invoke shutdown properly + * Wed Jan 23 2008 Tomas Smetana - 3.14.3-1 - Update to 3.14.3 From 9539120ff65421dfcfb923530bf82cb820e060ba Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Tue, 12 Feb 2008 07:29:41 +0000 Subject: [PATCH 029/139] - rebuild (gcc-4.3) --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 53203c0..84fff4c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.3 -Release: 2%{?dist} +Release: 2.1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -174,6 +174,9 @@ fi %changelog +* Tue Feb 12 2008 Tomas Smetana - 3.14.3-2.1 +- rebuild (gcc-4.3) + * Wed Jan 30 2008 Tomas Smetana - 3.14.3-2 - fix #348701 - apcupsd control script does not invoke shutdown properly From f85a07e1bd7596808f3aee70219d6a9a48d1d468 Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Wed, 28 May 2008 08:53:42 +0000 Subject: [PATCH 030/139] - new upstream version --- .cvsignore | 2 +- apcupsd-3.14.1-init.patch | 33 ------------- apcupsd-3.14.3-init.patch | 46 +++++++++++++++++++ ...own.patch => apcupsd-3.14.4-shutdown.patch | 6 +-- apcupsd.spec | 22 +++++---- sources | 2 +- 6 files changed, 63 insertions(+), 48 deletions(-) delete mode 100644 apcupsd-3.14.1-init.patch create mode 100644 apcupsd-3.14.3-init.patch rename apcupsd-3.14.2-shutdown.patch => apcupsd-3.14.4-shutdown.patch (54%) diff --git a/.cvsignore b/.cvsignore index 5f66354..dcde58e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.3.tar.gz +apcupsd-3.14.4.tar.gz diff --git a/apcupsd-3.14.1-init.patch b/apcupsd-3.14.1-init.patch deleted file mode 100644 index 7b62872..0000000 --- a/apcupsd-3.14.1-init.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apcupsd-3.14.1/platforms/redhat/apcupsd.in.init 2007-04-23 17:35:33.000000000 -0600 -+++ apcupsd-3.14.1/platforms/redhat/apcupsd.in 2007-08-02 09:05:48.000000000 -0600 -@@ -3,7 +3,7 @@ - # apcupsd This shell script takes care of starting and stopping - # the apcupsd UPS monitoring daemon. - # --# chkconfig: 2345 60 99 -+# chkconfig: - 60 99 - # description: apcupsd monitors power and takes action if necessary - # - APCPID=@PIDDIR@/apcupsd.pid -@@ -44,9 +44,11 @@ - ;; - restart|force-reload) - $0 stop -- sleep 15 - $0 start - ;; -+ condrestart) -+ [ -f /var/lock/subsys/ypbind ] && $0 restart || : -+ ;; - reload) - echo "$0: reload not implemented" - exit 3 -@@ -62,7 +64,7 @@ - fi - ;; - *) -- echo "Usage: $0 {start|stop|restart|status}" -+ echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 - ;; - esac diff --git a/apcupsd-3.14.3-init.patch b/apcupsd-3.14.3-init.patch new file mode 100644 index 0000000..876f54a --- /dev/null +++ b/apcupsd-3.14.3-init.patch @@ -0,0 +1,46 @@ +diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platforms/redhat/apcupsd.in +--- apcupsd-3.14.3/platforms/redhat/apcupsd.in.init 2007-04-24 01:35:33.000000000 +0200 ++++ apcupsd-3.14.3/platforms/redhat/apcupsd.in 2008-05-28 09:05:39.000000000 +0200 +@@ -3,9 +3,19 @@ + # apcupsd This shell script takes care of starting and stopping + # the apcupsd UPS monitoring daemon. + # +-# chkconfig: 2345 60 99 ++# chkconfig: - 60 99 + # description: apcupsd monitors power and takes action if necessary + # ++### BEGIN INIT INFO ++# Provides: apcupsd ++# Required-Start: $syslog $local_fs ++# Required-Stop: $syslog $local_fs ++# Default-Start: ++# Default-Stop: 0 1 6 ++# Short-Description: apcupsd daemon ++# Description: APC UPS Power Control Daemon for Linux ++### END INIT INFO ++ + APCPID=@PIDDIR@/apcupsd.pid + + if test -f /etc/whitebox-release ; then +@@ -44,9 +54,11 @@ case "$1" in + ;; + restart|force-reload) + $0 stop +- sleep 15 + $0 start + ;; ++ condrestart) ++ [ -f @LOCKDIR@/subsys/apcupsd ] && $0 restart || : ++ ;; + reload) + echo "$0: reload not implemented" + exit 3 +@@ -62,7 +74,7 @@ case "$1" in + fi + ;; + *) +- echo "Usage: $0 {start|stop|restart|status}" ++ echo "Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 + ;; + esac diff --git a/apcupsd-3.14.2-shutdown.patch b/apcupsd-3.14.4-shutdown.patch similarity index 54% rename from apcupsd-3.14.2-shutdown.patch rename to apcupsd-3.14.4-shutdown.patch index e8c4f81..00651b5 100644 --- a/apcupsd-3.14.2-shutdown.patch +++ b/apcupsd-3.14.4-shutdown.patch @@ -1,6 +1,6 @@ -diff -up apcupsd-3.14.2/platforms/apccontrol.in.shutdown apcupsd-3.14.2/platforms/apccontrol.in ---- apcupsd-3.14.2/platforms/apccontrol.in.shutdown 2008-01-30 13:39:33.000000000 +0100 -+++ apcupsd-3.14.2/platforms/apccontrol.in 2008-01-30 13:45:00.000000000 +0100 +diff -up apcupsd-3.14.4/platforms/apccontrol.in.shutdown apcupsd-3.14.4/platforms/apccontrol.in +--- apcupsd-3.14.4/platforms/apccontrol.in.shutdown 2008-05-28 09:15:47.000000000 +0200 ++++ apcupsd-3.14.4/platforms/apccontrol.in 2008-05-28 09:16:04.000000000 +0200 @@ -104,7 +104,7 @@ case "$1" in ;; doshutdown) diff --git a/apcupsd.spec b/apcupsd.spec index 84fff4c..9f1c320 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.3 -Release: 2.1%{?dist} +Version: 3.14.4 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,13 +9,14 @@ URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf -Patch0: apcupsd-3.14.1-init.patch -Patch1: apcupsd-3.14.2-shutdown.patch +Patch0: apcupsd-3.14.3-init.patch +Patch1: apcupsd-3.14.4-shutdown.patch +Patch2: apcupsd-3.14.1-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils +BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, autoconf Requires: /bin/mail Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -57,12 +58,10 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch0 -p1 -b .init %patch1 -p1 -b .shutdown - -# Don't strip binaries -sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in - +%patch2 -p1 -b .cloexec %build +cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ @@ -99,7 +98,7 @@ rm $RPM_BUILD_ROOT%{_initrddir}/halt.old install -m744 platforms/apccontrol \ $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol - + install -m755 platforms/redhat/apcupsd $RPM_BUILD_ROOT%{_initrddir} install -d %{buildroot}%{_sysconfdir}/logrotate.d @@ -174,6 +173,9 @@ fi %changelog +* Wed May 28 2008 Tomas Smetana - 3.14.4-1 +- new upstream version + * Tue Feb 12 2008 Tomas Smetana - 3.14.3-2.1 - rebuild (gcc-4.3) diff --git a/sources b/sources index 096d3f8..9e082cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a212351d21828e9344264614c7ad8ba1 apcupsd-3.14.3.tar.gz +78811129db1a882b9a2b9afd540470b3 apcupsd-3.14.4.tar.gz From 29cee693affe6020c741e9ceaf0736a466121b1c Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Wed, 28 May 2008 12:15:55 +0000 Subject: [PATCH 031/139] move cgi configuration to cgi package --- apcupsd.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 9f1c320..b70864f 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, autoconf +BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -82,8 +82,7 @@ cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ --with-upstype=usb \ --with-upscable=usb \ APCUPSD_MAIL=/bin/mail -make - +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -126,8 +125,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/apcupsd %{_initrddir}/apcupsd %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf -%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf -%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol %config(noreplace) %{_sysconfdir}/apcupsd/changeme %config(noreplace) %{_sysconfdir}/apcupsd/commfailure @@ -143,6 +140,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf +%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf +%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf %{_localstatedir}/www/apcupsd/ %files gui @@ -173,6 +172,9 @@ fi %changelog +* Wed May 28 2008 Tomas Smetana +- fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi + * Wed May 28 2008 Tomas Smetana - 3.14.4-1 - new upstream version From e8cf9f493313f0546b3586f0686f5d423f9659ad Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Fri, 6 Jun 2008 09:52:12 +0000 Subject: [PATCH 032/139] update changelog --- apcupsd.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index b70864f..a8b94d7 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,21 +1,20 @@ Name: apcupsd Version: 3.14.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons -License: GPL +License: GPLv2 URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch -Patch2: apcupsd-3.14.1-cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 -BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel +BuildRequires: net-snmp-devel, tcp_wrappers-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): /sbin/chkconfig @@ -58,13 +57,13 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch0 -p1 -b .init %patch1 -p1 -b .shutdown -%patch2 -p1 -b .cloexec %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ + --sbindir=/sbin \ --enable-cgi \ --enable-pthreads \ --enable-net \ @@ -133,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/onbattery %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %{_datadir}/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi -%attr(0755,root,root) %{_sbindir}/* +%attr(0755,root,root) /sbin/* %{_mandir}/*/* %files cgi @@ -172,8 +171,10 @@ fi %changelog -* Wed May 28 2008 Tomas Smetana +* Fri Jun 06 2008 Tomas Smetana - 3.14.4-2 +- drop useless build requirements - fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi +- move binaries to /sbin (related #346271) * Wed May 28 2008 Tomas Smetana - 3.14.4-1 - new upstream version From a219c35dcbf1402178680caadbff95cc798a52a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 15 Jan 2009 12:37:35 +0000 Subject: [PATCH 033/139] - rebuild with new openssl --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index a8b94d7..f7e2ddc 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -171,6 +171,9 @@ fi %changelog +* Thu Jan 15 2009 Tomas Mraz - 3.14.4-3 +- rebuild with new openssl + * Fri Jun 06 2008 Tomas Smetana - 3.14.4-2 - drop useless build requirements - fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi From 6fb2da42e810d437e022a951ae0417e4ac4793c1 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 22 Jan 2009 10:08:19 +0000 Subject: [PATCH 034/139] update to 3.14.5 --- .cvsignore | 2 +- apcupsd-3.14.3-init.patch | 12 ++++++------ apcupsd.spec | 9 ++++++--- sources | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index dcde58e..da2bfa1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.4.tar.gz +apcupsd-3.14.5.tar.gz diff --git a/apcupsd-3.14.3-init.patch b/apcupsd-3.14.3-init.patch index 876f54a..388af70 100644 --- a/apcupsd-3.14.3-init.patch +++ b/apcupsd-3.14.3-init.patch @@ -1,6 +1,6 @@ -diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platforms/redhat/apcupsd.in ---- apcupsd-3.14.3/platforms/redhat/apcupsd.in.init 2007-04-24 01:35:33.000000000 +0200 -+++ apcupsd-3.14.3/platforms/redhat/apcupsd.in 2008-05-28 09:05:39.000000000 +0200 +diff -up apcupsd-3.14.5/platforms/redhat/apcupsd.in.init apcupsd-3.14.5/platforms/redhat/apcupsd.in +--- apcupsd-3.14.5/platforms/redhat/apcupsd.in.init 2008-11-01 16:03:26.000000000 +0100 ++++ apcupsd-3.14.5/platforms/redhat/apcupsd.in 2009-01-22 10:58:00.429886991 +0100 @@ -3,9 +3,19 @@ # apcupsd This shell script takes care of starting and stopping # the apcupsd UPS monitoring daemon. @@ -21,8 +21,8 @@ diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platform + APCPID=@PIDDIR@/apcupsd.pid - if test -f /etc/whitebox-release ; then -@@ -44,9 +54,11 @@ case "$1" in + # Source function libarary +@@ -30,9 +40,11 @@ case "$1" in ;; restart|force-reload) $0 stop @@ -35,7 +35,7 @@ diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platform reload) echo "$0: reload not implemented" exit 3 -@@ -62,7 +74,7 @@ case "$1" in +@@ -48,7 +60,7 @@ case "$1" in fi ;; *) diff --git a/apcupsd.spec b/apcupsd.spec index f7e2ddc..49f7832 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.4 -Release: 3%{?dist} +Version: 3.14.5 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -110,7 +110,7 @@ desktop-file-install --vendor="fedora" \ ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop # Cleanup for later %doc processing -chmod -x examples/*.conf examples/*.c +chmod -x examples/*.c rm examples/*.in @@ -171,6 +171,9 @@ fi %changelog +* Thu Jan 22 2009 Michal Hlavinka - 3.14.5-1 +- update to 3.14.5 + * Thu Jan 15 2009 Tomas Mraz - 3.14.4-3 - rebuild with new openssl diff --git a/sources b/sources index 9e082cf..ba21d63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78811129db1a882b9a2b9afd540470b3 apcupsd-3.14.4.tar.gz +4ac73ec91d8ab56f3fac894e172567c4 apcupsd-3.14.5.tar.gz From 24b4dc2631f9934051d2dbd77b4b8a1985872a5c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 01:21:08 +0000 Subject: [PATCH 035/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 49f7832..6ea39a3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -171,6 +171,9 @@ fi %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 3.14.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 22 2009 Michal Hlavinka - 3.14.5-1 - update to 3.14.5 From 61d28047228839e90136983b8fcb1af4c294f948 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 24 Feb 2009 10:20:44 +0000 Subject: [PATCH 036/139] fix build with gcc 4.4 --- apcupsd-3.14.5-gcc44.patch | 17 +++++++++++++++++ apcupsd.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 apcupsd-3.14.5-gcc44.patch diff --git a/apcupsd-3.14.5-gcc44.patch b/apcupsd-3.14.5-gcc44.patch new file mode 100644 index 0000000..1f000b0 --- /dev/null +++ b/apcupsd-3.14.5-gcc44.patch @@ -0,0 +1,17 @@ +diff -up apcupsd-3.14.5/src/apcaccess.c.gcc44 apcupsd-3.14.5/src/apcaccess.c +--- apcupsd-3.14.5/src/apcaccess.c.gcc44 2009-02-24 10:36:35.781325750 +0100 ++++ apcupsd-3.14.5/src/apcaccess.c 2009-02-24 10:38:12.416285478 +0100 +@@ -86,10 +86,10 @@ int main(int argc, char **argv) + } + + if (argc > 2) { /* assume host:port */ +- char *p; ++ char *p = argv[2]; + +- host = argv[2]; +- p = strchr(host, ':'); ++ host = p; ++ p = strchr(p, ':'); + if (p) { + *p++ = 0; + port = atoi(p); diff --git a/apcupsd.spec b/apcupsd.spec index 6ea39a3..19c9ade 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -11,6 +11,8 @@ Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch +Patch2: apcupsd-3.14.5-gcc44.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -57,6 +59,7 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch0 -p1 -b .init %patch1 -p1 -b .shutdown +%patch2 -p1 -b .gcc44 %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ @@ -171,6 +174,9 @@ fi %changelog +* Thu Feb 24 2009 Michal Hlavinka - 3.14.5-3 +- fix build with gcc 4.4 + * Mon Feb 23 2009 Fedora Release Engineering - 3.14.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 1afe7523d59bb7f08ae0b7a4522eb2d135491e68 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 18 May 2009 07:03:54 +0000 Subject: [PATCH 037/139] updated to 3.14.6 --- .cvsignore | 2 +- apcupsd-3.14.5-gcc44.patch | 17 ----------------- apcupsd.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 apcupsd-3.14.5-gcc44.patch diff --git a/.cvsignore b/.cvsignore index da2bfa1..846339e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.5.tar.gz +apcupsd-3.14.6.tar.gz diff --git a/apcupsd-3.14.5-gcc44.patch b/apcupsd-3.14.5-gcc44.patch deleted file mode 100644 index 1f000b0..0000000 --- a/apcupsd-3.14.5-gcc44.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up apcupsd-3.14.5/src/apcaccess.c.gcc44 apcupsd-3.14.5/src/apcaccess.c ---- apcupsd-3.14.5/src/apcaccess.c.gcc44 2009-02-24 10:36:35.781325750 +0100 -+++ apcupsd-3.14.5/src/apcaccess.c 2009-02-24 10:38:12.416285478 +0100 -@@ -86,10 +86,10 @@ int main(int argc, char **argv) - } - - if (argc > 2) { /* assume host:port */ -- char *p; -+ char *p = argv[2]; - -- host = argv[2]; -- p = strchr(host, ':'); -+ host = p; -+ p = strchr(p, ':'); - if (p) { - *p++ = 0; - port = atoi(p); diff --git a/apcupsd.spec b/apcupsd.spec index 19c9ade..9d79390 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.5 -Release: 3%{?dist} +Version: 3.14.6 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -11,7 +11,6 @@ Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch -Patch2: apcupsd-3.14.5-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,7 +58,6 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch0 -p1 -b .init %patch1 -p1 -b .shutdown -%patch2 -p1 -b .gcc44 %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ @@ -174,6 +172,9 @@ fi %changelog +* Mon May 18 2009 Michal Hlavinka - 3.14.6-1 +- update to 3.14.6 + * Thu Feb 24 2009 Michal Hlavinka - 3.14.5-3 - fix build with gcc 4.4 diff --git a/sources b/sources index ba21d63..bf0720b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ac73ec91d8ab56f3fac894e172567c4 apcupsd-3.14.5.tar.gz +7df2dbe325a6b1822763cbf6a9fa8263 apcupsd-3.14.6.tar.gz From eabbcd8c8394c435304c510e232ce1f24a97f842 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:57:18 +0000 Subject: [PATCH 038/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 9d79390..ea762e6 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -172,6 +172,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.14.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon May 18 2009 Michal Hlavinka - 3.14.6-1 - update to 3.14.6 From 63cf6e2349f054d01d55181d2e41a8f8c845e9e6 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 3 Aug 2009 08:21:23 +0000 Subject: [PATCH 039/139] updated to 3.14.7 --- .cvsignore | 2 +- apcupsd.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 846339e..2e0e2b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.6.tar.gz +apcupsd-3.14.7.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index ea762e6..fe82505 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.6 -Release: 2%{?dist} +Version: 3.14.7 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -172,6 +172,9 @@ fi %changelog +* Mon Aug 03 2009 Michal Hlavinka - 3.14.7-1 +- updated to 3.14.7 + * Fri Jul 24 2009 Fedora Release Engineering - 3.14.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index bf0720b..95aec71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7df2dbe325a6b1822763cbf6a9fa8263 apcupsd-3.14.6.tar.gz +bb2f8e4fc6b2f5d7b3e236eb57b81640 apcupsd-3.14.7.tar.gz From 28511b080c603db395495aa358baf6a21b8c7afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 12:23:40 +0000 Subject: [PATCH 040/139] - rebuilt with new openssl --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index fe82505..bb56bf0 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -172,6 +172,9 @@ fi %changelog +* Fri Aug 21 2009 Tomas Mraz - 3.14.7-2 +- rebuilt with new openssl + * Mon Aug 03 2009 Michal Hlavinka - 3.14.7-1 - updated to 3.14.7 From 307687a8b1438d37a26e5657d2792ae58e881cb9 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 18 Sep 2009 15:06:31 +0000 Subject: [PATCH 041/139] - fix building with new net-snmp version --- apcupsd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index bb56bf0..8c6e784 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -61,6 +61,7 @@ A GUI interface to the APC UPS monitoring daemon. %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ +export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ @@ -123,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING ChangeLog examples ReleaseNotes %dir %{_sysconfdir}/apcupsd -%{_initrddir}/apcupsd +%{_initddir}/apcupsd %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol %config(noreplace) %{_sysconfdir}/apcupsd/changeme @@ -172,6 +173,9 @@ fi %changelog +* Fri Sep 18 2009 Michal Hlavinka - 3.14.7-3 +- fix building with new net-snmp version + * Fri Aug 21 2009 Tomas Mraz - 3.14.7-2 - rebuilt with new openssl From a3a6c542debefc4dc59034b6f03f32d792cd638e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:10 +0000 Subject: [PATCH 042/139] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92bb57a..30569d4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := apcupsd 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 65c757a7c227c91de55bb71576f45165c7855d87 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 18 Jan 2010 11:59:19 +0000 Subject: [PATCH 043/139] - updated to 3.14.8 --- .cvsignore | 2 +- apcupsd.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2e0e2b9..aed7f31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.14.7.tar.gz +apcupsd-3.14.8.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 8c6e784..98777bf 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.7 -Release: 3%{?dist} +Version: 3.14.8 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -173,6 +173,9 @@ fi %changelog +* Mon Jan 18 2010 Michal Hlavinka - 3.14.8-1 +- updated to 3.14.8 + * Fri Sep 18 2009 Michal Hlavinka - 3.14.7-3 - fix building with new net-snmp version diff --git a/sources b/sources index 95aec71..67ae4c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb2f8e4fc6b2f5d7b3e236eb57b81640 apcupsd-3.14.7.tar.gz +cd17f0a903dc2220e55ed54e242359d2 apcupsd-3.14.8.tar.gz From 9b926b264798eff7b9bb2b3f1a8f964328274e6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:04:31 +0000 Subject: [PATCH 044/139] 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 30569d4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apcupsd -# $Id$ -NAME := apcupsd -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),) -# attept 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 e55071afaa496ab3506a0a370fe7def495ea39bf Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 22 Sep 2010 11:22:03 +0200 Subject: [PATCH 045/139] - fix c++ code linking (FTBFS) (#631288) --- apcupsd-3.14.8-cxxld.patch | 16 ++++++++++++++++ apcupsd.spec | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 apcupsd-3.14.8-cxxld.patch diff --git a/apcupsd-3.14.8-cxxld.patch b/apcupsd-3.14.8-cxxld.patch new file mode 100644 index 0000000..ba13d62 --- /dev/null +++ b/apcupsd-3.14.8-cxxld.patch @@ -0,0 +1,16 @@ +diff -up apcupsd-3.14.8/src/Makefile.cxxld apcupsd-3.14.8/src/Makefile +--- apcupsd-3.14.8/src/Makefile.cxxld 2009-09-30 01:20:45.000000000 +0200 ++++ apcupsd-3.14.8/src/Makefile 2010-09-22 11:18:03.550601657 +0200 +@@ -26,10 +26,10 @@ SRCS = $(common_srcs) $(apcupsd_srcs) $( + all-targets: apcupsd apcaccess apctest smtp + + apcupsd: $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS) +- $(LINK) $(DRVLIBS) ++ $(LINK) -lstdc++ $(DRVLIBS) + + apctest: $(common_obj) $(apctest_obj) $(APCDRVLIBS) $(APCLIBS) +- $(LINK) $(DRVLIBS) ++ $(LINK) -lstdc++ $(DRVLIBS) + + apcaccess: $(apcaccess_obj) $(APCLIBS) + $(LINK) diff --git a/apcupsd.spec b/apcupsd.spec index 98777bf..243eb92 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -12,6 +12,9 @@ Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch +#fix FTBFS, c++ linking needs -lstdc++ explicitly +Patch2: apcupsd-3.14.8-cxxld.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -58,6 +61,7 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch0 -p1 -b .init %patch1 -p1 -b .shutdown +%patch2 -p1 -b .cxxld %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ @@ -173,6 +177,9 @@ fi %changelog +* Wed Sep 22 2010 Michal Hlavinka - 3.14.8-2 +- fix c++ code linking (FTBFS) (#631288) + * Mon Jan 18 2010 Michal Hlavinka - 3.14.8-1 - updated to 3.14.8 From a4c05a9764d09f60bbdd57c6217a8f6feaeebb34 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 13:55:22 -0700 Subject: [PATCH 046/139] - Rebuilt for gcc bug 634757 --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 243eb92..967bf1c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -177,6 +177,9 @@ fi %changelog +* Wed Sep 29 2010 jkeating - 3.14.8-3 +- Rebuilt for gcc bug 634757 + * Wed Sep 22 2010 Michal Hlavinka - 3.14.8-2 - fix c++ code linking (FTBFS) (#631288) From d4dfa2936ec428aa6b332a5e66ad8b8bf1b313a6 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 5 Nov 2010 09:17:47 +0100 Subject: [PATCH 047/139] - rebuilt for library update --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 967bf1c..eaebea0 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -177,6 +177,9 @@ fi %changelog +* Fri Nov 05 2020 Michal Hlavinka - 3.14.8-4 +- rebuilt for library update + * Wed Sep 29 2010 jkeating - 3.14.8-3 - Rebuilt for gcc bug 634757 From 2228e706df6b66258edd6e2e059854ab04d6a1dc Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 2 Dec 2010 13:35:28 +0100 Subject: [PATCH 048/139] - do not attempt to invoke directory as a script (#659219) --- apcupsd-httpd.conf | 6 +++++- apcupsd.spec | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf index 9e5ff87..973dec9 100644 --- a/apcupsd-httpd.conf +++ b/apcupsd-httpd.conf @@ -3,7 +3,11 @@ # # files are off the documentroot of Web server -ScriptAlias /apcupsd/ "/var/www/apcupsd/" +Alias /apcupsd /var/www/apcupsd + + AddHandler cgi-script cgi pl + Options ExecCGI + # # Allow only local access at default diff --git a/apcupsd.spec b/apcupsd.spec index eaebea0..fb630f4 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -177,7 +177,10 @@ fi %changelog -* Fri Nov 05 2020 Michal Hlavinka - 3.14.8-4 +* Thu Dec 02 2010 Michal Hlavinka - 3.14.8-5 +- do not attempt to invoke directory as a script (#659219) + +* Fri Nov 05 2010 Michal Hlavinka - 3.14.8-4 - rebuilt for library update * Wed Sep 29 2010 jkeating - 3.14.8-3 From 2cb7a21afe3601d6050db7bfa660f3dff14365c4 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 2 Dec 2010 13:57:18 +0100 Subject: [PATCH 049/139] skip platform install section we don't use, it breaks with systemd --- apcupsd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apcupsd.spec b/apcupsd.spec index fb630f4..0ee9e7d 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -63,6 +63,9 @@ A GUI interface to the APC UPS monitoring daemon. %patch1 -p1 -b .shutdown %patch2 -p1 -b .cxxld +#we will handle fedora/redhat part ourselfs +sed '/SUBDIRS/s/^\(.*\) platforms \(.*\)$/\1 \2/' Makefile + %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" From b3ae5e3acf3955ea6000fa7ac27e6d051f7fd008 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 2 Dec 2010 14:17:09 +0100 Subject: [PATCH 050/139] fix last issue harder --- apcupsd.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 0ee9e7d..7934e02 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -64,7 +64,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch2 -p1 -b .cxxld #we will handle fedora/redhat part ourselfs -sed '/SUBDIRS/s/^\(.*\) platforms \(.*\)$/\1 \2/' Makefile +printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ @@ -100,9 +100,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT%{_initrddir}/halt -rm $RPM_BUILD_ROOT%{_initrddir}/halt.old - install -m744 platforms/apccontrol \ $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol From 8e2743b595f6383bee8dbc1a17b21fbcca7b34c6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:44:59 -0600 Subject: [PATCH 051/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 7934e02..75346f6 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -177,6 +177,9 @@ fi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.14.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 02 2010 Michal Hlavinka - 3.14.8-5 - do not attempt to invoke directory as a script (#659219) From 34be39d7ccb129760e3117e0f89693a46b8608dc Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 9 Feb 2011 13:58:22 +0100 Subject: [PATCH 052/139] - add readme file to doc explaining needed configuration of halt script --- README.Red_Hat | 4 ++++ apcupsd.spec | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 README.Red_Hat diff --git a/README.Red_Hat b/README.Red_Hat new file mode 100644 index 0000000..a9a3916 --- /dev/null +++ b/README.Red_Hat @@ -0,0 +1,4 @@ +please be sure to configure /etc/init.d/halt as per +http://www.apcupsd.com/manual/manual.html#shutdown-sequence +the ups lines you already see in this script are specific to another UPS +monitoring daemon, nut. Leave them undisturbed. diff --git a/apcupsd.spec b/apcupsd.spec index 75346f6..f8cd122 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,6 +9,7 @@ URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf +Source3: README.Red_Hat Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch @@ -65,6 +66,7 @@ A GUI interface to the APC UPS monitoring daemon. #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile +install -p -m 0666 %{SOURCE3} . %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ @@ -126,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog examples ReleaseNotes +%doc COPYING ChangeLog examples ReleaseNotes README.Red_Hat %dir %{_sysconfdir}/apcupsd %{_initddir}/apcupsd %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf @@ -177,6 +179,9 @@ fi %changelog +* Wed Feb 09 2011 Michal Hlavinka - 3.14.9-7 +- add readme file to doc explaining needed configuration of halt script + * Mon Feb 07 2011 Fedora Release Engineering - 3.14.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 4105a1e42d7976284f5e832b0b6c2d41258b79fe Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 16 Jun 2011 11:55:24 +0200 Subject: [PATCH 053/139] move from SysV init script to systemd service file --- apcupsd-3.14.8-systemd.patch | 26 +++++++++++++++++++ apcupsd.spec | 49 +++++++++++++++++++++++++++++------- 2 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 apcupsd-3.14.8-systemd.patch diff --git a/apcupsd-3.14.8-systemd.patch b/apcupsd-3.14.8-systemd.patch new file mode 100644 index 0000000..06a7c25 --- /dev/null +++ b/apcupsd-3.14.8-systemd.patch @@ -0,0 +1,26 @@ +diff -up apcupsd-3.14.8/apcupsd.service.systemd apcupsd-3.14.8/apcupsd.service +--- apcupsd-3.14.8/apcupsd.service.systemd 2011-06-16 10:33:02.335889489 +0200 ++++ apcupsd-3.14.8/apcupsd.service 2011-06-16 09:59:02.616138047 +0200 +@@ -0,0 +1,9 @@ ++[Unit] ++Description=APC UPS Power Control Daemon for Linux ++After=syslog.target ++ ++[Service] ++ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf ++ ++[Install] ++WantedBy=multi-user.target +diff -up apcupsd-3.14.8/apcupsd_shutdown.systemd apcupsd-3.14.8/apcupsd_shutdown +--- apcupsd-3.14.8/apcupsd_shutdown.systemd 2011-06-16 10:33:08.831934420 +0200 ++++ apcupsd-3.14.8/apcupsd_shutdown 2011-06-16 10:10:20.948796784 +0200 +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++# See if this is a powerfail situation. ++if [ -f /etc/apcupsd/powerfail ]; then ++ echo ++ echo "APCUPSD will now power off the UPS" ++ echo ++ /etc/apcupsd/apccontrol killpower ++fi diff --git a/apcupsd.spec b/apcupsd.spec index f8cd122..a77e87b 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -16,6 +16,9 @@ Patch1: apcupsd-3.14.4-shutdown.patch #fix FTBFS, c++ linking needs -lstdc++ explicitly Patch2: apcupsd-3.14.8-cxxld.patch +# systemd support +Patch3: apcupsd-3.14.8-systemd.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -63,6 +66,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch0 -p1 -b .init %patch1 -p1 -b .shutdown %patch2 -p1 -b .cxxld +%patch3 -p1 -b .systemd #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -105,7 +109,9 @@ make DESTDIR=$RPM_BUILD_ROOT install install -m744 platforms/apccontrol \ $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol -install -m755 platforms/redhat/apcupsd $RPM_BUILD_ROOT%{_initrddir} +# systemd support +install -p -D -m644 apcupsd.service $RPM_BUILD_ROOT/lib/systemd/system/apcupsd.service +install -p -D -m755 apcupsd_shutdown $RPM_BUILD_ROOT/lib/systemd/system-shutdown/apcupsd_shutdown install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -130,7 +136,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING ChangeLog examples ReleaseNotes README.Red_Hat %dir %{_sysconfdir}/apcupsd -%{_initddir}/apcupsd +/lib/systemd/system/%{name}.service +/lib/systemd/system-shutdown/apcupsd_shutdown %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol %config(noreplace) %{_sysconfdir}/apcupsd/changeme @@ -164,21 +171,45 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add apcupsd +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +else + # update (migration) sysv init -> systemd + # trigger won't work if we change NEVR in Fn-1 + # also systemd does not like scripts in old apcupsd, it'd hang for long time, this prevents it + if [ -f /etc/init.d/apcupsd ]; then + activate=/bin/false + enable=/bin/false + [ -n "$(find /etc/rc.d/rc5.d/ -name 'S??apcupsd' 2>/dev/null)" ] && enable=/bin/true || : + systemctl is-active --quiet apcupsd.service >/dev/null 2>&1 && activate=/bin/true || : + $activate && service apcupsd stop >/dev/null 2>&1 || : + /sbin/chkconfig --del apcupsd >/dev/null 2>&1 || : + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + $enable && /bin/systemctl enable apcupsd.service >/dev/null 2>&1 || : + $activate && /bin/systemctl start apcupsd.service >/dev/null 2>&1 || : + fi +fi %preun -if [ $1 = 0 ]; then - /sbin/service apcupsd stop >/dev/null 2>&1 - /sbin/chkconfig --del apcupsd +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable apcupsd.service >/dev/null 2>&1 || : + /bin/systemctl stop apcupsd.service >/dev/null 2>&1 || : fi %postun -if [ $1 -ge 1 ]; then - /sbin/service apcupsd condrestart >/dev/null 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart apcupsd.service >/dev/null 2>&1 || : fi %changelog +* Thu Jun 16 2011 Michal Hlavinka - 3.14.8-8 +- move from SysV init script to systemd service file + * Wed Feb 09 2011 Michal Hlavinka - 3.14.9-7 - add readme file to doc explaining needed configuration of halt script From 1489f2740c463eef105bfc29c16ce4df88048cfd Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 8 Jul 2011 08:51:14 +0200 Subject: [PATCH 054/139] rebuilt for net-snmp update --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index a77e87b..9d3f836 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -207,6 +207,9 @@ fi %changelog +* Fri Jul 08 2011 Michal Hlavinka - 3.14.8-9 +- rebuilt for net-snmp update + * Thu Jun 16 2011 Michal Hlavinka - 3.14.8-8 - move from SysV init script to systemd service file From aafe39bf8b2cf95853c9fdce187de148dbcc0c7a Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 25 Jul 2011 08:44:36 +0200 Subject: [PATCH 055/139] apcupsd updated to 3.14.9 --- .gitignore | 1 + apcupsd.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aed7f31..07977d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ apcupsd-3.14.8.tar.gz +/apcupsd-3.14.9.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 9d3f836..a4eb079 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.8 -Release: 9%{?dist} +Version: 3.14.9 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -207,6 +207,9 @@ fi %changelog +* Mon Jul 25 2011 Michal Hlavinka - 3.14.9-1 +- apcupsd updated to 3.14.9 + * Fri Jul 08 2011 Michal Hlavinka - 3.14.8-9 - rebuilt for net-snmp update diff --git a/sources b/sources index 67ae4c0..6a4019a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd17f0a903dc2220e55ed54e242359d2 apcupsd-3.14.8.tar.gz +aa5e2c2954a81c2f07e0a356e38fe853 apcupsd-3.14.9.tar.gz From 7b66028e59e27aac82bebdbbeef7ab700686daf1 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 20 Oct 2011 14:08:45 +0200 Subject: [PATCH 056/139] fix crash in gui (#578276), patch by Michal Sekletar --- apcupsd-3.14.9-fixgui.patch | 158 ++++++++++++++++++++++++++++++++++++ apcupsd.spec | 9 +- 2 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 apcupsd-3.14.9-fixgui.patch diff --git a/apcupsd-3.14.9-fixgui.patch b/apcupsd-3.14.9-fixgui.patch new file mode 100644 index 0000000..79551a1 --- /dev/null +++ b/apcupsd-3.14.9-fixgui.patch @@ -0,0 +1,158 @@ +--- apcupsd-3.14.9/src/gapcmon/gapcmon.c.timeout 2008-09-16 06:58:20.000000000 +0200 ++++ apcupsd-3.14.9/src/gapcmon/gapcmon.c 2011-10-12 20:10:52.986362156 +0200 +@@ -179,6 +179,54 @@ struct hostent * gethostname_re + */ + static gboolean lg_graph_debug = FALSE; + ++static GSList *timeout_list = NULL; ++ ++static inline timeout_t * new_timeout(guint id, timeout_type_t type, void *data) { ++ timeout_t *timeout = (timeout_t *) malloc(sizeof(timeout_t)); ++ ++ timeout->id = id; ++ timeout->type = type; ++ timeout->data = data; ++ return timeout; ++} ++ ++/* callback will check if timeout is associated with window ++ * which is about to be destroyed and it will call g_source_remove ++ * in order to prevent the callback associated with timeout to be executed ++ */ ++static void remove_timeout(gpointer tmo, gpointer data) { ++ timeout_t * timeout = (timeout_t *) tmo; ++ PGAPC_MONITOR monitor = (PGAPC_MONITOR) data; ++ int delete_timeout = 0; ++ ++ if (timeout == NULL) { ++ return; ++ } ++ ++ switch (timeout->type) { ++ case GRAPH: ++ if (timeout->data == (void *) monitor->phs.plg) { ++ delete_timeout = 1; ++ } ++ break; ++ case MONITOR: ++ if (timeout->data == (void *) monitor) { ++ delete_timeout = 1; ++ } ++ break; ++ ++ case HISTORY: ++ if (timeout->data == (void *) &(monitor->phs)) { ++ delete_timeout = 1; ++ } ++ break; ++ } ++ ++ if (delete_timeout) { ++ g_source_remove(timeout->id); ++ timeout_list = g_slist_remove(timeout_list, (gconstpointer) timeout); ++ } ++} + + /* ************************************************************************* */ + +@@ -1376,8 +1424,8 @@ static gint lg_graph_configure_event_cb + plg->x_range.i_minor_inc = plg->plot_box.width / plg->x_range.i_num_minor; + plg->x_range.i_major_inc = plg->plot_box.width / plg->x_range.i_num_major; + +- g_timeout_add (250, (GSourceFunc) lg_graph_draw, plg); +- ++ guint tid = g_timeout_add (250, (GSourceFunc) lg_graph_draw, plg); ++ timeout_list = g_slist_append(timeout_list, new_timeout(tid, GRAPH, (void *) plg)); + return TRUE; + } + +@@ -1745,7 +1793,8 @@ static gboolean cb_monitor_automatic_ref + return FALSE; /* stop timers */ + + if (pm->b_timer_control) { +- g_timeout_add(100, (GSourceFunc) cb_monitor_refresh_control, pm); ++ guint tid = g_timeout_add(100, (GSourceFunc) cb_monitor_refresh_control, pm); ++ timeout_list = g_slist_append(timeout_list, new_timeout(tid, MONITOR, (void *) pm)); + return FALSE; + } + +@@ -4543,9 +4592,9 @@ static void cb_monitor_interface_button_ + } + + g_async_queue_push(pm->q_network, pm); +- g_timeout_add(GAPC_REFRESH_FACTOR_ONE_TIME, ++ guint tid = g_timeout_add(GAPC_REFRESH_FACTOR_ONE_TIME, + (GSourceFunc) cb_monitor_dedicated_one_time_refresh, pm); +- ++ timeout_list = g_slist_append(timeout_list, new_timeout(tid, MONITOR, (void *) pm)); + return; + } + +@@ -5174,6 +5223,9 @@ static void cb_monitor_interface_destroy + g_source_remove(pm->tid_automatic_refresh); + } + ++ /* iterate through list of timers and remove all timers associated with this monitor */ ++ g_slist_foreach(timeout_list, remove_timeout, (gpointer) pm); ++ + if (pm->tid_thread_qwork != NULL) { + pm->b_thread_stop = TRUE; + g_async_queue_push(pm->q_network, pm); +@@ -5537,9 +5589,9 @@ static gint gapc_monitor_history_page(PG + + /* collect one right away */ + pphs->b_startup = TRUE; +- g_timeout_add((guint) (pm->d_refresh * GAPC_REFRESH_FACTOR_1K + 75), ++ guint tid = g_timeout_add((guint) (pm->d_refresh * GAPC_REFRESH_FACTOR_1K + 75), + (GSourceFunc) cb_util_line_chart_refresh, pphs); +- ++ timeout_list = g_slist_append(timeout_list, new_timeout(tid, HISTORY, (void *) pphs)); + return i_page; + } + +@@ -5565,7 +5617,8 @@ static gboolean cb_util_line_chart_refre + return FALSE; + + if (pm->b_graph_control) { +- g_timeout_add(100, (GSourceFunc) cb_util_line_chart_refresh_control, pm); ++ guint tid = g_timeout_add(100, (GSourceFunc) cb_util_line_chart_refresh_control, pm); ++ timeout_list = g_slist_append(timeout_list, new_timeout(tid, MONITOR, (void *) pm)); + return FALSE; + } + +@@ -6392,6 +6445,7 @@ extern int main(int argc, char *argv[]) + PGAPC_CONFIG pcfg = NULL; + GtkWidget *window = NULL; + ++ timeout_list = g_slist_alloc(); + /* + * Initialize GLib thread support, and GTK + */ +@@ -6435,5 +6489,6 @@ extern int main(int argc, char *argv[]) + gdk_flush(); + gdk_threads_leave(); + ++ g_slist_free(timeout_list); + return (0); + } +--- apcupsd-3.14.9/src/gapcmon/gapcmon.h 2011-10-12 20:12:54.584317583 +0200 ++++ apcupsd-3.14.9/src/gapcmon/gapcmon.h.timeout 2011-10-12 20:14:10.965669911 +0200 +@@ -403,6 +403,18 @@ typedef struct _System_Control_Data { + + } GAPC_CONFIG, *PGAPC_CONFIG; + ++typedef enum { ++ GRAPH, ++ MONITOR, ++ HISTORY ++} timeout_type_t; ++ ++typedef struct { ++ guint id; ++ timeout_type_t type; ++ void *data; ++} timeout_t; ++ + /* ************************************************************************* */ + + #define GAPC_GLOSSARY "GAPCMON\n \ diff --git a/apcupsd.spec b/apcupsd.spec index a4eb079..ec5ade0 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -19,6 +19,9 @@ Patch2: apcupsd-3.14.8-cxxld.patch # systemd support Patch3: apcupsd-3.14.8-systemd.patch +# fix crash in gui, rhbz#578276 +Patch4: apcupsd-3.14.9-fixgui.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -67,6 +70,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch1 -p1 -b .shutdown %patch2 -p1 -b .cxxld %patch3 -p1 -b .systemd +%patch4 -p1 -b .fixgui #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -207,6 +211,9 @@ fi %changelog +* Thu Oct 20 2011 Michal Hlavinka - 3.14.9-2 +- fix crash in gui (#578276), patch by Michal Sekletar + * Mon Jul 25 2011 Michal Hlavinka - 3.14.9-1 - apcupsd updated to 3.14.9 From 35decf9efeb31756732849c662f4be34939776c5 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 12 Dec 2011 13:38:06 +0100 Subject: [PATCH 057/139] apcupsd updated to 3.14.10 fix MODEL vs. APCMODEL confusion. Remove APCMODEL and rename old MODEL aka 'mode' to DRIVER. --- .gitignore | 1 + apcupsd.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 07977d8..276058d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ apcupsd-3.14.8.tar.gz /apcupsd-3.14.9.tar.gz +/apcupsd-3.14.10.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index ec5ade0..8709c7a 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.9 -Release: 2%{?dist} +Version: 3.14.10 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -211,6 +211,11 @@ fi %changelog +* Mon Dec 12 2011 Michal Hlavinka - 3.14.10-1 +- apcupsd updated to 3.14.10 +- fix MODEL vs. APCMODEL confusion. Remove APCMODEL and rename old MODEL + aka 'mode' to DRIVER. + * Thu Oct 20 2011 Michal Hlavinka - 3.14.9-2 - fix crash in gui (#578276), patch by Michal Sekletar diff --git a/sources b/sources index 6a4019a..b86e1ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa5e2c2954a81c2f07e0a356e38fe853 apcupsd-3.14.9.tar.gz +5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz From 2bc9f59504edf7c1e68896dcb0a28182e5b4e391 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 19 Dec 2011 10:23:56 +0100 Subject: [PATCH 058/139] remove powerfail flag on boot (#768684) --- apcupsd-3.14.8-systemd.patch | 3 ++- apcupsd.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd-3.14.8-systemd.patch b/apcupsd-3.14.8-systemd.patch index 06a7c25..b89da36 100644 --- a/apcupsd-3.14.8-systemd.patch +++ b/apcupsd-3.14.8-systemd.patch @@ -1,12 +1,13 @@ diff -up apcupsd-3.14.8/apcupsd.service.systemd apcupsd-3.14.8/apcupsd.service --- apcupsd-3.14.8/apcupsd.service.systemd 2011-06-16 10:33:02.335889489 +0200 +++ apcupsd-3.14.8/apcupsd.service 2011-06-16 09:59:02.616138047 +0200 -@@ -0,0 +1,9 @@ +@@ -0,0 +1,10 @@ +[Unit] +Description=APC UPS Power Control Daemon for Linux +After=syslog.target + +[Service] ++ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail +ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf + +[Install] diff --git a/apcupsd.spec b/apcupsd.spec index 8709c7a..0c1a26e 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -211,6 +211,9 @@ fi %changelog +* Mon Dec 19 2011 Michal Hlavinka - 3.14.10-2 +- remove powerfail flag on boot (#768684) + * Mon Dec 12 2011 Michal Hlavinka - 3.14.10-1 - apcupsd updated to 3.14.10 - fix MODEL vs. APCMODEL confusion. Remove APCMODEL and rename old MODEL From b0541bd1b623951dc1d613cbeb4b16136b906ac0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:38:57 -0600 Subject: [PATCH 059/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 0c1a26e..feedd04 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -211,6 +211,9 @@ fi %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 3.14.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Dec 19 2011 Michal Hlavinka - 3.14.10-2 - remove powerfail flag on boot (#768684) From 8724552879a724eb88b0c22f331d494347afca78 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 13 Feb 2012 19:01:26 +0100 Subject: [PATCH 060/139] start after network is up (#789191) --- apcupsd-3.14.8-systemd.patch | 3 ++- apcupsd.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd-3.14.8-systemd.patch b/apcupsd-3.14.8-systemd.patch index b89da36..b0a24cb 100644 --- a/apcupsd-3.14.8-systemd.patch +++ b/apcupsd-3.14.8-systemd.patch @@ -1,10 +1,11 @@ diff -up apcupsd-3.14.8/apcupsd.service.systemd apcupsd-3.14.8/apcupsd.service --- apcupsd-3.14.8/apcupsd.service.systemd 2011-06-16 10:33:02.335889489 +0200 +++ apcupsd-3.14.8/apcupsd.service 2011-06-16 09:59:02.616138047 +0200 -@@ -0,0 +1,10 @@ +@@ -0,0 +1,11 @@ +[Unit] +Description=APC UPS Power Control Daemon for Linux +After=syslog.target ++After=network.target + +[Service] +ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail diff --git a/apcupsd.spec b/apcupsd.spec index feedd04..3174b9e 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -211,6 +211,9 @@ fi %changelog +* Mon Feb 13 2012 Michal Hlavinka - 3.14.10-4 +- start after network is up (#789191) + * Thu Jan 12 2012 Fedora Release Engineering - 3.14.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 6433a614726224049f2a5e6ec4a66b3e740e6092 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 11:23:58 -0500 Subject: [PATCH 061/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 3174b9e..d4f16a8 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -211,6 +211,9 @@ fi %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.14.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Feb 13 2012 Michal Hlavinka - 3.14.10-4 - start after network is up (#789191) From 461ea258097f0a0417f40e4773d86930ea2df095 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 24 Aug 2012 13:49:54 +0200 Subject: [PATCH 062/139] scriptlets replaced with new systemd macros (#851227) --- apcupsd.spec | 44 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index d4f16a8..8e2fcf3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -28,10 +28,9 @@ BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, tcp_wrappers-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units %description Apcupsd can be used for controlling most APC UPSes. During a @@ -175,42 +174,19 @@ rm -rf $RPM_BUILD_ROOT %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -else - # update (migration) sysv init -> systemd - # trigger won't work if we change NEVR in Fn-1 - # also systemd does not like scripts in old apcupsd, it'd hang for long time, this prevents it - if [ -f /etc/init.d/apcupsd ]; then - activate=/bin/false - enable=/bin/false - [ -n "$(find /etc/rc.d/rc5.d/ -name 'S??apcupsd' 2>/dev/null)" ] && enable=/bin/true || : - systemctl is-active --quiet apcupsd.service >/dev/null 2>&1 && activate=/bin/true || : - $activate && service apcupsd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del apcupsd >/dev/null 2>&1 || : - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - $enable && /bin/systemctl enable apcupsd.service >/dev/null 2>&1 || : - $activate && /bin/systemctl start apcupsd.service >/dev/null 2>&1 || : - fi -fi +%systemd_post apcupsd.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable apcupsd.service >/dev/null 2>&1 || : - /bin/systemctl stop apcupsd.service >/dev/null 2>&1 || : -fi +%systemd_preun apcupsd.service %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart apcupsd.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart apcupsd.service %changelog +* Fri Aug 24 2012 Michal Hlavinka - 3.14.10-6 +- scriptlets replaced with new systemd macros (#851227) + * Wed Jul 18 2012 Fedora Release Engineering - 3.14.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From fce6302b202262d12049b752d29ff65cd83521a5 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 30 Oct 2012 12:23:58 +0100 Subject: [PATCH 063/139] fix configuration for httpd 2.4 (#871361) --- apcupsd-httpd.conf | 8 +++++++- apcupsd.spec | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf index 973dec9..26a5191 100644 --- a/apcupsd-httpd.conf +++ b/apcupsd-httpd.conf @@ -18,9 +18,15 @@ Alias /apcupsd /var/www/apcupsd DirectoryIndex upsstats.cgi AllowOverride None Options ExecCGI Indexes + + # Apache 2.4 + Require local + + + # Apache 2.2 Order deny,allow Deny from all Allow from 127.0.0.1 Allow from ::1 - # Allow from .example.com + diff --git a/apcupsd.spec b/apcupsd.spec index 8e2fcf3..558ff12 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 30 2012 Michal Hlavinka - 3.14.10-7 +- fix configuration for httpd 2.4 (#871361) + * Fri Aug 24 2012 Michal Hlavinka - 3.14.10-6 - scriptlets replaced with new systemd macros (#851227) From 4827e33d60fb780fe93265629a75818db0e02576 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 30 Oct 2012 13:08:16 +0100 Subject: [PATCH 064/139] add missing buildrequire --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 558ff12..de8ce54 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, tcp_wrappers-devel -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils +BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, wall Requires: /bin/mail Requires(post): systemd-units Requires(preun): systemd-units From 0d746dd04bba6b0a51f7c8ddea559670c00916f8 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 30 Oct 2012 13:24:20 +0100 Subject: [PATCH 065/139] add missing buildrequire --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index de8ce54..185e173 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, tcp_wrappers-devel -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, wall +BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, sysvinit-tools Requires: /bin/mail Requires(post): systemd-units Requires(preun): systemd-units From 2cc086d867f0fb683fd5ee5d2c8330abdc76fa06 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 5 Feb 2013 16:59:29 +0100 Subject: [PATCH 066/139] remove obsolete documentation --- README.Red_Hat | 4 ---- apcupsd.spec | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 README.Red_Hat diff --git a/README.Red_Hat b/README.Red_Hat deleted file mode 100644 index a9a3916..0000000 --- a/README.Red_Hat +++ /dev/null @@ -1,4 +0,0 @@ -please be sure to configure /etc/init.d/halt as per -http://www.apcupsd.com/manual/manual.html#shutdown-sequence -the ups lines you already see in this script are specific to another UPS -monitoring daemon, nut. Leave them undisturbed. diff --git a/apcupsd.spec b/apcupsd.spec index 185e173..4056699 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,7 +9,6 @@ URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf -Source3: README.Red_Hat Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch @@ -73,7 +72,6 @@ A GUI interface to the APC UPS monitoring daemon. #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile -install -p -m 0666 %{SOURCE3} . %build cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ @@ -137,7 +135,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog examples ReleaseNotes README.Red_Hat +%doc COPYING ChangeLog examples ReleaseNotes %dir %{_sysconfdir}/apcupsd /lib/systemd/system/%{name}.service /lib/systemd/system-shutdown/apcupsd_shutdown @@ -184,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 05 2013 Michal Hlavinka - 3.14.10-8 +- remove obsolete documentation + * Tue Oct 30 2012 Michal Hlavinka - 3.14.10-7 - fix configuration for httpd 2.4 (#871361) From c96b4bc2c8ada06331b2ed4538c4036e1aabb1d2 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 14 Feb 2013 13:01:14 -0800 Subject: [PATCH 067/139] Remove --vendor flag to desktop-file-install on F19+ --- apcupsd.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 4056699..7b109c4 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -119,7 +119,10 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf -desktop-file-install --vendor="fedora" \ +desktop-file-install \ +%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) + --vendor="fedora" \ +%endif --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop @@ -162,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT %files gui %defattr(-,root,root,-) %{_bindir}/gapcmon -%{_datadir}/applications/fedora-gapcmon.desktop +%{_datadir}/applications/*gapcmon.desktop %{_datadir}/pixmaps/apcupsd.png %{_datadir}/pixmaps/charging.png %{_datadir}/pixmaps/gapc_prefs.png @@ -182,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Toshio Kuratomi - 3.14.10-9 +- Remove --vendor flag to desktop-file-install on F19+ + * Tue Feb 05 2013 Michal Hlavinka - 3.14.10-8 - remove obsolete documentation From d25990de4024991ae7b5befe48e3e0e4b72cc667 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 17 May 2013 13:33:03 +0200 Subject: [PATCH 068/139] make executables hardened (#955341) --- apcupsd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 7b109c4..9eab0ad 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 9%{?dist} +Release: 10%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -74,6 +74,7 @@ A GUI interface to the APC UPS monitoring daemon. printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile %build +%global _hardened_build 1 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" %configure \ @@ -185,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 17 2013 Michal Hlavinka - 3.14.10-10 +- make executables hardened (#955341) + * Thu Feb 14 2013 Toshio Kuratomi - 3.14.10-9 - Remove --vendor flag to desktop-file-install on F19+ From 3a6416c3ad631d30abea083986d576bf26fa7529 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Jun 2013 08:31:31 +0200 Subject: [PATCH 069/139] rebuild for new GD 2.1.0 --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 9eab0ad..3676ffe 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 10%{?dist} +Release: 11%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 11 2013 Remi Collet - 3.14.10-11 +- rebuild for new GD 2.1.0 + * Fri May 17 2013 Michal Hlavinka - 3.14.10-10 - make executables hardened (#955341) From d04b96f4ffe5782e375c97ab52cd411b04dbeadd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 20:29:24 -0500 Subject: [PATCH 070/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 3676ffe..007d2bc 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 11%{?dist} +Release: 12%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.14.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jun 11 2013 Remi Collet - 3.14.10-11 - rebuild for new GD 2.1.0 From f4fd99b61c7bfdc6f9f94091be27a516b1f025b6 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 14 Aug 2013 17:04:05 +0200 Subject: [PATCH 071/139] fix aarch64 support (#925007) --- apcupsd-aarch64.patch | 3083 +++++++++++++++++++++++++++++++++++++++++ apcupsd.spec | 11 +- 2 files changed, 3091 insertions(+), 3 deletions(-) create mode 100644 apcupsd-aarch64.patch diff --git a/apcupsd-aarch64.patch b/apcupsd-aarch64.patch new file mode 100644 index 0000000..7f4336f --- /dev/null +++ b/apcupsd-aarch64.patch @@ -0,0 +1,3083 @@ +diff -urN apcupsd-3.14.10/autoconf/config.guess apcupsd-3.14.10-aarch64/autoconf/config.guess +--- apcupsd-3.14.10/autoconf/config.guess 2002-05-28 08:34:16.000000000 -0500 ++++ apcupsd-3.14.10-aarch64/autoconf/config.guess 2013-03-07 18:29:36.740840595 -0600 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2001-07-12' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -16,23 +17,24 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + +-# Written by Per Bothner . +-# Please send patches to . ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -52,7 +54,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -65,11 +68,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -87,30 +90,42 @@ + exit 1 + fi + ++trap 'exit 1' 1 2 15 + +-dummy=dummy-$$ +-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. + +-# CC_FOR_BUILD -- compiler used by this script. + # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still + # use `HOST_CC' if defined, but it is deprecated. + +-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int dummy(){}" > $dummy.c ; +- for c in cc gcc c89 ; do +- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; +- if test $? = 0 ; then ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; +- rm -f $dummy.c $dummy.o $dummy.rel ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -127,32 +142,34 @@ + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) +- # Netbsd (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. +- # Determine the machine/vendor (is the vendor relevant). +- case "${UNAME_MACHINE}" in +- amiga) machine=m68k-unknown ;; +- arm32) machine=arm-unknown ;; +- atari*) machine=m68k-atari ;; +- sun3*) machine=m68k-sun ;; +- mac68k) machine=m68k-apple ;; +- macppc) machine=powerpc-apple ;; +- hp3[0-9][05]) machine=m68k-hp ;; +- ibmrt|romp-ibm) machine=romp-ibm ;; +- *) machine=${UNAME_MACHINE}-unknown ;; ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ arm*) machine=arm-unknown ;; ++ sh3el) machine=shl-unknown ;; ++ sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. +- case "${UNAME_MACHINE}" in +- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -162,121 +179,139 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- cat <$dummy.s +- .data +-\$Lformat: +- .byte 37,100,45,37,120,10,0 # "%d-%x\n" +- +- .text +- .globl main +- .align 4 +- .ent main +-main: +- .frame \$30,16,\$26,0 +- ldgp \$29,0(\$27) +- .prologue 1 +- .long 0x47e03d80 # implver \$0 +- lda \$2,-1 +- .long 0x47e20c21 # amask \$2,\$1 +- lda \$16,\$Lformat +- mov \$0,\$17 +- not \$1,\$18 +- jsr \$26,printf +- ldgp \$29,0(\$26) +- mov 0,\$16 +- jsr \$26,exit +- .end main +-EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- case `./$dummy` in +- 0-0) +- UNAME_MACHINE="alpha" +- ;; +- 1-0) +- UNAME_MACHINE="alphaev5" +- ;; +- 1-1) +- UNAME_MACHINE="alphaev56" +- ;; +- 1-101) +- UNAME_MACHINE="alphapca56" +- ;; +- 2-303) +- UNAME_MACHINE="alphaev6" +- ;; +- 2-307) +- UNAME_MACHINE="alphaev67" +- ;; +- esac +- fi +- rm -f $dummy.s $dummy +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; +- arc64:OpenBSD:*:*) +- echo mips64el-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hkmips:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -284,25 +319,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -311,12 +372,12 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) +- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) +@@ -326,13 +387,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; +- atari*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -342,51 +400,43 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; +- sun3*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __cplusplus + #include /* for printf() prototype */ +@@ -408,31 +458,36 @@ + exit (-1); + } + EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.c -o $dummy \ +- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -445,29 +500,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -475,9 +530,10 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then ++ eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + +@@ -489,18 +545,20 @@ + exit(0); + } + EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` ++ exit ;; ++ *:AIX:*:[4567]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else +@@ -512,97 +570,116 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) +- case "${HPUX_REV}" in +- 11.[0-9][0-9]) +- if [ -x /usr/bin/getconf ]; then +- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; +- esac ;; +- esac +- fi ;; +- esac +- if [ "${HP_ARCH}" = "" ]; then +- sed 's/^ //' << EOF >$dummy.c +- +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF +- eval $set_cc_for_build +- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` +- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi +- rm -f $dummy.c $dummy +- fi ;; ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; + esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) ++ eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int +@@ -628,156 +705,176 @@ + exit (0); + } + EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; +- hppa*:OpenBSD:*:*) +- echo hppa-unknown-openbsd +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; +- CRAY*X-MP:*:*:*) +- echo xmp-cray-unicos +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; +- CRAY*T3D:*:*:*) +- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; +- CRAY-2:*:*:*) +- echo cray2-cray-unicos +- exit 0 ;; ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; +- *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; ++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ++ echo i${UNAME_MACHINE}-pc-mks ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? +- echo i386-pc-interix +- exit 0 ;; ++ echo i586-pc-interix ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) ++ # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; +- arm*:Linux:*:*) ++ exit ;; ++ aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux +- exit 0 ;; +- m68*:Linux:*:*) ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) +- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in +- big) echo mips-unknown-linux-gnu && exit 0 ;; +- little) echo mipsel-unknown-linux-gnu && exit 0 ;; +- esac +- ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -786,12 +883,91 @@ + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev67 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ cris:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=${UNAME_MACHINE}el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=${UNAME_MACHINE} ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ or32:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -799,92 +975,71 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- ld_supported_targets=`cd /; ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- cat >$dummy.c < +-#ifdef __cplusplus +-#include /* for printf() prototype */ +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +-#ifdef __ELF__ +-# ifdef __GLIBC__ +-# if __GLIBC__ >= 2 +- printf ("%s-pc-linux-gnu\n", argv[1]); +-# else +- printf ("%s-pc-linux-gnulibc1\n", argv[1]); +-# endif +-# else +- printf ("%s-pc-linux-gnulibc1\n", argv[1]); +-# endif +-#else +- printf ("%s-pc-linux-gnuaout\n", argv[1]); +-#endif +- return 0; +-} +-EOF +- eval $set_cc_for_build +- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -892,99 +1047,113 @@ + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then +- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` +- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 +- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 +- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi +- exit 0 ;; +- i*86:*DOS:*:*) +- echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit 0 ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +- exit 0 ;; ++ exit ;; + paragon:*:*:*) + echo i860-intel-osf1 +- exit 0 ;; ++ exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -992,78 +1161,126 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo hppa1.1-stratus-vos ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-6:SUPER-UX:*:*) ++ echo sx6-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- echo `uname -p`-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) +- if test "${UNAME_MACHINE}" = "x86pc"; then ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi +- echo `uname -p`-${UNAME_MACHINE}-nto-qnx +- exit 0 ;; ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; +- NSR-[KW]:NONSTOP_KERNEL:*:*) ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1074,35 +1291,56 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; +- i*86:OS/2:*:*) +- # If we were able to find `uname', then EMX Unix compatibility +- # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- ++eval $set_cc_for_build + cat >$dummy.c < +@@ -1119,16 +1357,16 @@ + #include + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -1217,13 +1455,12 @@ + } + EOF + +-eval $set_cc_for_build +-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 +-rm -f $dummy.c $dummy ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1232,22 +1469,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1258,7 +1495,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- ftp://ftp.gnu.org/pub/gnu/config/ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -urN apcupsd-3.14.10/autoconf/config.sub apcupsd-3.14.10-aarch64/autoconf/config.sub +--- apcupsd-3.14.10/autoconf/config.sub 2002-05-28 08:34:17.000000000 -0500 ++++ apcupsd-3.14.10-aarch64/autoconf/config.sub 2013-03-07 18:29:36.787835162 -0600 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2001-06-08' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -20,22 +21,25 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. +- ++# along with this program; if not, see . ++# + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + +-# Please send patches to . ++ ++# Please send patches to . Submit a context ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -69,7 +73,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -82,11 +87,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -98,7 +103,7 @@ + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -117,10 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -143,10 +156,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -161,13 +177,17 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -184,6 +204,10 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -201,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -223,35 +253,105 @@ + case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. +- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ +- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ +- | pyramid | mn10200 | mn10300 | tron | a29k \ +- | 580 | i960 | h8300 \ +- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ +- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ +- | hppa64 \ +- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ +- | alphaev6[78] \ +- | we32k | ns16k | clipper | i370 | sh | sh[34] \ +- | powerpc | powerpcle \ +- | 1750a | dsp16xx | pdp10 | pdp11 \ +- | mips16 | mips64 | mipsel | mips64el \ +- | mips64orion | mips64orionel | mipstx39 | mipstx39el \ +- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ +- | mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \ +- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ +- | v850 | c4x \ +- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ +- | pj | pjl | h8500 | z8k) ++ 1750a | 580 \ ++ | a29k \ ++ | aarch64 | aarch64_be \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ ++ | fido | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nds32 | nds32le | nds32be \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | open8 \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ ++ | pyramid \ ++ | rl78 | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ ++ | we32k \ ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and +@@ -265,31 +365,83 @@ + exit 1 + ;; + # Recognize the basic CPU types with company name. +- # FIXME: clean up the formatting here. +- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ +- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ +- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ +- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ +- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ +- | xmp-* | ymp-* \ +- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ +- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ +- | hppa2.0n-* | hppa64-* \ +- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ +- | alphaev6[78]-* \ +- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ +- | clipper-* | orion-* \ +- | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ +- | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ +- | mips16-* | mips64-* | mipsel-* \ +- | mips64el-* | mips64orion-* | mips64orionel-* \ +- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ +- | mipstx39-* | mipstx39el-* | mcore-* \ +- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ +- | [cjt]90-* \ +- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ +- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ +- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) ++ 580-* \ ++ | a29k-* \ ++ | aarch64-* | aarch64_be-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | be32-* | be64-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ ++ | pyramid-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -307,6 +459,9 @@ + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -321,6 +476,12 @@ + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -344,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -352,6 +517,35 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -372,30 +566,45 @@ + basic_machine=c38-convex + os=-bsd + ;; +- cray | ymp) +- basic_machine=ymp-cray ++ cray | j90) ++ basic_machine=j90-cray + os=-unicos + ;; +- cray2) +- basic_machine=cray2-cray +- os=-unicos ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp + ;; +- [cjt]90) +- basic_machine=${basic_machine}-cray +- os=-unicos ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown ++ os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola +@@ -404,6 +613,14 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -515,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -554,6 +770,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -565,10 +789,21 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -576,36 +811,39 @@ + basic_machine=m68k-atari + os=-mint + ;; +- mipsel*-linux*) +- basic_machine=mipsel-unknown +- os=-linux-gnu +- ;; +- mips*-linux*) +- basic_machine=mips-unknown +- os=-linux-gnu +- ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -670,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -677,6 +921,13 @@ + basic_machine=hppa1.1-oki + os=-proelf + ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose +@@ -693,48 +944,79 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; +- pc532 | pc532-*) ++ pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; +- pentium | p5 | k5 | k6 | nexgen) ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +- pentiumpro | p6 | 6x86 | athlon) ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; +- pentiumii | pentium2) ++ pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; +- pentium-* | p5-* | k5-* | k6-* | nexgen-*) ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumii-* | pentium2-*) ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown +- ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc | ppcbe) basic_machine=powerpc-unknown ++ ;; ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +- ;; ++ ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ ppc64) basic_machine=powerpc64-unknown ++ ;; ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little) ++ basic_machine=powerpc64le-unknown ++ ;; ++ ppc64le-* | powerpc64little-*) ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + ps2) + basic_machine=i386-ibm + ;; +@@ -742,6 +1024,10 @@ + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -752,10 +1038,30 @@ + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -763,7 +1069,13 @@ + basic_machine=sh-hitachi + os=-hms + ;; +- sparclite-wrs) ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; +@@ -781,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -830,12 +1145,16 @@ + os=-dynix + ;; + t3e) +- basic_machine=t3e-cray ++ basic_machine=alphaev5-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tile*) ++ basic_machine=$basic_machine-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown +@@ -843,9 +1162,17 @@ + tx39el) + basic_machine=mipstx39el-unknown + ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -867,8 +1194,8 @@ + os=-vms + ;; + vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; ++ basic_machine=f301-fujitsu ++ ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks +@@ -889,21 +1216,28 @@ + basic_machine=hppa1.1-winbond + os=-proelf + ;; +- windows32) +- basic_machine=i386-pc +- os=-windows32-msvcrt +- ;; +- xmp) +- basic_machine=xmp-cray +- os=-unicos ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 + ;; +- xps | xps100) ++ xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -920,16 +1254,12 @@ + op60c) + basic_machine=hppa1.1-oki + ;; +- mips) +- if [ x$os = x-linux-gnu ]; then +- basic_machine=mips-unknown +- else +- basic_machine=mips-mips +- fi +- ;; + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -946,13 +1276,13 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; +- cydra) ++ cydra) + basic_machine=cydra-cydrome + ;; + orion) +@@ -967,10 +1297,6 @@ + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; +- c4x*) +- basic_machine=c4x-none +- os=-coff +- ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; +@@ -997,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1020,22 +1349,31 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ +- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1047,16 +1385,21 @@ + ;; + esac + ;; ++ -nto-qnx*) ++ ;; + -nto*) +- os=-nto-qnx ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -1069,6 +1412,9 @@ + -opened*) + os=-openedition + ;; ++ -os400*) ++ os=-os400 ++ ;; + -wince*) + os=-wince + ;; +@@ -1087,14 +1433,23 @@ + -acis*) + os=-aos + ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; + -ns2 ) +- os=-nextstep2 ++ os=-nextstep2 + ;; + -nsk*) + os=-nsk +@@ -1106,6 +1461,9 @@ + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -1133,8 +1491,22 @@ + -xenix) + os=-xenix + ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- os=-mint ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) + ;; + -none) + ;; +@@ -1158,6 +1530,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1167,10 +1545,26 @@ + arm*-semi) + os=-aout + ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; +- pdp11-*) ++ pdp11-*) + os=-none + ;; + *-dec | vax-*) +@@ -1184,19 +1578,22 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; ++ or32-*) ++ os=-coff ++ ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; +@@ -1206,9 +1603,15 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1260,19 +1663,19 @@ + *-next) + os=-nextstep3 + ;; +- *-gould) ++ *-gould) + os=-sysv + ;; +- *-highlevel) ++ *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; +- *-sgi) ++ *-sgi) + os=-irix + ;; +- *-siemens) ++ *-siemens) + os=-sysv4 + ;; + *-masscomp) +@@ -1311,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +@@ -1341,10 +1744,16 @@ + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; +- -vxsim* | -vxworks*) ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) +@@ -1359,13 +1768,16 @@ + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; ++ -vos*) ++ vendor=stratus ++ ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/apcupsd.spec b/apcupsd.spec index 007d2bc..f6eae06 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 12%{?dist} +Release: 13%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -20,6 +20,7 @@ Patch3: apcupsd-3.14.8-systemd.patch # fix crash in gui, rhbz#578276 Patch4: apcupsd-3.14.9-fixgui.patch +Patch5: apcupsd-aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +70,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch2 -p1 -b .cxxld %patch3 -p1 -b .systemd %patch4 -p1 -b .fixgui +%patch5 -p1 -b .aarch64 #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -186,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 14 2013 Michal Hlavinka - 3.14.10-13 +- fix aarch64 support (#925007) + * Sat Aug 03 2013 Fedora Release Engineering - 3.14.10-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -272,7 +277,7 @@ rm -rf $RPM_BUILD_ROOT * Mon May 18 2009 Michal Hlavinka - 3.14.6-1 - update to 3.14.6 -* Thu Feb 24 2009 Michal Hlavinka - 3.14.5-3 +* Tue Feb 24 2009 Michal Hlavinka - 3.14.5-3 - fix build with gcc 4.4 * Mon Feb 23 2009 Fedora Release Engineering - 3.14.5-2 @@ -308,7 +313,7 @@ rm -rf $RPM_BUILD_ROOT - Add patch to close open file descriptors (bug #247162) - Stop/restart service as needed on removal/upgrade -* Mon Jun 02 2007 - Orion Poplawski - 3.14.1-2 +* Mon Jun 04 2007 - Orion Poplawski - 3.14.1-2 - Add patch for linux USB UPS detection (bug #245864) * Tue May 29 2007 - Orion Poplawski - 3.14.1-1 From 9d899e2f9e8e29e17130e7b62e9103837b43088c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 23 Jan 2014 09:52:27 +0100 Subject: [PATCH 072/139] reduce amount of debug messages (#1053324) --- apcupsd-3.14.10-nodbg.patch | 26 ++++++++++++++++++++++++++ apcupsd.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 apcupsd-3.14.10-nodbg.patch diff --git a/apcupsd-3.14.10-nodbg.patch b/apcupsd-3.14.10-nodbg.patch new file mode 100644 index 0000000..d3f9f56 --- /dev/null +++ b/apcupsd-3.14.10-nodbg.patch @@ -0,0 +1,26 @@ +diff -up apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg apcupsd-3.14.10/src/drivers/snmplite/asn.cpp +--- apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg 2010-09-07 17:35:13.000000000 +0200 ++++ apcupsd-3.14.10/src/drivers/snmplite/asn.cpp 2014-01-21 17:07:27.603049214 +0100 +@@ -26,10 +26,13 @@ + #include + #include + ++extern int debug_level; ++ + using namespace Asn; + + void debug(const char *foo, int indent) + { ++ if (!debug_level) return; + while (indent--) + printf(" "); + printf("%s\n", foo); +@@ -86,7 +89,7 @@ Object *Object::Demarshal(unsigned char + obj = new Sequence(type); + break; + default: +- printf("UNKNOWN ASN type=0x%02x\n", type); ++ if (debug_level) printf("UNKNOWN ASN type=0x%02x\n", type); + debug("UNKNOWN", indent); + obj = NULL; + break; diff --git a/apcupsd.spec b/apcupsd.spec index f6eae06..1385eb5 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.10 -Release: 13%{?dist} +Release: 14%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -21,6 +21,7 @@ Patch3: apcupsd-3.14.8-systemd.patch # fix crash in gui, rhbz#578276 Patch4: apcupsd-3.14.9-fixgui.patch Patch5: apcupsd-aarch64.patch +Patch6: apcupsd-3.14.10-nodbg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +72,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch3 -p1 -b .systemd %patch4 -p1 -b .fixgui %patch5 -p1 -b .aarch64 +%patch6 -p1 -b .nodbg #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -188,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 21 2014 Michal Hlavinka - 3.14.10-14 +- reduce amount of debug messages (#1053324) + * Wed Aug 14 2013 Michal Hlavinka - 3.14.10-13 - fix aarch64 support (#925007) From 0047aee7f1a9b7a8d577496c893accc7fa97288c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 23 Jan 2014 10:24:31 +0100 Subject: [PATCH 073/139] drop sysvinit-tools BR --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1385eb5..26d1de8 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 BuildRequires: net-snmp-devel, tcp_wrappers-devel -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, sysvinit-tools +BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): systemd-units Requires(preun): systemd-units From a42b8eabeab70c3fb61ec4f8419856219b6dae4c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 17 Feb 2014 15:52:51 +0100 Subject: [PATCH 074/139] apcupsd updated to 3.14.11 --- apcupsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 26d1de8..2332b6d 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.10 -Release: 14%{?dist} +Version: 3.14.11 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 17 2014 Michal Hlavinka - 3.14.11-1 +- apcupsd updated to 3.14.11 + * Tue Jan 21 2014 Michal Hlavinka - 3.14.10-14 - reduce amount of debug messages (#1053324) From 819a904ea09c84035ad7fa25174ed186cf3009ef Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 17 Feb 2014 15:56:16 +0100 Subject: [PATCH 075/139] upload new tarball --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 276058d..7b1c465 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ apcupsd-3.14.8.tar.gz /apcupsd-3.14.9.tar.gz /apcupsd-3.14.10.tar.gz +/apcupsd-3.14.11.tar.gz diff --git a/sources b/sources index b86e1ab..7d38a22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz +036d6b75bf9bf5eb20a98e14db4415dd apcupsd-3.14.11.tar.gz From 2ff2000d2ac1855a72bec09528cfddd7f17099d2 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 31 Mar 2014 14:34:48 +0200 Subject: [PATCH 076/139] apcupsd updated to 3.14.12 - force lock dir to /var/lock (#1064099) --- .gitignore | 1 + apcupsd.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b1c465..47a5c70 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ apcupsd-3.14.8.tar.gz /apcupsd-3.14.9.tar.gz /apcupsd-3.14.10.tar.gz /apcupsd-3.14.11.tar.gz +/apcupsd-3.14.12.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 2332b6d..2fcc9c1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,5 +1,5 @@ Name: apcupsd -Version: 3.14.11 +Version: 3.14.12 Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux @@ -101,6 +101,7 @@ export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" --with-serial-dev= \ --with-upstype=usb \ --with-upscable=usb \ + --with-lock-dir=/var/lock \ APCUPSD_MAIL=/bin/mail make %{?_smp_mflags} @@ -190,6 +191,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 31 2014 Michal Hlavinka - 3.14.12-1 +- apcupsd updated to 3.14.12 +- force lock dir to /var/lock (#1064099) + * Mon Feb 17 2014 Michal Hlavinka - 3.14.11-1 - apcupsd updated to 3.14.11 diff --git a/sources b/sources index 7d38a22..5523e69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -036d6b75bf9bf5eb20a98e14db4415dd apcupsd-3.14.11.tar.gz +08bf201acea6b4dd69cf2fb0eecfd55e apcupsd-3.14.12.tar.gz From c36afd656ab530b4605a8f9adcae81c1a3543a1e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 20:07:40 -0500 Subject: [PATCH 077/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 2fcc9c1..e4369d5 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.14.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Mar 31 2014 Michal Hlavinka - 3.14.12-1 - apcupsd updated to 3.14.12 - force lock dir to /var/lock (#1064099) From 9be2c29057b774828d9bf3e3cc9130453697fa56 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:42:24 +0000 Subject: [PATCH 078/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index e4369d5..cf1d28f 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -191,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 3.14.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 3.14.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 45b813e5dd6fdbd461299b2c8de19a0937a8637f Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 3 Feb 2015 16:10:39 +0100 Subject: [PATCH 079/139] apcupsd updated to 3.14.13 --- .gitignore | 1 + apcupsd-3.14.10-nodbg.patch | 26 - apcupsd-3.14.8-cxxld.patch | 16 - apcupsd-aarch64.patch | 3083 ----------------------------------- apcupsd.spec | 15 +- sources | 2 +- 6 files changed, 7 insertions(+), 3136 deletions(-) delete mode 100644 apcupsd-3.14.10-nodbg.patch delete mode 100644 apcupsd-3.14.8-cxxld.patch delete mode 100644 apcupsd-aarch64.patch diff --git a/.gitignore b/.gitignore index 47a5c70..039fa15 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ apcupsd-3.14.8.tar.gz /apcupsd-3.14.10.tar.gz /apcupsd-3.14.11.tar.gz /apcupsd-3.14.12.tar.gz +/apcupsd-3.14.13.tar.gz diff --git a/apcupsd-3.14.10-nodbg.patch b/apcupsd-3.14.10-nodbg.patch deleted file mode 100644 index d3f9f56..0000000 --- a/apcupsd-3.14.10-nodbg.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg apcupsd-3.14.10/src/drivers/snmplite/asn.cpp ---- apcupsd-3.14.10/src/drivers/snmplite/asn.cpp.nodbg 2010-09-07 17:35:13.000000000 +0200 -+++ apcupsd-3.14.10/src/drivers/snmplite/asn.cpp 2014-01-21 17:07:27.603049214 +0100 -@@ -26,10 +26,13 @@ - #include - #include - -+extern int debug_level; -+ - using namespace Asn; - - void debug(const char *foo, int indent) - { -+ if (!debug_level) return; - while (indent--) - printf(" "); - printf("%s\n", foo); -@@ -86,7 +89,7 @@ Object *Object::Demarshal(unsigned char - obj = new Sequence(type); - break; - default: -- printf("UNKNOWN ASN type=0x%02x\n", type); -+ if (debug_level) printf("UNKNOWN ASN type=0x%02x\n", type); - debug("UNKNOWN", indent); - obj = NULL; - break; diff --git a/apcupsd-3.14.8-cxxld.patch b/apcupsd-3.14.8-cxxld.patch deleted file mode 100644 index ba13d62..0000000 --- a/apcupsd-3.14.8-cxxld.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up apcupsd-3.14.8/src/Makefile.cxxld apcupsd-3.14.8/src/Makefile ---- apcupsd-3.14.8/src/Makefile.cxxld 2009-09-30 01:20:45.000000000 +0200 -+++ apcupsd-3.14.8/src/Makefile 2010-09-22 11:18:03.550601657 +0200 -@@ -26,10 +26,10 @@ SRCS = $(common_srcs) $(apcupsd_srcs) $( - all-targets: apcupsd apcaccess apctest smtp - - apcupsd: $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS) -- $(LINK) $(DRVLIBS) -+ $(LINK) -lstdc++ $(DRVLIBS) - - apctest: $(common_obj) $(apctest_obj) $(APCDRVLIBS) $(APCLIBS) -- $(LINK) $(DRVLIBS) -+ $(LINK) -lstdc++ $(DRVLIBS) - - apcaccess: $(apcaccess_obj) $(APCLIBS) - $(LINK) diff --git a/apcupsd-aarch64.patch b/apcupsd-aarch64.patch deleted file mode 100644 index 7f4336f..0000000 --- a/apcupsd-aarch64.patch +++ /dev/null @@ -1,3083 +0,0 @@ -diff -urN apcupsd-3.14.10/autoconf/config.guess apcupsd-3.14.10-aarch64/autoconf/config.guess ---- apcupsd-3.14.10/autoconf/config.guess 2002-05-28 08:34:16.000000000 -0500 -+++ apcupsd-3.14.10-aarch64/autoconf/config.guess 2013-03-07 18:29:36.740840595 -0600 -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2001-07-12' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -16,23 +17,24 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Written by Per Bothner . --# Please send patches to . -+ -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -52,7 +54,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -65,11 +68,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -87,30 +90,42 @@ - exit 1 - fi - -+trap 'exit 1' 1 2 15 - --dummy=dummy-$$ --trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -+# compiler to aid in system detection is discouraged as it requires -+# temporary files to be created and, as you can see below, it is a -+# headache to deal with in a portable fashion. - --# CC_FOR_BUILD -- compiler used by this script. - # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still - # use `HOST_CC' if defined, but it is deprecated. - --set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in -- ,,) echo "int dummy(){}" > $dummy.c ; -- for c in cc gcc c89 ; do -- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; -- if test $? = 0 ; then -+# Portable tmp directory creation inspired by the Autoconf team. -+ -+set_cc_for_build=' -+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -+: ${TMPDIR=/tmp} ; -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || -+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -+dummy=$tmp/dummy ; -+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -+case $CC_FOR_BUILD,$HOST_CC,$CC in -+ ,,) echo "int x;" > $dummy.c ; -+ for c in cc gcc c89 c99 ; do -+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; -- rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -127,32 +142,34 @@ - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) -- # Netbsd (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # NetBSD (nbsd) targets should (where applicable) match one or -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. -- # Determine the machine/vendor (is the vendor relevant). -- case "${UNAME_MACHINE}" in -- amiga) machine=m68k-unknown ;; -- arm32) machine=arm-unknown ;; -- atari*) machine=m68k-atari ;; -- sun3*) machine=m68k-sun ;; -- mac68k) machine=m68k-apple ;; -- macppc) machine=powerpc-apple ;; -- hp3[0-9][05]) machine=m68k-hp ;; -- ibmrt|romp-ibm) machine=romp-ibm ;; -- *) machine=${UNAME_MACHINE}-unknown ;; -+ # -+ # Note: NetBSD doesn't particularly care about the vendor -+ # portion of the name. We always set it to "unknown". -+ sysctl="sysctl -n hw.machine_arch" -+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ -+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` -+ case "${UNAME_MACHINE_ARCH}" in -+ armeb) machine=armeb-unknown ;; -+ arm*) machine=arm-unknown ;; -+ sh3el) machine=shl-unknown ;; -+ sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; -+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. -- case "${UNAME_MACHINE}" in -- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) -+ case "${UNAME_MACHINE_ARCH}" in -+ arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -162,121 +179,139 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ # Debian GNU/NetBSD machines have a different userland, and -+ # thus, need a distinct triplet. However, they do not need -+ # kernel version information, so it can be replaced with a -+ # suitable tag, in the style of linux-gnu. -+ case "${UNAME_VERSION}" in -+ Debian*) -+ release='-gnu' -+ ;; -+ *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ ;; -+ esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -+ exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; -+ *:OpenBSD:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac -+ # According to Compaq, /usr/sbin/psrinfo has been available on -+ # OSF/1 and Tru64 systems produced since 1995. I hope that -+ # covers most systems running today. This code pipes the CPU -+ # types through head -n 1, so we only detect the type of CPU 0. -+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` -+ case "$ALPHA_CPU_TYPE" in -+ "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; -+ "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; -+ "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; -+ "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; -+ "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; -+ "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; -+ "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; -+ "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; -+ "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; -+ "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; -+ esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- cat <$dummy.s -- .data --\$Lformat: -- .byte 37,100,45,37,120,10,0 # "%d-%x\n" -- -- .text -- .globl main -- .align 4 -- .ent main --main: -- .frame \$30,16,\$26,0 -- ldgp \$29,0(\$27) -- .prologue 1 -- .long 0x47e03d80 # implver \$0 -- lda \$2,-1 -- .long 0x47e20c21 # amask \$2,\$1 -- lda \$16,\$Lformat -- mov \$0,\$17 -- not \$1,\$18 -- jsr \$26,printf -- ldgp \$29,0(\$26) -- mov 0,\$16 -- jsr \$26,exit -- .end main --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null -- if test "$?" = 0 ; then -- case `./$dummy` in -- 0-0) -- UNAME_MACHINE="alpha" -- ;; -- 1-0) -- UNAME_MACHINE="alphaev5" -- ;; -- 1-1) -- UNAME_MACHINE="alphaev56" -- ;; -- 1-101) -- UNAME_MACHINE="alphapca56" -- ;; -- 2-303) -- UNAME_MACHINE="alphaev6" -- ;; -- 2-307) -- UNAME_MACHINE="alphaev67" -- ;; -- esac -- fi -- rm -f $dummy.s $dummy -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -- arc64:OpenBSD:*:*) -- echo mips64el-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hkmips:OpenBSD:*:*) -- echo mips-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mips-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:[Mm]orph[Oo][Ss]:*:*) -+ echo ${UNAME_MACHINE}-unknown-morphos -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm*:riscos:*:*|arm*:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -284,25 +319,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -+ case `/usr/bin/uname -p` in -+ sparc) echo sparc-icl-nx7; exit ;; -+ esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -311,12 +372,12 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) -- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` -+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) -@@ -326,13 +387,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -- atari*:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -342,51 +400,43 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -- sun3*:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) -+ eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __cplusplus - #include /* for printf() prototype */ -@@ -408,31 +458,36 @@ - exit (-1); - } - EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy \ -- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; -+ Motorola:*:4.3:PL8-*) -+ echo powerpc-harris-powermax -+ exit ;; -+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) -+ echo powerpc-harris-powermax -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -445,29 +500,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -475,9 +530,10 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then -+ eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - -@@ -489,18 +545,20 @@ - exit(0); - } - EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` -+ exit ;; -+ *:AIX:*:[4567]) -+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else -@@ -512,97 +570,116 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) -- case "${HPUX_REV}" in -- 11.[0-9][0-9]) -- if [ -x /usr/bin/getconf ]; then -- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -- esac ;; -- esac -- fi ;; -- esac -- if [ "${HP_ARCH}" = "" ]; then -- sed 's/^ //' << EOF >$dummy.c -- -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ if [ -x /usr/bin/getconf ]; then -+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; -+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -+ esac ;; -+ esac -+ fi -+ if [ "${HP_ARCH}" = "" ]; then -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF -- eval $set_cc_for_build -- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` -- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi -- rm -f $dummy.c $dummy -- fi ;; -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ test -z "$HP_ARCH" && HP_ARCH=hppa -+ fi ;; - esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] -+ then -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ -+ then -+ HP_ARCH="hppa2.0w" -+ else -+ HP_ARCH="hppa64" -+ fi -+ fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) -+ eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int -@@ -628,156 +705,176 @@ - exit (0); - } - EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -- hppa*:OpenBSD:*:*) -- echo hppa-unknown-openbsd -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -- CRAY*X-MP:*:*:*) -- echo xmp-cray-unicos -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY*T3D:*:*:*) -- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY-2:*:*:*) -- echo cray2-cray-unicos -- exit 0 ;; -+ exit ;; -+ *:UNICOS/mp:*:*) -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -- *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -- exit 0 ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; -+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -+ echo i${UNAME_MACHINE}-pc-mks -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? -- echo i386-pc-interix -- exit 0 ;; -+ echo i586-pc-interix -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -- arm*:Linux:*:*) -+ exit ;; -+ aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux -- exit 0 ;; -- m68*:Linux:*:*) -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in -- big) echo mips-unknown-linux-gnu && exit 0 ;; -- little) echo mipsel-unknown-linux-gnu && exit 0 ;; -- esac -- ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -786,12 +883,91 @@ - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev67 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ exit ;; -+ arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ cris:Linux:*:*) -+ echo ${UNAME_MACHINE}-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo ${UNAME_MACHINE}-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; -+ ia64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m68*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=${UNAME_MACHINE}el -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=${UNAME_MACHINE} -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ or32:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -799,92 +975,71 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- ld_supported_targets=`cd /; ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- cat >$dummy.c < --#ifdef __cplusplus --#include /* for printf() prototype */ -- int main (int argc, char *argv[]) { --#else -- int main (argc, argv) int argc; char *argv[]; { --#endif --#ifdef __ELF__ --# ifdef __GLIBC__ --# if __GLIBC__ >= 2 -- printf ("%s-pc-linux-gnu\n", argv[1]); --# else -- printf ("%s-pc-linux-gnulibc1\n", argv[1]); --# endif --# else -- printf ("%s-pc-linux-gnulibc1\n", argv[1]); --# endif --#else -- printf ("%s-pc-linux-gnuaout\n", argv[1]); --#endif -- return 0; --} --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; -+ i*86:OS/2:*:*) -+ # If we were able to find `uname', then EMX Unix compatibility -+ # is probably installed. -+ echo ${UNAME_MACHINE}-pc-os2-emx -+ exit ;; -+ i*86:XTS-300:*:STOP) -+ echo ${UNAME_MACHINE}-unknown-stop -+ exit ;; -+ i*86:atheos:*:*) -+ echo ${UNAME_MACHINE}-unknown-atheos -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) -+ echo i386-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ i*86:*DOS:*:*) -+ echo ${UNAME_MACHINE}-pc-msdosdjgpp -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -892,99 +1047,113 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` -- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ -+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -- i*86:*DOS:*:*) -- echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit 0 ;; -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) -+ exit ;; -+ mc68k:UNIX:SYSTEM5:3.51m) -+ echo m68k-convergent-sysv -+ exit ;; -+ M680?0:D-NIX:5.3:*) -+ echo m68k-diab-dnix -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -- echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -992,78 +1161,126 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; -+ *:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo hppa1.1-stratus-vos -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-6:SUPER-UX:*:*) -+ echo sx6-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- echo `uname -p`-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac -+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -- if test "${UNAME_MACHINE}" = "x86pc"; then -+ UNAME_PROCESSOR=`uname -p` -+ if test "$UNAME_PROCESSOR" = "x86"; then -+ UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi -- echo `uname -p`-${UNAME_MACHINE}-nto-qnx -- exit 0 ;; -+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[KW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1074,35 +1291,56 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -- i*86:OS/2:*:*) -- # If we were able to find `uname', then EMX Unix compatibility -- # is probably installed. -- echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- -+eval $set_cc_for_build - cat >$dummy.c < -@@ -1119,16 +1357,16 @@ - #include - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1217,13 +1455,12 @@ - } - EOF - --eval $set_cc_for_build --$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 --rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1232,22 +1469,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1258,7 +1495,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -diff -urN apcupsd-3.14.10/autoconf/config.sub apcupsd-3.14.10-aarch64/autoconf/config.sub ---- apcupsd-3.14.10/autoconf/config.sub 2002-05-28 08:34:17.000000000 -0500 -+++ apcupsd-3.14.10-aarch64/autoconf/config.sub 2013-03-07 18:29:36.787835162 -0600 -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --# Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2001-06-08' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -20,22 +21,25 @@ - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# along with this program; if not, see . -+# - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Please send patches to . -+ -+# Please send patches to . Submit a context -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -69,7 +73,8 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -82,11 +87,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -98,7 +103,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -117,10 +122,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -143,10 +156,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -161,13 +177,17 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -184,6 +204,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -201,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -223,35 +253,105 @@ - case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. -- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ -- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ -- | pyramid | mn10200 | mn10300 | tron | a29k \ -- | 580 | i960 | h8300 \ -- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ -- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ -- | hppa64 \ -- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ -- | alphaev6[78] \ -- | we32k | ns16k | clipper | i370 | sh | sh[34] \ -- | powerpc | powerpcle \ -- | 1750a | dsp16xx | pdp10 | pdp11 \ -- | mips16 | mips64 | mipsel | mips64el \ -- | mips64orion | mips64orionel | mipstx39 | mipstx39el \ -- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ -- | mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \ -- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ -- | v850 | c4x \ -- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ -- | pj | pjl | h8500 | z8k) -+ 1750a | 580 \ -+ | a29k \ -+ | aarch64 | aarch64_be \ -+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ -+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ -+ | bfin \ -+ | c4x | clipper \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ -+ | fido | fr30 | frv \ -+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ -+ | i370 | i860 | i960 | ia64 \ -+ | ip2k | iq2000 \ -+ | le32 | le64 \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64el \ -+ | mips64octeon | mips64octeonel \ -+ | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipstx39 | mipstx39el \ -+ | mn10200 | mn10300 \ -+ | moxie \ -+ | mt \ -+ | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nios | nios2 \ -+ | ns16k | ns32k \ -+ | open8 \ -+ | or32 \ -+ | pdp10 | pdp11 | pj | pjl \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ -+ | pyramid \ -+ | rl78 | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh64 | sh64le \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | ubicom32 \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -+ | we32k \ -+ | x86 | xc16x | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; -+ -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -265,31 +365,83 @@ - exit 1 - ;; - # Recognize the basic CPU types with company name. -- # FIXME: clean up the formatting here. -- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ -- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ -- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ -- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ -- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ -- | xmp-* | ymp-* \ -- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ -- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ -- | hppa2.0n-* | hppa64-* \ -- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ -- | alphaev6[78]-* \ -- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ -- | clipper-* | orion-* \ -- | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \ -- | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ -- | mips16-* | mips64-* | mipsel-* \ -- | mips64el-* | mips64orion-* | mips64orionel-* \ -- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ -- | mipstx39-* | mipstx39el-* | mcore-* \ -- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ -- | [cjt]90-* \ -- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ -- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ -- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) -+ 580-* \ -+ | a29k-* \ -+ | aarch64-* | aarch64_be-* \ -+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ -+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | avr-* | avr32-* \ -+ | be32-* | be64-* \ -+ | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | clipper-* | craynv-* | cydra-* \ -+ | d10v-* | d30v-* | dlx-* \ -+ | elxsi-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ -+ | h8300-* | h8500-* \ -+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ -+ | i*86-* | i860-* | i960-* | ia64-* \ -+ | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ -+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -+ | mips16-* \ -+ | mips64-* | mips64el-* \ -+ | mips64octeon-* | mips64octeonel-* \ -+ | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ -+ | mips64vr4100-* | mips64vr4100el-* \ -+ | mips64vr4300-* | mips64vr4300el-* \ -+ | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ -+ | mipsisa32-* | mipsisa32el-* \ -+ | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64sb1-* | mipsisa64sb1el-* \ -+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ -+ | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ -+ | nios-* | nios2-* \ -+ | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ -+ | orion-* \ -+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -+ | pyramid-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ -+ | sparclite-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ -+ | tron-* \ -+ | ubicom32-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ -+ | we32k-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ -+ | xstormy16-* | xtensa*-* \ -+ | ymp-* \ -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -307,6 +459,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -321,6 +476,12 @@ - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -344,6 +505,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -352,6 +517,35 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c90) -+ basic_machine=c90-cray -+ os=-unicos -+ ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -372,30 +566,45 @@ - basic_machine=c38-convex - os=-bsd - ;; -- cray | ymp) -- basic_machine=ymp-cray -+ cray | j90) -+ basic_machine=j90-cray - os=-unicos - ;; -- cray2) -- basic_machine=cray2-cray -- os=-unicos -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp - ;; -- [cjt]90) -- basic_machine=${basic_machine}-cray -- os=-unicos -+ cr16 | cr16-*) -+ basic_machine=cr16-unknown -+ os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; -+ decsystem10* | dec10*) -+ basic_machine=pdp10-dec -+ os=-tops10 -+ ;; -+ decsystem20* | dec20*) -+ basic_machine=pdp10-dec -+ os=-tops20 -+ ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola -@@ -404,6 +613,14 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -515,7 +732,6 @@ - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -554,6 +770,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -565,10 +789,21 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze*) -+ basic_machine=microblaze-xilinx -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -576,36 +811,39 @@ - basic_machine=m68k-atari - os=-mint - ;; -- mipsel*-linux*) -- basic_machine=mipsel-unknown -- os=-linux-gnu -- ;; -- mips*-linux*) -- basic_machine=mips-unknown -- os=-linux-gnu -- ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; -+ morphos) -+ basic_machine=powerpc-unknown -+ os=-morphos -+ ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -670,6 +908,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -677,6 +921,13 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -+ openrisc | openrisc-*) -+ basic_machine=or32-unknown -+ ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -693,48 +944,79 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; -- pc532 | pc532-*) -+ pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -- pentium | p5 | k5 | k6 | nexgen) -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -- pentiumpro | p6 | 6x86 | athlon) -+ pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -- pentium-* | p5-* | k5-* | k6-* | nexgen-*) -+ pentium4) -+ basic_machine=i786-pc -+ ;; -+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -- ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc | ppcbe) basic_machine=powerpc-unknown -+ ;; -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -- ;; -+ ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ ppc64) basic_machine=powerpc64-unknown -+ ;; -+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ ppc64le | powerpc64little | ppc64-le | powerpc64-little) -+ basic_machine=powerpc64le-unknown -+ ;; -+ ppc64le-* | powerpc64little-*) -+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - ps2) - basic_machine=i386-ibm - ;; -@@ -742,6 +1024,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -752,10 +1038,30 @@ - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; -+ s390 | s390-*) -+ basic_machine=s390-ibm -+ ;; -+ s390x | s390x-*) -+ basic_machine=s390x-ibm -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; -+ sb1) -+ basic_machine=mipsisa64sb1-unknown -+ ;; -+ sb1el) -+ basic_machine=mipsisa64sb1el-unknown -+ ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -763,7 +1069,13 @@ - basic_machine=sh-hitachi - os=-hms - ;; -- sparclite-wrs) -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; -+ sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; -@@ -781,6 +1093,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -830,12 +1145,16 @@ - os=-dynix - ;; - t3e) -- basic_machine=t3e-cray -+ basic_machine=alphaev5-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -+ t90) -+ basic_machine=t90-cray -+ os=-unicos -+ ;; -+ tile*) -+ basic_machine=$basic_machine-unknown -+ os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown -@@ -843,9 +1162,17 @@ - tx39el) - basic_machine=mipstx39el-unknown - ;; -+ toad1) -+ basic_machine=pdp10-xkl -+ os=-tops20 -+ ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -867,8 +1194,8 @@ - os=-vms - ;; - vpp*|vx|vx-*) -- basic_machine=f301-fujitsu -- ;; -+ basic_machine=f301-fujitsu -+ ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks -@@ -889,21 +1216,28 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- windows32) -- basic_machine=i386-pc -- os=-windows32-msvcrt -- ;; -- xmp) -- basic_machine=xmp-cray -- os=-unicos -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 - ;; -- xps | xps100) -+ xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; -+ ymp) -+ basic_machine=ymp-cray -+ os=-unicos -+ ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -920,16 +1254,12 @@ - op60c) - basic_machine=hppa1.1-oki - ;; -- mips) -- if [ x$os = x-linux-gnu ]; then -- basic_machine=mips-unknown -- else -- basic_machine=mips-mips -- fi -- ;; - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -946,13 +1276,13 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; -- cydra) -+ cydra) - basic_machine=cydra-cydrome - ;; - orion) -@@ -967,10 +1297,6 @@ - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; -- c4x*) -- basic_machine=c4x-none -- os=-coff -- ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; -@@ -997,9 +1323,12 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1020,22 +1349,31 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) -+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ -+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ -+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1047,16 +1385,21 @@ - ;; - esac - ;; -+ -nto-qnx*) -+ ;; - -nto*) -- os=-nto-qnx -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1069,6 +1412,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1087,14 +1433,23 @@ - -acis*) - os=-aos - ;; -+ -atheos*) -+ os=-atheos -+ ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; -+ -nova*) -+ os=-rtmk-nova -+ ;; - -ns2 ) -- os=-nextstep2 -+ os=-nextstep2 - ;; - -nsk*) - os=-nsk -@@ -1106,6 +1461,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1133,8 +1491,22 @@ - -xenix) - os=-xenix - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -- os=-mint -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint -+ ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) - ;; - -none) - ;; -@@ -1158,6 +1530,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1167,10 +1545,26 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff -+ ;; -+ # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; -- pdp11-*) -+ pdp11-*) - os=-none - ;; - *-dec | vax-*) -@@ -1184,19 +1578,22 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; -+ or32-*) -+ os=-coff -+ ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; -@@ -1206,9 +1603,15 @@ - *-be) - os=-beos - ;; -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) - os=-aix - ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1260,19 +1663,19 @@ - *-next) - os=-nextstep3 - ;; -- *-gould) -+ *-gould) - os=-sysv - ;; -- *-highlevel) -+ *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; -- *-sgi) -+ *-sgi) - os=-irix - ;; -- *-siemens) -+ *-siemens) - os=-sysv4 - ;; - *-masscomp) -@@ -1311,7 +1714,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) -@@ -1341,10 +1744,16 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -- -vxsim* | -vxworks*) -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) -@@ -1359,13 +1768,16 @@ - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; -+ -vos*) -+ vendor=stratus -+ ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/apcupsd.spec b/apcupsd.spec index cf1d28f..eee9b33 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.12 -Release: 3%{?dist} +Version: 3.14.13 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -12,16 +12,11 @@ Source2: apcupsd-httpd.conf Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch -#fix FTBFS, c++ linking needs -lstdc++ explicitly -Patch2: apcupsd-3.14.8-cxxld.patch - # systemd support Patch3: apcupsd-3.14.8-systemd.patch # fix crash in gui, rhbz#578276 Patch4: apcupsd-3.14.9-fixgui.patch -Patch5: apcupsd-aarch64.patch -Patch6: apcupsd-3.14.10-nodbg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,11 +63,8 @@ A GUI interface to the APC UPS monitoring daemon. %setup -q %patch0 -p1 -b .init %patch1 -p1 -b .shutdown -%patch2 -p1 -b .cxxld %patch3 -p1 -b .systemd %patch4 -p1 -b .fixgui -%patch5 -p1 -b .aarch64 -%patch6 -p1 -b .nodbg #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -191,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 03 2015 Michal Hlavinka - 3.14.13-1 +- apcupsd updated to 3.14.13 + * Fri Aug 15 2014 Fedora Release Engineering - 3.14.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 5523e69..290d693 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08bf201acea6b4dd69cf2fb0eecfd55e apcupsd-3.14.12.tar.gz +c291d9d3923b4d9c0e600b755ad4f489 apcupsd-3.14.13.tar.gz From 2a688e34434cf9aad85d2d5d9eade1d364f53ed0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 12:32:54 +0200 Subject: [PATCH 080/139] Rebuilt for GCC 5 C++11 ABI change --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index eee9b33..d4031e1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 02 2015 Kalev Lember - 3.14.13-2 +- Rebuilt for GCC 5 C++11 ABI change + * Tue Feb 03 2015 Michal Hlavinka - 3.14.13-1 - apcupsd updated to 3.14.13 From 22f78654d1680207d49fee303e3669de3335361a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 00:08:26 +0000 Subject: [PATCH 081/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index d4031e1..1fca5dd 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.14.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 3.14.13-2 - Rebuilt for GCC 5 C++11 ABI change From cdb9d3955263e93bec5a99072fb52918ab9712e2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 28 Oct 2015 15:05:16 -0400 Subject: [PATCH 082/139] Remove a pointless mkdir from %install --- apcupsd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1fca5dd..10c6299 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -100,7 +100,6 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd make DESTDIR=$RPM_BUILD_ROOT install From 0210417761a5778e0b0981b804c321b76f4d7928 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 23 Nov 2015 14:16:59 +0100 Subject: [PATCH 083/139] fix apcaccess crash if apcupsd is not running (#1236367,#1197383) - enabled modbus-usb (#1195071) - add bigger icon (#1157532) --- apcupsd-3.14.13-netopenfix.patch | 63 ++++++++++++++++++++++++++++++++ apcupsd.spec | 18 +++++++-- apcupsd64x64.png | 0 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 apcupsd-3.14.13-netopenfix.patch create mode 100644 apcupsd64x64.png diff --git a/apcupsd-3.14.13-netopenfix.patch b/apcupsd-3.14.13-netopenfix.patch new file mode 100644 index 0000000..face793 --- /dev/null +++ b/apcupsd-3.14.13-netopenfix.patch @@ -0,0 +1,63 @@ +diff -up apcupsd-3.14.13/src/apcaccess.c.netopenfix apcupsd-3.14.13/src/apcaccess.c +--- apcupsd-3.14.13/src/apcaccess.c.netopenfix 2015-11-23 13:03:18.960051659 +0100 ++++ apcupsd-3.14.13/src/apcaccess.c 2015-11-23 13:07:37.225759158 +0100 +@@ -49,7 +49,7 @@ static int do_pthreads_status(const char + char recvline[MAXSTRING + 1]; + char *line; + +- if ((sockfd = net_open(host, NULL, port)) == INVALID_SOCKET) { ++ if ((sockfd = net_open(host, NULL, port)) < 0) { + fprintf(stderr, "Error contacting apcupsd @ %s:%d: %s\n", + host, port, strerror(-sockfd)); + return 1; +diff -up apcupsd-3.14.13/src/cgi/upsfetch.c.netopenfix apcupsd-3.14.13/src/cgi/upsfetch.c +--- apcupsd-3.14.13/src/cgi/upsfetch.c.netopenfix 2015-11-23 13:09:20.108837721 +0100 ++++ apcupsd-3.14.13/src/cgi/upsfetch.c 2015-11-23 13:09:20.153838193 +0100 +@@ -114,7 +114,7 @@ static int fetch_data(const char *host) + *p++ = '\0'; + nis_port = atoi(p); + } +- if ((sockfd = net_open(lhost, NULL, nis_port)) == INVALID_SOCKET) { ++ if ((sockfd = net_open(lhost, NULL, nis_port)) < 0) { + (void) snprintf(errmsg, sizeof (errmsg), + "upsfetch: tcp_open failed for %s port %d", lhost, nis_port); + return 0; +@@ -153,7 +153,7 @@ int fetch_events(const char *host) + *p++ = '\0'; + nis_port = atoi(p); + } +- if ((sockfd = net_open(lhost, NULL, nis_port)) == INVALID_SOCKET) { ++ if ((sockfd = net_open(lhost, NULL, nis_port)) < 0) { + snprintf(errmsg, sizeof(errmsg), + "upsfetch: tcp_open failed for %s port %d", lhost, nis_port); + fputs(errmsg, stdout); +diff -up apcupsd-3.14.13/src/drivers/net/net.c.netopenfix apcupsd-3.14.13/src/drivers/net/net.c +--- apcupsd-3.14.13/src/drivers/net/net.c.netopenfix 2015-11-23 13:09:33.997983325 +0100 ++++ apcupsd-3.14.13/src/drivers/net/net.c 2015-11-23 13:09:34.041983787 +0100 +@@ -202,7 +202,7 @@ bool NetUpsDriver::poll_ups() + _statlen = 0; + + Dmsg(20, "Opening connection to %s:%d\n", _hostname, _port); +- if ((_sockfd = net_open(_hostname, NULL, _port)) == INVALID_SOCKET) { ++ if ((_sockfd = net_open(_hostname, NULL, _port)) < 0) { + Dmsg(90, "Exit poll_ups 0 comm lost\n"); + if (!_ups->is_commlost()) { + _ups->set_commlost(); +diff -up apcupsd-3.14.13/src/lib/statmgr.cpp.netopenfix apcupsd-3.14.13/src/lib/statmgr.cpp +--- apcupsd-3.14.13/src/lib/statmgr.cpp.netopenfix 2015-11-23 13:08:48.076501913 +0100 ++++ apcupsd-3.14.13/src/lib/statmgr.cpp 2015-11-23 13:08:48.105502218 +0100 +@@ -199,12 +199,12 @@ bool StatMgr::open() + close(); + + m_socket = net_open(m_host, NULL, m_port); +- return m_socket != INVALID_SOCKET; ++ return m_socket >= 0; + } + + void StatMgr::close() + { +- if (m_socket != INVALID_SOCKET) { ++ if (m_socket != INVALID_SOCKET && m_socket >= 0) { + net_close(m_socket); + m_socket = INVALID_SOCKET; + } diff --git a/apcupsd.spec b/apcupsd.spec index 10c6299..cc571a5 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,6 +9,7 @@ URL: http://www.apcupsd.com Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf +Source3: apcupsd64x64.png Patch0: apcupsd-3.14.3-init.patch Patch1: apcupsd-3.14.4-shutdown.patch @@ -17,11 +18,12 @@ Patch3: apcupsd-3.14.8-systemd.patch # fix crash in gui, rhbz#578276 Patch4: apcupsd-3.14.9-fixgui.patch +Patch5: apcupsd-3.14.13-netopenfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 -BuildRequires: net-snmp-devel, tcp_wrappers-devel +BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): systemd-units @@ -65,6 +67,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch1 -p1 -b .shutdown %patch3 -p1 -b .systemd %patch4 -p1 -b .fixgui +%patch5 -p1 -b .netopenfix #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -85,8 +88,7 @@ export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" --enable-net-snmp \ --enable-snmp \ --enable-usb \ - --enable-powerflute \ - --enable-nls \ + --enable-modbus-usb \ --enable-gapcmon \ --enable-pcnet \ --with-libwrap=%{_libdir} \ @@ -115,12 +117,14 @@ install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf +install -D -m0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/apcupsd64x64.png desktop-file-install \ %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) --vendor="fedora" \ %endif --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --set-icon=apcupsd64x64 \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop @@ -164,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gapcmon %{_datadir}/applications/*gapcmon.desktop %{_datadir}/pixmaps/apcupsd.png +%{_datadir}/pixmaps/apcupsd64x64.png %{_datadir}/pixmaps/charging.png %{_datadir}/pixmaps/gapc_prefs.png %{_datadir}/pixmaps/onbatt.png @@ -182,6 +187,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 23 2015 Michal Hlavinka - 3.14.13-4 +- fix apcaccess crash if apcupsd is not running (#1236367,#1197383) +- enabled modbus-usb (#1195071) +- add bigger icon (#1157532) + * Wed Jun 17 2015 Fedora Release Engineering - 3.14.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/apcupsd64x64.png b/apcupsd64x64.png new file mode 100644 index 0000000..e69de29 From 8068c0a883c69bd0abd3a68947365000cd084a42 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:21:29 +0000 Subject: [PATCH 084/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index cc571a5..800526f 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.14.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Nov 23 2015 Michal Hlavinka - 3.14.13-4 - fix apcaccess crash if apcupsd is not running (#1236367,#1197383) - enabled modbus-usb (#1195071) From 2cd7508e7c583987af869257a97234f352f15599 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 2 Jun 2016 13:39:19 +0200 Subject: [PATCH 085/139] updated to 3.14.14 --- .gitignore | 1 + apcupsd-3.14.13-netopenfix.patch | 63 -------------------------------- apcupsd.spec | 13 ++++--- sources | 2 +- 4 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 apcupsd-3.14.13-netopenfix.patch diff --git a/.gitignore b/.gitignore index 039fa15..830429c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ apcupsd-3.14.8.tar.gz /apcupsd-3.14.11.tar.gz /apcupsd-3.14.12.tar.gz /apcupsd-3.14.13.tar.gz +/apcupsd-3.14.14.tar.gz diff --git a/apcupsd-3.14.13-netopenfix.patch b/apcupsd-3.14.13-netopenfix.patch deleted file mode 100644 index face793..0000000 --- a/apcupsd-3.14.13-netopenfix.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up apcupsd-3.14.13/src/apcaccess.c.netopenfix apcupsd-3.14.13/src/apcaccess.c ---- apcupsd-3.14.13/src/apcaccess.c.netopenfix 2015-11-23 13:03:18.960051659 +0100 -+++ apcupsd-3.14.13/src/apcaccess.c 2015-11-23 13:07:37.225759158 +0100 -@@ -49,7 +49,7 @@ static int do_pthreads_status(const char - char recvline[MAXSTRING + 1]; - char *line; - -- if ((sockfd = net_open(host, NULL, port)) == INVALID_SOCKET) { -+ if ((sockfd = net_open(host, NULL, port)) < 0) { - fprintf(stderr, "Error contacting apcupsd @ %s:%d: %s\n", - host, port, strerror(-sockfd)); - return 1; -diff -up apcupsd-3.14.13/src/cgi/upsfetch.c.netopenfix apcupsd-3.14.13/src/cgi/upsfetch.c ---- apcupsd-3.14.13/src/cgi/upsfetch.c.netopenfix 2015-11-23 13:09:20.108837721 +0100 -+++ apcupsd-3.14.13/src/cgi/upsfetch.c 2015-11-23 13:09:20.153838193 +0100 -@@ -114,7 +114,7 @@ static int fetch_data(const char *host) - *p++ = '\0'; - nis_port = atoi(p); - } -- if ((sockfd = net_open(lhost, NULL, nis_port)) == INVALID_SOCKET) { -+ if ((sockfd = net_open(lhost, NULL, nis_port)) < 0) { - (void) snprintf(errmsg, sizeof (errmsg), - "upsfetch: tcp_open failed for %s port %d", lhost, nis_port); - return 0; -@@ -153,7 +153,7 @@ int fetch_events(const char *host) - *p++ = '\0'; - nis_port = atoi(p); - } -- if ((sockfd = net_open(lhost, NULL, nis_port)) == INVALID_SOCKET) { -+ if ((sockfd = net_open(lhost, NULL, nis_port)) < 0) { - snprintf(errmsg, sizeof(errmsg), - "upsfetch: tcp_open failed for %s port %d", lhost, nis_port); - fputs(errmsg, stdout); -diff -up apcupsd-3.14.13/src/drivers/net/net.c.netopenfix apcupsd-3.14.13/src/drivers/net/net.c ---- apcupsd-3.14.13/src/drivers/net/net.c.netopenfix 2015-11-23 13:09:33.997983325 +0100 -+++ apcupsd-3.14.13/src/drivers/net/net.c 2015-11-23 13:09:34.041983787 +0100 -@@ -202,7 +202,7 @@ bool NetUpsDriver::poll_ups() - _statlen = 0; - - Dmsg(20, "Opening connection to %s:%d\n", _hostname, _port); -- if ((_sockfd = net_open(_hostname, NULL, _port)) == INVALID_SOCKET) { -+ if ((_sockfd = net_open(_hostname, NULL, _port)) < 0) { - Dmsg(90, "Exit poll_ups 0 comm lost\n"); - if (!_ups->is_commlost()) { - _ups->set_commlost(); -diff -up apcupsd-3.14.13/src/lib/statmgr.cpp.netopenfix apcupsd-3.14.13/src/lib/statmgr.cpp ---- apcupsd-3.14.13/src/lib/statmgr.cpp.netopenfix 2015-11-23 13:08:48.076501913 +0100 -+++ apcupsd-3.14.13/src/lib/statmgr.cpp 2015-11-23 13:08:48.105502218 +0100 -@@ -199,12 +199,12 @@ bool StatMgr::open() - close(); - - m_socket = net_open(m_host, NULL, m_port); -- return m_socket != INVALID_SOCKET; -+ return m_socket >= 0; - } - - void StatMgr::close() - { -- if (m_socket != INVALID_SOCKET) { -+ if (m_socket != INVALID_SOCKET && m_socket >= 0) { - net_close(m_socket); - m_socket = INVALID_SOCKET; - } diff --git a/apcupsd.spec b/apcupsd.spec index 800526f..91e8ebb 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.13 -Release: 5%{?dist} +Version: 3.14.14 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -18,7 +18,6 @@ Patch3: apcupsd-3.14.8-systemd.patch # fix crash in gui, rhbz#578276 Patch4: apcupsd-3.14.9-fixgui.patch -Patch5: apcupsd-3.14.13-netopenfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -67,7 +66,6 @@ A GUI interface to the APC UPS monitoring daemon. %patch1 -p1 -b .shutdown %patch3 -p1 -b .systemd %patch4 -p1 -b .fixgui -%patch5 -p1 -b .netopenfix #we will handle fedora/redhat part ourselfs printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile @@ -75,7 +73,9 @@ printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile %build %global _hardened_build 1 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ -export CPPFLAGS="$CPPFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" +export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS -Wno-format-security -Wno-error=format-security" +export CXXFLAGS="$CPPFLAGS" +export CFLAGS="$CPPFLAGS" %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 02 2016 Michal Hlavinka - 3.14.14-1 +- updated to 3.14.14 + * Wed Feb 03 2016 Fedora Release Engineering - 3.14.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 290d693..4cc7ee2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c291d9d3923b4d9c0e600b755ad4f489 apcupsd-3.14.13.tar.gz +cc8f5ced77f38906a274787acb9bc980 apcupsd-3.14.14.tar.gz From f4021704e97cd242a4c42935d063756fd8aff2d2 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 22 Jun 2016 15:03:17 -0500 Subject: [PATCH 086/139] Spec cleanup. Add rpmlint.cf. --- apcupsd.spec | 125 ++++++++++++++++++++++----------------------------- rpmlint.cf | 3 ++ 2 files changed, 57 insertions(+), 71 deletions(-) create mode 100644 rpmlint.cf diff --git a/apcupsd.spec b/apcupsd.spec index 91e8ebb..145249d 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,12 +1,11 @@ Name: apcupsd Version: 3.14.14 -Release: 1%{?dist} -Summary: APC UPS Power Control Daemon for Linux +Release: 2%{?dist} +Summary: APC UPS Power Control Daemon -Group: System Environment/Daemons License: GPLv2 URL: http://www.apcupsd.com -Source0: http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz +Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Source3: apcupsd64x64.png @@ -19,9 +18,7 @@ Patch3: apcupsd-3.14.8-systemd.patch # fix crash in gui, rhbz#578276 Patch4: apcupsd-3.14.9-fixgui.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 +BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail @@ -44,7 +41,7 @@ Some features depend on what UPS model you have (simple or smart). %package cgi Summary: Web interface for apcupsd Group: Applications/Internet -Requires: %{name} = %{version}-%{release} +Requires: apcupsd = %version-%release Requires: httpd %description cgi @@ -54,20 +51,16 @@ A CGI interface to the APC UPS monitoring daemon. %package gui Summary: GUI interface for apcupsd Group: Applications/System -Requires: %{name} = %{version}-%{release} +Requires: apcupsd = %version-%release %description gui A GUI interface to the APC UPS monitoring daemon. %prep -%setup -q -%patch0 -p1 -b .init -%patch1 -p1 -b .shutdown -%patch3 -p1 -b .systemd -%patch4 -p1 -b .fixgui +%autosetup -p1 -#we will handle fedora/redhat part ourselfs +#we will handle fedora/redhat part ourselves printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile %build @@ -77,8 +70,8 @@ export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS -Wno-format-secu export CXXFLAGS="$CPPFLAGS" export CFLAGS="$CPPFLAGS" %configure \ - --sysconfdir="%{_sysconfdir}/apcupsd" \ - --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ + --sysconfdir="/etc/apcupsd" \ + --with-cgi-bin="/var/www/apcupsd" \ --sbindir=/sbin \ --enable-cgi \ --enable-pthreads \ @@ -97,83 +90,70 @@ export CFLAGS="$CPPFLAGS" --with-upscable=usb \ --with-lock-dir=/var/lock \ APCUPSD_MAIL=/bin/mail -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd - -make DESTDIR=$RPM_BUILD_ROOT install - +mkdir -p %buildroot/var/www/apcupsd +make DESTDIR=%buildroot install install -m744 platforms/apccontrol \ - $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol + %buildroot/etc/apcupsd/apccontrol # systemd support -install -p -D -m644 apcupsd.service $RPM_BUILD_ROOT/lib/systemd/system/apcupsd.service -install -p -D -m755 apcupsd_shutdown $RPM_BUILD_ROOT/lib/systemd/system-shutdown/apcupsd_shutdown +install -p -D -m644 apcupsd.service %buildroot/lib/systemd/system/apcupsd.service +install -p -D -m755 apcupsd_shutdown %buildroot/lib/systemd/system-shutdown/apcupsd_shutdown -install -d %{buildroot}%{_sysconfdir}/logrotate.d -install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -d %{buildroot}%{_sysconfdir}/httpd/conf.d -install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf -install -D -m0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/apcupsd64x64.png +install -d %buildroot/etc/logrotate.d +install -m0644 %SOURCE1 %buildroot/etc/logrotate.d/apcupsd +install -d %buildroot/etc/httpd/conf.d +install -m0644 %SOURCE2 %buildroot/etc/httpd/conf.d/apcupsd.conf +install -D -m0644 %SOURCE3 %buildroot/usr/share/pixmaps/apcupsd64x64.png desktop-file-install \ -%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) --vendor="fedora" \ -%endif - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir=%buildroot/usr/share/applications \ --set-icon=apcupsd64x64 \ --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop + %buildroot/usr/share/applications/gapcmon.desktop -# Cleanup for later %doc processing +# Cleanup for later %%doc processing chmod -x examples/*.c rm examples/*.in - -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc COPYING ChangeLog examples ReleaseNotes -%dir %{_sysconfdir}/apcupsd -/lib/systemd/system/%{name}.service +%license COPYING +%doc ChangeLog examples ReleaseNotes +%dir /etc/apcupsd +/lib/systemd/system/apcupsd.service /lib/systemd/system-shutdown/apcupsd_shutdown -%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf -%attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol -%config(noreplace) %{_sysconfdir}/apcupsd/changeme -%config(noreplace) %{_sysconfdir}/apcupsd/commfailure -%config(noreplace) %{_sysconfdir}/apcupsd/commok -%config(noreplace) %{_sysconfdir}/apcupsd/offbattery -%config(noreplace) %{_sysconfdir}/apcupsd/onbattery -%config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd -%{_datadir}/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi +%config(noreplace) /etc/apcupsd/apcupsd.conf +%attr(0755,root,root) /etc/apcupsd/apccontrol +%config(noreplace) /etc/apcupsd/changeme +%config(noreplace) /etc/apcupsd/commfailure +%config(noreplace) /etc/apcupsd/commok +%config(noreplace) /etc/apcupsd/offbattery +%config(noreplace) /etc/apcupsd/onbattery +%config(noreplace) /etc/logrotate.d/apcupsd +/usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi %attr(0755,root,root) /sbin/* %{_mandir}/*/* %files cgi -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css -%config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf -%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf -%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf -%{_localstatedir}/www/apcupsd/ +%config(noreplace) /etc/apcupsd/apcupsd.css +%config(noreplace) /etc/httpd/conf.d/apcupsd.conf +%config(noreplace) /etc/apcupsd/hosts.conf +%config(noreplace) /etc/apcupsd/multimon.conf +/var/www/apcupsd/ %files gui -%defattr(-,root,root,-) -%{_bindir}/gapcmon -%{_datadir}/applications/*gapcmon.desktop -%{_datadir}/pixmaps/apcupsd.png -%{_datadir}/pixmaps/apcupsd64x64.png -%{_datadir}/pixmaps/charging.png -%{_datadir}/pixmaps/gapc_prefs.png -%{_datadir}/pixmaps/onbatt.png -%{_datadir}/pixmaps/online.png -%{_datadir}/pixmaps/unplugged.png +/usr/bin/gapcmon +/usr/share/applications/*gapcmon.desktop +/usr/share/pixmaps/apcupsd.png +/usr/share/pixmaps/apcupsd64x64.png +/usr/share/pixmaps/charging.png +/usr/share/pixmaps/gapc_prefs.png +/usr/share/pixmaps/onbatt.png +/usr/share/pixmaps/online.png +/usr/share/pixmaps/unplugged.png %post @@ -187,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 22 2016 Jason L Tibbitts III - 3.14.14-2 +- Clean up the spec a bit. + * Thu Jun 02 2016 Michal Hlavinka - 3.14.14-1 - updated to 3.14.14 diff --git a/rpmlint.cf b/rpmlint.cf new file mode 100644 index 0000000..8f28374 --- /dev/null +++ b/rpmlint.cf @@ -0,0 +1,3 @@ +setOption('NetworkEnabled', False) +addFilter('hardcoded-library-path in %buildroot/lib/systemd') +addFilter('hardcoded-library-path in /lib/systemd') From e647d7917418993aa8b328883e39cd3eee66a6fb Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 22 Jun 2016 19:14:41 -0500 Subject: [PATCH 087/139] More spec cleanups. --- apcupsd-3.14.4-shutdown.patch | 12 -------- apcupsd-3.14.8-systemd.patch | 28 ------------------ apcupsd.service | 11 +++++++ apcupsd.spec | 56 +++++++++++++++++++---------------- apcupsd_shutdown | 9 ++++++ 5 files changed, 50 insertions(+), 66 deletions(-) delete mode 100644 apcupsd-3.14.4-shutdown.patch delete mode 100644 apcupsd-3.14.8-systemd.patch create mode 100644 apcupsd.service create mode 100644 apcupsd_shutdown diff --git a/apcupsd-3.14.4-shutdown.patch b/apcupsd-3.14.4-shutdown.patch deleted file mode 100644 index 00651b5..0000000 --- a/apcupsd-3.14.4-shutdown.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up apcupsd-3.14.4/platforms/apccontrol.in.shutdown apcupsd-3.14.4/platforms/apccontrol.in ---- apcupsd-3.14.4/platforms/apccontrol.in.shutdown 2008-05-28 09:15:47.000000000 +0200 -+++ apcupsd-3.14.4/platforms/apccontrol.in 2008-05-28 09:16:04.000000000 +0200 -@@ -104,7 +104,7 @@ case "$1" in - ;; - doshutdown) - echo "UPS ${2} initiated Shutdown Sequence" | ${WALL} -- ${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown" -+ ${SHUTDOWN} -h -H now "apcupsd UPS ${2} initiated shutdown" - ;; - annoyme) - echo "Power problems with UPS ${2}. Please logoff." | ${WALL} diff --git a/apcupsd-3.14.8-systemd.patch b/apcupsd-3.14.8-systemd.patch deleted file mode 100644 index b0a24cb..0000000 --- a/apcupsd-3.14.8-systemd.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up apcupsd-3.14.8/apcupsd.service.systemd apcupsd-3.14.8/apcupsd.service ---- apcupsd-3.14.8/apcupsd.service.systemd 2011-06-16 10:33:02.335889489 +0200 -+++ apcupsd-3.14.8/apcupsd.service 2011-06-16 09:59:02.616138047 +0200 -@@ -0,0 +1,11 @@ -+[Unit] -+Description=APC UPS Power Control Daemon for Linux -+After=syslog.target -+After=network.target -+ -+[Service] -+ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail -+ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf -+ -+[Install] -+WantedBy=multi-user.target -diff -up apcupsd-3.14.8/apcupsd_shutdown.systemd apcupsd-3.14.8/apcupsd_shutdown ---- apcupsd-3.14.8/apcupsd_shutdown.systemd 2011-06-16 10:33:08.831934420 +0200 -+++ apcupsd-3.14.8/apcupsd_shutdown 2011-06-16 10:10:20.948796784 +0200 -@@ -0,0 +1,9 @@ -+#!/bin/sh -+ -+# See if this is a powerfail situation. -+if [ -f /etc/apcupsd/powerfail ]; then -+ echo -+ echo "APCUPSD will now power off the UPS" -+ echo -+ /etc/apcupsd/apccontrol killpower -+fi diff --git a/apcupsd.service b/apcupsd.service new file mode 100644 index 0000000..fb50d9d --- /dev/null +++ b/apcupsd.service @@ -0,0 +1,11 @@ +[Unit] +Description=APC UPS Power Control Daemon for Linux +After=syslog.target +After=network-online.target + +[Service] +ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail +ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf + +[Install] +WantedBy=multi-user.target diff --git a/apcupsd.spec b/apcupsd.spec index 145249d..91cb152 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,22 +1,19 @@ -Name: apcupsd -Version: 3.14.14 -Release: 2%{?dist} -Summary: APC UPS Power Control Daemon +Name: apcupsd +Version: 3.14.14 +Release: 2%{?dist} +Summary: APC UPS Power Control Daemon -License: GPLv2 -URL: http://www.apcupsd.com -Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz -Source1: apcupsd.logrotate -Source2: apcupsd-httpd.conf -Source3: apcupsd64x64.png -Patch0: apcupsd-3.14.3-init.patch -Patch1: apcupsd-3.14.4-shutdown.patch - -# systemd support -Patch3: apcupsd-3.14.8-systemd.patch +License: GPLv2 +URL: http://www.apcupsd.com +Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz +Source1: apcupsd.service +Source2: apcupsd_shutdown +Source3: apcupsd-httpd.conf +Source4: apcupsd.logrotate +Source5: apcupsd64x64.png # fix crash in gui, rhbz#578276 -Patch4: apcupsd-3.14.9-fixgui.patch +Patch0: apcupsd-3.14.9-fixgui.patch BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel @@ -60,8 +57,8 @@ A GUI interface to the APC UPS monitoring daemon. %prep %autosetup -p1 -#we will handle fedora/redhat part ourselves -printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile +# Override the provided platform makefile +printf 'install:\n\techo skipped\n' > platforms/redhat/Makefile %build %global _hardened_build 1 @@ -98,15 +95,16 @@ make DESTDIR=%buildroot install install -m744 platforms/apccontrol \ %buildroot/etc/apcupsd/apccontrol -# systemd support -install -p -D -m644 apcupsd.service %buildroot/lib/systemd/system/apcupsd.service -install -p -D -m755 apcupsd_shutdown %buildroot/lib/systemd/system-shutdown/apcupsd_shutdown +install -p -D -m644 %SOURCE1 %buildroot/lib/systemd/system/apcupsd.service +install -p -D -m755 %SOURCE2 %buildroot/lib/systemd/system-shutdown/apcupsd_shutdown -install -d %buildroot/etc/logrotate.d -install -m0644 %SOURCE1 %buildroot/etc/logrotate.d/apcupsd -install -d %buildroot/etc/httpd/conf.d -install -m0644 %SOURCE2 %buildroot/etc/httpd/conf.d/apcupsd.conf -install -D -m0644 %SOURCE3 %buildroot/usr/share/pixmaps/apcupsd64x64.png +#install -d %buildroot/etc/httpd/conf.d +install -p -D -m0644 %SOURCE3 %buildroot/etc/httpd/conf.d/apcupsd.conf + +#install -d %buildroot/etc/logrotate.d +install -p -D -m0644 %SOURCE4 %buildroot/etc/logrotate.d/apcupsd + +install -p -D -m0644 %SOURCE5 %buildroot/usr/share/pixmaps/apcupsd64x64.png desktop-file-install \ --vendor="fedora" \ @@ -169,6 +167,12 @@ rm examples/*.in %changelog * Wed Jun 22 2016 Jason L Tibbitts III - 3.14.14-2 - Clean up the spec a bit. +- I've no idea why the unit file and shutdown script were added in a patch. + The unit file also used network.target instead of network-online.target. +- Remove apcupsd-3.14.4-shutdown.patch. I have no idea why it was there, as + "shutdown -h now" should be hust fine, while "-h -H now" is both + contradictory and should just leave the machine halted but running, which + doesn't make much sense. * Thu Jun 02 2016 Michal Hlavinka - 3.14.14-1 - updated to 3.14.14 diff --git a/apcupsd_shutdown b/apcupsd_shutdown new file mode 100644 index 0000000..4eff1ed --- /dev/null +++ b/apcupsd_shutdown @@ -0,0 +1,9 @@ +#!/bin/sh + +# See if this is a powerfail situation. +if [ -f /etc/apcupsd/powerfail ]; then + echo + echo "APCUPSD will now power off the UPS" + echo + /etc/apcupsd/apccontrol killpower +fi From a1637ce422a7340151f1e6c533d696bb380779af Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 22 Jun 2016 20:20:39 -0500 Subject: [PATCH 088/139] Even more spec cleanups. --- apcupsd.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 91cb152..910c44b 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -91,19 +91,14 @@ export CFLAGS="$CPPFLAGS" %install mkdir -p %buildroot/var/www/apcupsd -make DESTDIR=%buildroot install +%make_install install -m744 platforms/apccontrol \ %buildroot/etc/apcupsd/apccontrol -install -p -D -m644 %SOURCE1 %buildroot/lib/systemd/system/apcupsd.service -install -p -D -m755 %SOURCE2 %buildroot/lib/systemd/system-shutdown/apcupsd_shutdown - -#install -d %buildroot/etc/httpd/conf.d +install -p -D -m0644 %SOURCE1 %buildroot/lib/systemd/system/apcupsd.service +install -p -D -m0755 %SOURCE2 %buildroot/lib/systemd/system-shutdown/apcupsd_shutdown install -p -D -m0644 %SOURCE3 %buildroot/etc/httpd/conf.d/apcupsd.conf - -#install -d %buildroot/etc/logrotate.d install -p -D -m0644 %SOURCE4 %buildroot/etc/logrotate.d/apcupsd - install -p -D -m0644 %SOURCE5 %buildroot/usr/share/pixmaps/apcupsd64x64.png desktop-file-install \ @@ -167,12 +162,11 @@ rm examples/*.in %changelog * Wed Jun 22 2016 Jason L Tibbitts III - 3.14.14-2 - Clean up the spec a bit. -- I've no idea why the unit file and shutdown script were added in a patch. - The unit file also used network.target instead of network-online.target. -- Remove apcupsd-3.14.4-shutdown.patch. I have no idea why it was there, as - "shutdown -h now" should be hust fine, while "-h -H now" is both - contradictory and should just leave the machine halted but running, which - doesn't make much sense. +- Stop adding the unit file and shutdown script in a patch and just included + them as sources instead. +- Have the unit go after network-online.target instead of network.target. +- Remove apcupsd-3.14.4-shutdown.patch. Both the old and the new commands to + exactly the same thing for me (halt but not power down) on my test machines. * Thu Jun 02 2016 Michal Hlavinka - 3.14.14-1 - updated to 3.14.14 From fa6182881f95069babf2d80303026a826f733bc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 06:07:49 +0000 Subject: [PATCH 089/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 910c44b..0c5b6ef 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -160,6 +160,9 @@ rm examples/*.in %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.14.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jun 22 2016 Jason L Tibbitts III - 3.14.14-2 - Clean up the spec a bit. - Stop adding the unit file and shutdown script in a patch and just included From 5c009e81661eac81a47c1e9c6eb8c0253772d35e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Fri, 24 Mar 2017 14:18:58 -0500 Subject: [PATCH 090/139] Depend on /usr/bin/wall directly. --- apcupsd.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 0c5b6ef..922b16c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -18,7 +18,9 @@ Patch0: apcupsd-3.14.9-fixgui.patch BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils -Requires: /bin/mail +# This is part of util-linux in Fedora, but on EL7 it's in sysvinit-tools. +BuildRequires: /usr/bin/wall +Requires: /bin/mail /usr/bin/wall Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -160,6 +162,9 @@ rm examples/*.in %changelog +* Fri Mar 24 2017 Jason L Tibbitts III - 3.14.14-4 +- Depend on /usr/bin/wall to accommodate EL7. + * Fri Feb 10 2017 Fedora Release Engineering - 3.14.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1416bd9d7f99d99f11b6eb9a9b14a8030a47c9ce Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 17 Apr 2017 15:38:12 -0500 Subject: [PATCH 091/139] Reinstate shutdown patch. --- apcupsd-3.14.4-shutdown.patch | 19 +++++++++++++++++++ apcupsd.spec | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 apcupsd-3.14.4-shutdown.patch diff --git a/apcupsd-3.14.4-shutdown.patch b/apcupsd-3.14.4-shutdown.patch new file mode 100644 index 0000000..17671f0 --- /dev/null +++ b/apcupsd-3.14.4-shutdown.patch @@ -0,0 +1,19 @@ +This is needed to properly halt the machine without powering it down. + +See: + https://bugzilla.redhat.com/show_bug.cgi?id=348701 + https://bugzilla.redhat.com/show_bug.cgi?id=1442577 + + +diff -up apcupsd-3.14.4/platforms/apccontrol.in.shutdown apcupsd-3.14.4/platforms/apccontrol.in +--- apcupsd-3.14.4/platforms/apccontrol.in.shutdown 2008-05-28 09:15:47.000000000 +0200 ++++ apcupsd-3.14.4/platforms/apccontrol.in 2008-05-28 09:16:04.000000000 +0200 +@@ -104,7 +104,7 @@ case "$1" in + ;; + doshutdown) + echo "UPS ${2} initiated Shutdown Sequence" | ${WALL} +- ${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown" ++ ${SHUTDOWN} -h -H now "apcupsd UPS ${2} initiated shutdown" + ;; + annoyme) + echo "Power problems with UPS ${2}. Please logoff." | ${WALL} diff --git a/apcupsd.spec b/apcupsd.spec index 922b16c..b7e48d1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -14,6 +14,8 @@ Source5: apcupsd64x64.png # fix crash in gui, rhbz#578276 Patch0: apcupsd-3.14.9-fixgui.patch +# Halt without powering off, rhbz#1442577 +Patch1: apcupsd-3.14.4-shutdown.patch BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel @@ -162,6 +164,9 @@ rm examples/*.in %changelog +* Mon Apr 17 2017 Jason L Tibbitts III - 3.14.14-5 +- Reinstate patch to call shutdown with -H to halt instead of powering down. + * Fri Mar 24 2017 Jason L Tibbitts III - 3.14.14-4 - Depend on /usr/bin/wall to accommodate EL7. From e3b9a26c798236e48d9d103d2d50da4456a702f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:04:34 +0000 Subject: [PATCH 092/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index b7e48d1..c9a9574 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -164,6 +164,9 @@ rm examples/*.in %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.14.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Apr 17 2017 Jason L Tibbitts III - 3.14.14-5 - Reinstate patch to call shutdown with -H to halt instead of powering down. From 69851f97db723e3f940a58c1b0e0566aebade345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:37:43 +0000 Subject: [PATCH 093/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index c9a9574..87b41ed 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -164,6 +164,9 @@ rm examples/*.in %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.14.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.14.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 520be58fed6b37292e5bd34fde4a0de08daed161 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 25 Jan 2018 16:37:58 -0600 Subject: [PATCH 094/139] Use proper systemd dependencies. --- apcupsd.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 87b41ed..71a5515 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -23,9 +23,7 @@ BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils # This is part of util-linux in Fedora, but on EL7 it's in sysvinit-tools. BuildRequires: /usr/bin/wall Requires: /bin/mail /usr/bin/wall -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +%{?systemd_requires} %description Apcupsd can be used for controlling most APC UPSes. During a @@ -164,6 +162,9 @@ rm examples/*.in %changelog +* Thu Jan 25 2018 Jason L Tibbitts III - 3.14.14-8 +- Use proper systemd dependencies. + * Wed Aug 02 2017 Fedora Release Engineering - 3.14.14-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From cc86b8520770b742b49cd8eb550b294daa5c9426 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:35:42 +0000 Subject: [PATCH 095/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 71a5515..c12912c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -162,6 +162,9 @@ rm examples/*.in %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.14.14-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 25 2018 Jason L Tibbitts III - 3.14.14-8 - Use proper systemd dependencies. From d7aef11c95169b6b85e00e08669b867fdeef296b Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 26 Mar 2018 22:07:37 +0200 Subject: [PATCH 096/139] rebuilt to drop tcp_wrappers dependency https://bugzilla.redhat.com/show_bug.cgi?id=1518751 --- apcupsd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index c12912c..c54bafc 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -162,6 +162,10 @@ rm examples/*.in %changelog +* Mon Mar 26 2018 Till Maas - 3.14.14-10 +- rebuilt to drop tcp_wrappers dependency + https://bugzilla.redhat.com/show_bug.cgi?id=1518751 + * Wed Feb 07 2018 Fedora Release Engineering - 3.14.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b0a2a6ad1b13288d151bc1907015a4d3df8c74b3 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Tue, 27 Mar 2018 00:30:59 +0200 Subject: [PATCH 097/139] Remove tpc_wrappers support --- apcupsd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index c54bafc..54d7c92 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -18,7 +18,7 @@ Patch0: apcupsd-3.14.9-fixgui.patch Patch1: apcupsd-3.14.4-shutdown.patch BuildRequires: glibc-devel, gd-devel -BuildRequires: net-snmp-devel, tcp_wrappers-devel, libusb-devel +BuildRequires: net-snmp-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils # This is part of util-linux in Fedora, but on EL7 it's in sysvinit-tools. BuildRequires: /usr/bin/wall @@ -83,7 +83,6 @@ export CFLAGS="$CPPFLAGS" --enable-modbus-usb \ --enable-gapcmon \ --enable-pcnet \ - --with-libwrap=%{_libdir} \ --with-serial-dev= \ --with-upstype=usb \ --with-upscable=usb \ @@ -165,6 +164,7 @@ rm examples/*.in * Mon Mar 26 2018 Till Maas - 3.14.14-10 - rebuilt to drop tcp_wrappers dependency https://bugzilla.redhat.com/show_bug.cgi?id=1518751 +- remove tcp_wrappers support * Wed Feb 07 2018 Fedora Release Engineering - 3.14.14-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0adf8f9b0cc689233f298b8eb246f0d2257dfa3f Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 17 May 2018 18:14:48 -0500 Subject: [PATCH 098/139] Add KillMode=process to the systemd unit. --- apcupsd.service | 1 + apcupsd.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apcupsd.service b/apcupsd.service index fb50d9d..614fec2 100644 --- a/apcupsd.service +++ b/apcupsd.service @@ -6,6 +6,7 @@ After=network-online.target [Service] ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf +KillMode=process [Install] WantedBy=multi-user.target diff --git a/apcupsd.spec b/apcupsd.spec index 54d7c92..c212681 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -161,6 +161,9 @@ rm examples/*.in %changelog +* Thu May 17 2018 Jason L Tibbitts III - 3.14.14-11 +- Add KillMode=process to the systemd unit. + * Mon Mar 26 2018 Till Maas - 3.14.14-10 - rebuilt to drop tcp_wrappers dependency https://bugzilla.redhat.com/show_bug.cgi?id=1518751 From aff642fa4aa34cad24a08ae5e5d2fde14aff9c73 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 10 Jul 2018 16:20:50 +0200 Subject: [PATCH 099/139] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- apcupsd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apcupsd.spec b/apcupsd.spec index c212681..d7a43be 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -17,6 +17,7 @@ Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 Patch1: apcupsd-3.14.4-shutdown.patch +BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils From f50b2a99ce393aa7feb1a5730b61201c9b62b8d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:23:23 +0000 Subject: [PATCH 100/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index d7a43be..1dc9323 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 11%{?dist} +Release: 12%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -162,6 +162,9 @@ rm examples/*.in %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 3.14.14-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu May 17 2018 Jason L Tibbitts III - 3.14.14-11 - Add KillMode=process to the systemd unit. From c8d8f42edde5052d05cd4edb513e3b31e0cf6733 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 3 Dec 2018 13:39:19 -0600 Subject: [PATCH 101/139] Fix broken zero-size icon. --- apcupsd.spec | 5 ++++- apcupsd64x64.png | Bin 0 -> 4287 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1dc9323..6fe5c2d 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 12%{?dist} +Release: 13%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -162,6 +162,9 @@ rm examples/*.in %changelog +* Mon Dec 03 2018 Jason L Tibbitts III - 3.14.14-13 +- Fix broken zero-size icon. + * Thu Jul 12 2018 Fedora Release Engineering - 3.14.14-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/apcupsd64x64.png b/apcupsd64x64.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ed65f35fb27546207ee7d56f61087145619a3c0a 100644 GIT binary patch literal 4287 zcmZ{mXEfW5pQbCNy_866-nraZEC`zq{P2M`dv97Z<#+n>|Kfk{xo_?{pL5^b7dOH{Uz>@6lK}t#CY=WwC;$Ld{~AmS0KgXq z>8@EzyM&w5&#e%0D$e) z$GXRg007WhKh)L$F8?a4u^=7*06LtGo+jM_BMmJh4OR@+3;@h6IvQ$*UK87Cdk<^K<-T)$<4NmN>EB=z^Wo4EMg%4EOH6 zOS4wtbtv#;VDpOQvIW;j$%nMu7kqnN$Yz!Cr>SroXLzBA?GXpQY0Ws=mrVR<|_Ylh(?dB^VqlLe>kiJ27 zyqPU$CD5#;&(p&-g%;wGty;63|3DL)SEW2jGeZnAUIz zb8c>KZX=}amtj$iV*;wCIE{;gV|=x)_+v_niF^R1<{m4 zS2pct#;RVrvi}5}@%hiH?WvO!d1-0syQDV><=F{H2V!VK`R?|uO%cXJhi2|i;6pV* zjH4;kw#4YtoW{~*-Zl?KFe4bwq@|^$m7ohHqNAgEq5{e-Q&-MO)fmTzj^-k|=*^#e z=7-9AnIV&cWjv}-TYI7&(ZgBk%-6Q!!<^b&UZd}^vXX*=f{di(eyBt0<&O7EV9VLj z5}$Zl8%-CbY)-Z&A;Ld9SOl`6)}7k3KDFJen9_R-x=YhAwA2Pgccs z+N|LaMa9J^A{uKhcm6}Vk8*M}>G}eZj(=P-I;zXC*`HP$Zy^8*v$8Zvf~XILK(1mo zZwCE2KR%`lLSdP2_-KH!hK|J4o_we3$+NMt=WVV{r*=qWr+c3gxi?**7Po%mMeoP? zZi#O;uU@^{$PVZAsl^bLOA>AMy_$s*RWm|H*qYc#aU5+=lAHX`KV)VWV2ExjKRCp?MepQYGjH^{ znaBE?ngol|8z}s$h198^&bKHT-1hV*dVGhu6#p36zC~U7oQ!uEgg+Ba?tU~;rDSr4 zb>K%=BQ66!ZgK2)68mR;@3T-_S4pqy=%R5z}A0IeC-VvZBAsAO)k zx7%cub9|^e)u@LgBMliFi&{8Wc8nO|9E4-J!*PgdHUP89v_6axi5swo+gDHOB+TfD z1+iIpQ3bhFr%CI%OC@*rAn?)(Fj#4cv6vJL7CY5ZUIh9a984uFBErGW4rC3#%uW!@ z?32EKKf=~z>CjuOTiwzBiGpuVD?rqiP=$aZR+ajMz|@Q_YkWat{DW}U1HY()=H06q&F=M~3x~&Xh(?L{&bhjKNN8?Cb;Fp4xv;SC`+nl^OR&Hz^W^>g{no;a z)!&U-zt^@s>%jth{+ayX_odI+05ymK5&hbMc!{;QUkll+i&qCHpeiv$nHJe56YiOP zi!F1FZ!@!>XS|45{DC4f)OPmx>&nVXEb3MWB>ZYL*I;J9O~yf?tK^Q zVSE76g_@+z=dV#X++5{+ja!~{@#p-$*WO%R0%hQawp!uvCltYeU}z8Lti%x01eftZ zLih4g&)67y@urlN)D6K+?=|B%6eLtIWFTAM)WSacEt?34!9emY7Ob6OV$TzxRfH&- z1qUZ0vjyg<8lQ^XBC<+}Chs4sLFT-9tDGw`?zeg<^2-)aZkJb9YBUb0rrEJGWzaol zx~0nh4@3XJLI}$0s=bN50JyUKDs{u#`yH9^=bV+XSVhAYsPq>JhOD9N<3i6H*1UD6*_;!I@>AG1t0uK-0cdrGR zL;taB)XzuJw_tGz{F!8!9x9r)ce%S}SX8U}9hzaVyp)k<5WY`GYafMQSa#$8XIekp zr&0gQu%L=c%%IakNl{iX4y5`%I)qg1j46INi7jgrwz&g;PTa+~+(B5GL z%TQR@`%)Rb_=VxZEy@xL(3>g$eR$p~7gduiQL(wC6Y1`54;^@n@$AmGXuP0*rb|J^e2Bj( z0At)jzguXg1_A>akx&JH^CKn#Rqf)yw!P^x zqd7*!ZKotK&q6emS=2t-AabPxyu3)R#fXMpXY&rQcfqeeQl>v73qSqr5#8z&L0_ci z_DO8lwn8i!X@>BV2a#aScg}Vc@-L6%%x1~Te(a1i*QsuQ+AK~&Qr!0VgI5JA+jaBy zDoorG8L0Q9Q%X}Q*8#9V^KCnm`I)W8vJv*MU=G{UnULEdB&n!=FQOVW#OgLcF96eH z=`JtL+0=Yw!lW3}-o+sJg|>%ini6=R1M27G&=KwAqYfJQ7Y34xdYQA!)KYWnrqb70 zSX8Wb>%f4oIpq&#`7Zvm8GeTZppZ88JQvfNSJt=y*+@5yNE`@+32zWMqokg_3Q1go zG~ag2LoG2}VT6`BDNHG=&-wD+9Txq0tWz+^_2qJtCWtpin{iJo$a;!eK=MqHLYEwMWV1{2tMJ%J}g}^XB zzTDP_1%&Mh%`TXMTI`;`fJO(*RJ{D#A1!{+(LhdT(psWC-S4X%byTIgEKraS5m6+g z-UV~yQ|UeUp=&Ju3B2caA7ff&2~zvemQy#w$ziomDEM57sWcU**vDGuqH?*z<3g|G ztDJ^p4Q5w0=n~OF=}2=qm9=Hzv}-`DhAJvRFe%Ba3kC}%y;V|@ZYc@B7W$Om!px?0 z-J3n>CYqhpxBPi$ESMJk`i7D;D3Bf2T(;Lj_J&_C)>r%B=Glg3Gjl>-10*`QDNZBR{Ke@sTpr*b6MDeb#; z+{zrkD0pvTo2jH$MN}83&N1xElf#n;r=n->$AteQaW)0|ai`mHR{J4`OWbE^xE>3E z6&!3{B5h2_s?1MBW^>cs-PnznV*9$}f{5O%!wD_=lI^hMiAUaBTtTW(YGPTA{$p(p z6YcidR*;Yov7;mF1vcN|Ju>h8ye1?#rO_{i(5FI%=~2c_0w$Z3ru6e8U_H0jr#m!U zZw5>9zh8IHfJ8eHlHec{~sHgv52@`I^!*grwdy=?m|8-lslb!nA zGa6O0d+_HB-)DZ<=?7vikBlPQ(&!@~ccAN9bT>WWb&(agACx!zstm!-leuPWEmfTs zHKbpi@wy)o9z88e+pjz<`BOBe!9fnGLoa2T{v4T_joNy8CZPx+4ym|$bHKv?_wXc5 zY)CZ9YaKpJfWGZYtPwaotK}{{RlGYmcv8z9Hu6E8|IiyG-YE^3bD0JEE zaeBOw$}FgIWV2J$ZV(vyXJeJ{9Z!H170Xzkq{>$9Zd} z(RY7sAZIoYMZn}>4~4p`qkwFgu44i-ljLP9i#!=WJ;kgcU~7EK%`)hy18fIp+rr0G zoctPmkhga2nzfqz>H7FL$^InUQ24~L2@ki;MTE%7vP595|D^!PV={lC4u>|v@`U>| z_KsJ)NO@;}{OcDyM&&}j{`Ky?n5Zbfxw;*4imu&0nhrin1<7nSGsk>-T=GOt4^1Y! zc2_UPN{6UEpeLf`mnxk%6g)#3gLiXAv{~a$sC&s+?r_ig z=+*PmTiI(4F(qmJ8a$S|K08Bt!XRPJwrN@4S=gs%7|g;D;mOcTnJVYW_Oj>X52>lv znK`T2PnrND;(8jY5BUt#R-?)Fb#X@B?Zq3lHdj7|aM&C9QmsK~gu>woXZOrtNC z!s{KgsdC%yf-tM1^;1)7gTmpHjlvRn-=i%LX5J~+8*+;A@$rfW9YR~v^~r0u>$mE5 z=SAP(mKV{ZD`y?kxjwY^0qeCg0zOIw@% zO_o^52?^d46AF39wN7gkG??jsWJ2*~8M|6p)8>A5{O(SkE;R2t==&%s@VauzkFBk( zIx2ua5!oieR`c8a>^M=Q2=xH!h}jIC6`H?*26km06i_mgF0WjK*=aU42IK+&@DEPY z7-wUJvqe02v$ew60#YzZd2vZ8ahSBBq!dC@3IUTAhsh#fFsebOTmJ`ecC~S^^Zx&V USNN}A0001VH1#!#)h*xr4`8z*F#rGn literal 0 HcmV?d00001 From efba3a0409b13f46cafa7c7bc63dd63ed9213928 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 24 Jan 2019 12:37:57 -0600 Subject: [PATCH 102/139] Remove Group: tags. --- apcupsd.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 6fe5c2d..2f28d44 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -40,7 +40,6 @@ Some features depend on what UPS model you have (simple or smart). %package cgi Summary: Web interface for apcupsd -Group: Applications/Internet Requires: apcupsd = %version-%release Requires: httpd @@ -50,7 +49,6 @@ A CGI interface to the APC UPS monitoring daemon. %package gui Summary: GUI interface for apcupsd -Group: Applications/System Requires: apcupsd = %version-%release %description gui From 8d58df5acfde5b065642dbd313746e0d4045ccfe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:34:10 +0000 Subject: [PATCH 103/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 2f28d44..354a9c0 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 13%{?dist} +Release: 14%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -160,6 +160,9 @@ rm examples/*.in %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.14.14-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Dec 03 2018 Jason L Tibbitts III - 3.14.14-13 - Fix broken zero-size icon. From 5341db8d9b33438da86bc8c7c02bb841828a90c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:11:28 +0000 Subject: [PATCH 104/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 354a9c0..fb1c609 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.14 -Release: 14%{?dist} +Release: 15%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -160,6 +160,9 @@ rm examples/*.in %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 3.14.14-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 3.14.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 48c9ebfc911d9261f22df254831eba3f7443af9c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 24 Jul 2019 20:28:36 -0500 Subject: [PATCH 105/139] Work around RPM 4.15 change that broke the build --- apcupsd.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index fb1c609..e750c28 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,10 @@ +# A change in RPM 4.15 causes the make_build macro to misbuild this package. +# See https://github.com/rpm-software-management/rpm/issues/798 +%global make_build %{__make} %{?_make_output_sync} %{?_smp_mflags} + Name: apcupsd Version: 3.14.14 -Release: 15%{?dist} +Release: 16%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -17,7 +21,7 @@ Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 Patch1: apcupsd-3.14.4-shutdown.patch -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, libusb-devel BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils @@ -160,6 +164,9 @@ rm examples/*.in %changelog +* Wed Jul 24 2019 Jason L Tibbitts III - 3.14.14-16 +- Workaround change in RPM 4.15 which breaks the build. + * Wed Jul 24 2019 Fedora Release Engineering - 3.14.14-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 28128d0891a9cfeb46c74f12646c70dd55abfabe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:49:25 +0000 Subject: [PATCH 106/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index e750c28..73c3cc3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 16%{?dist} +Release: 17%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -164,6 +164,9 @@ rm examples/*.in %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.14.14-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Jason L Tibbitts III - 3.14.14-16 - Workaround change in RPM 4.15 which breaks the build. From ce3cc5f24b39cd6e0e54facba7a6daab726868d9 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 8 Jun 2020 16:39:57 +0200 Subject: [PATCH 107/139] Replaced BuildRequires: gnome-vfs2 with BuildRequires: GConf2-devel --- apcupsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 73c3cc3..fc71a12 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 17%{?dist} +Release: 18%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -24,7 +24,7 @@ Patch1: apcupsd-3.14.4-shutdown.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, libusb-devel -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils +BuildRequires: gtk2-devel, GConf2-devel, desktop-file-utils # This is part of util-linux in Fedora, but on EL7 it's in sysvinit-tools. BuildRequires: /usr/bin/wall Requires: /bin/mail /usr/bin/wall @@ -164,6 +164,9 @@ rm examples/*.in %changelog +* Mon Jun 08 2020 Germano Massullo - 3.14.14-18 +- Replaced BuildRequires: gnome-vfs2 with BuildRequires: GConf2-devel More infos at https://bugzilla.redhat.com/show_bug.cgi?id=1745727#c5 + * Tue Jan 28 2020 Fedora Release Engineering - 3.14.14-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7e824badda85466e64bcb752fe68dd82a5aa2bdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:13:58 +0000 Subject: [PATCH 108/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index fc71a12..349f5a4 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 18%{?dist} +Release: 19%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -164,6 +164,9 @@ rm examples/*.in %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.14.14-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 08 2020 Germano Massullo - 3.14.14-18 - Replaced BuildRequires: gnome-vfs2 with BuildRequires: GConf2-devel More infos at https://bugzilla.redhat.com/show_bug.cgi?id=1745727#c5 From d31057054d162db3bf7ad8531d92dc1419f18865 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:01:39 +0000 Subject: [PATCH 109/139] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 349f5a4..5fb0df2 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 19%{?dist} +Release: 20%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -164,6 +164,10 @@ rm examples/*.in %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.14.14-20 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.14.14-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ebecec4c088583df38fda681b103d23374cd36ce Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:31:34 +0000 Subject: [PATCH 110/139] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- apcupsd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apcupsd.spec b/apcupsd.spec index 5fb0df2..ac757f8 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -27,6 +27,7 @@ BuildRequires: net-snmp-devel, libusb-devel BuildRequires: gtk2-devel, GConf2-devel, desktop-file-utils # This is part of util-linux in Fedora, but on EL7 it's in sysvinit-tools. BuildRequires: /usr/bin/wall +BuildRequires: make Requires: /bin/mail /usr/bin/wall %{?systemd_requires} From a8a7b6eef1d3816cbe8188a73a77aeb64fb6d644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:17:16 +0000 Subject: [PATCH 111/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index ac757f8..4f601c2 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 20%{?dist} +Release: 21%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -165,6 +165,9 @@ rm examples/*.in %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.14.14-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 3.14.14-20 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 513fee665fd942627e4e0e118e98427bc8710e24 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sat, 30 Jan 2021 13:31:24 -0600 Subject: [PATCH 112/139] Fix build on F33+ Previous to F33, the files /usr/lib/rpm/config.{guess,sub} existed, and this package copied them into the autoconf directory. This was added in 2008 with no explanatory comment other than "new upstream version". RPM no longer includes those files, though copies do still exist in /usr/lib/rpm/redhat. The package appears fine without them. --- apcupsd.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 4f601c2..24514ab 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 21%{?dist} +Release: 22%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -68,7 +68,6 @@ printf 'install:\n\techo skipped\n' > platforms/redhat/Makefile %build %global _hardened_build 1 -cp -p /usr/lib/rpm/config.{guess,sub} autoconf/ export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS -Wno-format-security -Wno-error=format-security" export CXXFLAGS="$CPPFLAGS" export CFLAGS="$CPPFLAGS" @@ -165,6 +164,9 @@ rm examples/*.in %changelog +* Sat Jan 30 2021 Jason L Tibbitts III - 3.14.14-22 +- Fix build on F33+. + * Tue Jan 26 2021 Fedora Release Engineering - 3.14.14-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From fdc6fd1f938ca122c33cdcf12283c507205f9eae Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sat, 30 Jan 2021 14:53:51 -0600 Subject: [PATCH 113/139] Use _make_verbose instead of hacks This is the single package which won't build with make V=1. Now that RPM has %_make_verbose to override this, use it instead of redefinining %make_build. --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 24514ab..8889523 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ # A change in RPM 4.15 causes the make_build macro to misbuild this package. # See https://github.com/rpm-software-management/rpm/issues/798 -%global make_build %{__make} %{?_make_output_sync} %{?_smp_mflags} +%global _make_verbose %nil Name: apcupsd Version: 3.14.14 From 3d82f65c42f092e955e6bb9dcd58830de16950fd Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sat, 30 Jan 2021 14:56:53 -0600 Subject: [PATCH 114/139] Fix format-security error. Add a patch to fix the one line of code which triggered a format-security error instead of disabling format security checks for the entire package. --- apcupsd.spec | 8 ++++---- patch-format-security | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 patch-format-security diff --git a/apcupsd.spec b/apcupsd.spec index 8889523..c06ef3e 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -20,6 +20,9 @@ Source5: apcupsd64x64.png Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 Patch1: apcupsd-3.14.4-shutdown.patch +# Fix format-security error so we can enable the checks +Patch2: patch-format-security + BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel @@ -67,10 +70,6 @@ A GUI interface to the APC UPS monitoring daemon. printf 'install:\n\techo skipped\n' > platforms/redhat/Makefile %build -%global _hardened_build 1 -export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS -Wno-format-security -Wno-error=format-security" -export CXXFLAGS="$CPPFLAGS" -export CFLAGS="$CPPFLAGS" %configure \ --sysconfdir="/etc/apcupsd" \ --with-cgi-bin="/var/www/apcupsd" \ @@ -166,6 +165,7 @@ rm examples/*.in %changelog * Sat Jan 30 2021 Jason L Tibbitts III - 3.14.14-22 - Fix build on F33+. +- Allow build with format-security checking enabled. * Tue Jan 26 2021 Fedora Release Engineering - 3.14.14-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/patch-format-security b/patch-format-security new file mode 100644 index 0000000..d919a3c --- /dev/null +++ b/patch-format-security @@ -0,0 +1,13 @@ +diff --git a/src/gapcmon/gapcmon.c b/src/gapcmon/gapcmon.c +index 40bf29d..111fe1f 100644 +--- a/src/gapcmon/gapcmon.c ++++ b/src/gapcmon/gapcmon.c +@@ -2938,7 +2938,7 @@ static void gapc_util_log_app_msg(gchar * pch_func, gchar * pch_topic, + + pch = g_strdup_printf("%s(%s) emsg=%s", pch_func, pch_topic, pch_emsg); + +- g_message(pch); ++ g_message("%s", pch); + + g_free(pch); + From 8f5ac909050cda18888509b76cd4bedfe16c6495 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Fri, 5 Feb 2021 16:05:38 -0600 Subject: [PATCH 115/139] Clean up .gitignore. --- .gitignore | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 830429c..b8c81a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -apcupsd-3.14.8.tar.gz -/apcupsd-3.14.9.tar.gz -/apcupsd-3.14.10.tar.gz -/apcupsd-3.14.11.tar.gz -/apcupsd-3.14.12.tar.gz -/apcupsd-3.14.13.tar.gz -/apcupsd-3.14.14.tar.gz +/apcupsd-*.tar.gz +/apcupsd-*.src.rpm +/apcupsd-*/ +/results_*/ From 779e741458c83e98af51e5b28e5a17ef46fbc889 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:49:22 +0000 Subject: [PATCH 116/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1cbb103fdbfa6ad593f233e5534aa8d7923c8c27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:45:25 +0000 Subject: [PATCH 117/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index c06ef3e..f675327 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 22%{?dist} +Release: 23%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -163,6 +163,9 @@ rm examples/*.in %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.14.14-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jan 30 2021 Jason L Tibbitts III - 3.14.14-22 - Fix build on F33+. - Allow build with format-security checking enabled. From d02bbffc60c28072de688a397aa67249c5de41cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:27:24 +0000 Subject: [PATCH 118/139] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index f675327..b1a7ddc 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 23%{?dist} +Release: 24%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -163,6 +163,9 @@ rm examples/*.in %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 3.14.14-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 3.14.14-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e9ceaea2607c0c33f5b1094ba3946a6af30104d9 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 25 Jan 2022 11:55:46 -0600 Subject: [PATCH 119/139] Require systemd at build time systemd used to be in the buildroot but it seems that it no longer is. apcupsd requires /sbin/shutdown to be present at build time, so depend on it manually. need to make sure it's installed. --- apcupsd.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index b1a7ddc..f24fc69 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 24%{?dist} +Release: 25%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -28,6 +28,9 @@ BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel BuildRequires: net-snmp-devel, libusb-devel BuildRequires: gtk2-devel, GConf2-devel, desktop-file-utils +# /sbin/shutdown is required to be present when building +# Somehow in F36 systemd is installed in mock but not in koji +BuildRequires: systemd # This is part of util-linux in Fedora, but on EL7 it's in sysvinit-tools. BuildRequires: /usr/bin/wall BuildRequires: make @@ -163,6 +166,10 @@ rm examples/*.in %changelog +* Tue Jan 25 2022 Jason L Tibbitts III - 3.14.14-25 +- Explicitly require systemd at build time to ensure that /sbin/shutdown is + present. + * Wed Jan 19 2022 Fedora Release Engineering - 3.14.14-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b6c505adf3c8b44b06792f25589b9b88b85f2d2e Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 09:00:02 -0800 Subject: [PATCH 120/139] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 92bb57a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apcupsd -# $Id$ -NAME := apcupsd -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 -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept 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) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 76adc1d87cb1e363cc848fa13e0790a372ee433a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:02:37 +0000 Subject: [PATCH 121/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index f24fc69..f6f9efc 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 25%{?dist} +Release: 26%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.14.14-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jan 25 2022 Jason L Tibbitts III - 3.14.14-25 - Explicitly require systemd at build time to ensure that /sbin/shutdown is present. From dd4047ce0a1c479db6faab21ee34c8bb4fb908e8 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 2 Aug 2022 17:19:53 -0500 Subject: [PATCH 122/139] Depend on libusb-compat-0.1-devel. --- apcupsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index f6f9efc..5767004 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 26%{?dist} +Release: 27%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -26,7 +26,7 @@ Patch2: patch-format-security BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel -BuildRequires: net-snmp-devel, libusb-devel +BuildRequires: net-snmp-devel, libusb-compat-0.1-devel BuildRequires: gtk2-devel, GConf2-devel, desktop-file-utils # /sbin/shutdown is required to be present when building # Somehow in F36 systemd is installed in mock but not in koji @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Tue Aug 02 2022 Jason L Tibbitts III - 3.14.14-27 +- Depend on libusb-compat-0.1-devel to avoid build breakage. + * Wed Jul 20 2022 Fedora Release Engineering - 3.14.14-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8e55767a3a66ffc145f4b33ee06e003714c6d67c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:57:06 +0000 Subject: [PATCH 123/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 5767004..2a2a10c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 27%{?dist} +Release: 28%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 3.14.14-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 02 2022 Jason L Tibbitts III - 3.14.14-27 - Depend on libusb-compat-0.1-devel to avoid build breakage. From e5f84212579025f443e32a650cf9bdd2f5601155 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:32:21 +0000 Subject: [PATCH 124/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 2a2a10c..ce677f7 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 28%{?dist} +Release: 29%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.14.14-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 3.14.14-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5d22797bc118e9a7e18d2a8ee1e2244d1d7f8aa7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:19:45 +0000 Subject: [PATCH 125/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index ce677f7..912cc00 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 29%{?dist} +Release: 30%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.14.14-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.14.14-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 325ee1c78cf644ecc630bd7523de6a7718c0a4dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:16:48 +0000 Subject: [PATCH 126/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 912cc00..1c19a81 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 30%{?dist} +Release: 31%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.14.14-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.14.14-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8aca3335ef24503e6868e8fd82317537f0bded3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:14:30 +0000 Subject: [PATCH 127/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1c19a81..8936186 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 31%{?dist} +Release: 32%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.14.14-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 3.14.14-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c5aa870a6eaf67b8bbea3123fb4faa5ade11f972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 10:11:30 +0200 Subject: [PATCH 128/139] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- apcupsd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 8936186..41fb2b2 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,10 +4,11 @@ Name: apcupsd Version: 3.14.14 -Release: 32%{?dist} +Release: 33%{?dist} Summary: APC UPS Power Control Daemon -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://www.apcupsd.com Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.service @@ -166,6 +167,9 @@ rm examples/*.in %changelog +* Mon Jul 29 2024 Miroslav Suchý - 3.14.14-33 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 3.14.14-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 42e9efbb5fd488f604675679eb1e779b51126aae Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 8 Nov 2024 16:57:51 +0100 Subject: [PATCH 129/139] Adds disable_nologin.patch --- apcupsd.spec | 22 ++++++++-------------- disable_nologin.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 disable_nologin.patch diff --git a/apcupsd.spec b/apcupsd.spec index 41fb2b2..932f5c6 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,11 +4,10 @@ Name: apcupsd Version: 3.14.14 -Release: 33%{?dist} +Release: 31%{?dist} Summary: APC UPS Power Control Daemon -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +License: GPLv2 URL: http://www.apcupsd.com Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.service @@ -20,9 +19,10 @@ Source5: apcupsd64x64.png # fix crash in gui, rhbz#578276 Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 -Patch1: apcupsd-3.14.4-shutdown.patch +#Patch1: apcupsd-3.14.4-shutdown.patch # Fix format-security error so we can enable the checks Patch2: patch-format-security +Patch3: disable_nologin.patch BuildRequires: gcc-c++ @@ -167,17 +167,11 @@ rm examples/*.in %changelog -* Mon Jul 29 2024 Miroslav Suchý - 3.14.14-33 -- convert license to SPDX +* Fri Nov 08 2024 Germano Massullo - 3.14.14-31 +- Adds disable_nologin.patch -* Wed Jul 17 2024 Fedora Release Engineering - 3.14.14-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 3.14.14-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.14.14-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Sun Jan 07 2024 Germano Massullo - 3.14.14-30 +- disables apcupsd-3.14.4-shutdown.patch * Wed Jul 19 2023 Fedora Release Engineering - 3.14.14-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/disable_nologin.patch b/disable_nologin.patch new file mode 100644 index 0000000..81fefc7 --- /dev/null +++ b/disable_nologin.patch @@ -0,0 +1,18 @@ +diff -urNr apcupsd-3.14.14-orig/src/action.c apcupsd-3.14.14/src/action.c +--- apcupsd-3.14.14-orig/src/action.c 2015-03-20 04:59:41.000000000 +0100 ++++ apcupsd-3.14.14/src/action.c 2024-11-08 16:48:46.095910557 +0100 +@@ -189,13 +189,7 @@ + + static void prohibit_logins(UPSINFO *ups) + { +- if (ups->nologin_file) +- return; /* already done */ +- +- logonfail(ups, 0); +- ups->nologin_file = true; +- +- log_event(ups, LOG_ALERT, "User logins prohibited"); ++ return; + } + + static void do_shutdown(UPSINFO *ups, int cmdtype) From 063db992f5e7adc0660be8876b129f5bd324de92 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 8 Nov 2024 17:39:36 +0100 Subject: [PATCH 130/139] release bump --- apcupsd.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 932f5c6..1a9e42d 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 31%{?dist} +Release: 33%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -19,7 +19,7 @@ Source5: apcupsd64x64.png # fix crash in gui, rhbz#578276 Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 -#Patch1: apcupsd-3.14.4-shutdown.patch +Patch1: apcupsd-3.14.4-shutdown.patch # Fix format-security error so we can enable the checks Patch2: patch-format-security Patch3: disable_nologin.patch @@ -167,6 +167,12 @@ rm examples/*.in %changelog +* Fri Nov 08 2024 Germano Massullo - 3.14.14-33 +- release bump + +* Fri Nov 08 2024 Germano Massullo - 3.14.14-32 +- release bump + * Fri Nov 08 2024 Germano Massullo - 3.14.14-31 - Adds disable_nologin.patch From 289b8ada59cb2b13f8e233d85c9146c9be67cd31 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 8 Nov 2024 19:41:45 +0100 Subject: [PATCH 131/139] Adds distinction between Fedora and EL <= 9 for BuildRequires: libusb --- apcupsd.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1a9e42d..b0fd249 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -27,7 +27,13 @@ Patch3: disable_nologin.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel -BuildRequires: net-snmp-devel, libusb-compat-0.1-devel +%if %{defined fedora} +BuildRequires: libusb-compat-0.1-devel +%endif +%if (%{defined rhel} && 0%{?rhel} <= 9) +BuildRequires: libusb-devel +%endif +BuildRequires: net-snmp-devel, BuildRequires: gtk2-devel, GConf2-devel, desktop-file-utils # /sbin/shutdown is required to be present when building # Somehow in F36 systemd is installed in mock but not in koji @@ -168,7 +174,7 @@ rm examples/*.in %changelog * Fri Nov 08 2024 Germano Massullo - 3.14.14-33 -- release bump +- Adds distinction between Fedora and EL <= 9 for BuildRequires: libusb * Fri Nov 08 2024 Germano Massullo - 3.14.14-32 - release bump From cb14d73ce6da55f3ca655ada1688f55f43f2f97a Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 11 Nov 2024 12:50:14 +0100 Subject: [PATCH 132/139] fixed license format --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index b0fd249..4156a27 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -7,7 +7,7 @@ Version: 3.14.14 Release: 33%{?dist} Summary: APC UPS Power Control Daemon -License: GPLv2 +License: GPL-2.0-only URL: http://www.apcupsd.com Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.service From cb33d36eae5e35185768b797e63dc31954e4e913 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:19:42 +0000 Subject: [PATCH 133/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 4156a27..46448cb 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 33%{?dist} +Release: 34%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -173,6 +173,9 @@ rm examples/*.in %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.14.14-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 08 2024 Germano Massullo - 3.14.14-33 - Adds distinction between Fedora and EL <= 9 for BuildRequires: libusb From 89ca1eea99b91c1b612e6c5b0df01abaf79dc875 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Wed, 9 Apr 2025 12:38:58 +0200 Subject: [PATCH 134/139] Adds 99-apcupsd-xfer-glitch.patch --- 99-apcupsd-xfer-glitch.patch | 61 ++++++++++++++++++++++++++++++++++++ apcupsd.spec | 11 +++++-- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 99-apcupsd-xfer-glitch.patch diff --git a/99-apcupsd-xfer-glitch.patch b/99-apcupsd-xfer-glitch.patch new file mode 100644 index 0000000..2b2898d --- /dev/null +++ b/99-apcupsd-xfer-glitch.patch @@ -0,0 +1,61 @@ +diff -aruN apcupsd-3.14.14.orig/src/drivers/usb/usb.c apcupsd-3.14.14/src/drivers/usb/usb.c +--- apcupsd-3.14.14.orig/src/drivers/usb/usb.c 2024-02-24 20:22:42.007641242 +0100 ++++ apcupsd-3.14.14/src/drivers/usb/usb.c 2024-02-24 20:23:03.824987965 +0100 +@@ -42,7 +42,9 @@ + UpsDriver(ups), + _quirk_old_backups_pro(false), + _prev_time((struct timeval){0}), +- _bpcnt(0) ++ _bpcnt(0), ++ _bacnt(0), ++ _brcnt(0) + { + } + +@@ -410,8 +412,13 @@ + break; + + case CI_NeedReplacement: +- if (uval->iValue) +- _ups->set_replacebatt(uval->iValue); ++ if (uval->iValue) { ++ if (_brcnt++) { ++ _ups->set_replacebatt(uval->iValue); ++ } ++ } else { ++ _brcnt = 0; ++ } + Dmsg(200, "ReplaceBatt=%d\n", uval->iValue); + break; + +@@ -569,11 +576,15 @@ + * delayed. C'est la vie. + */ + if (uval->iValue) { +- if (_bpcnt++) ++ if (_bpcnt++) { ++ _bacnt = 0; + _ups->set_battpresent(); ++ } + } else { +- _bpcnt = 0; +- _ups->clear_battpresent(); ++ if (_bacnt++) { ++ _bpcnt = 0; ++ _ups->clear_battpresent(); ++ } + } + Dmsg(200, "BatteryPresent=%d\n", uval->iValue); + break; +diff -aruN apcupsd-3.14.14.orig/src/drivers/usb/usb.h apcupsd-3.14.14/src/drivers/usb/usb.h +--- apcupsd-3.14.14.orig/src/drivers/usb/usb.h 2024-02-24 20:22:42.007641242 +0100 ++++ apcupsd-3.14.14/src/drivers/usb/usb.h 2024-02-24 20:23:01.754956355 +0100 +@@ -86,6 +86,8 @@ + bool _quirk_old_backups_pro; + struct timeval _prev_time; + int _bpcnt; ++ int _bacnt; ++ int _brcnt; + }; + + /* Max rate to update volatile data */ diff --git a/apcupsd.spec b/apcupsd.spec index 46448cb..ae63fd3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 34%{?dist} +Release: 35%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -23,7 +23,11 @@ Patch1: apcupsd-3.14.4-shutdown.patch # Fix format-security error so we can enable the checks Patch2: patch-format-security Patch3: disable_nologin.patch - +# fixes "increasing NUMXFERS" bug: +# https://sourceforge.net/p/apcupsd/mailman/apcupsd-users/thread/ad9afb27-30f9-443f-a9fb-982c41ad1325%40okazoo.eu/ +# https://www.reddit.com/r/homelab/comments/1c3eo9n/apcupsd_and_proxmox_frequent_battery_disconnected/ +# patch source: https://sourceforge.net/p/apcupsd/mailman/message/58741334/ +Patch4: 99-apcupsd-xfer-glitch.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel @@ -173,6 +177,9 @@ rm examples/*.in %changelog +* Wed Apr 09 2025 Germano Massullo - 3.14.14-35 +- Adds 99-apcupsd-xfer-glitch.patch + * Thu Jan 16 2025 Fedora Release Engineering - 3.14.14-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8a2cf41162dd6c1dce851b774aaf61aa5c3c0660 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 23 Apr 2025 14:15:16 -0700 Subject: [PATCH 135/139] Fix libusb conditional to make it build on EPEL 10 --- apcupsd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index ae63fd3..42ae7cd 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 35%{?dist} +Release: 36%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -31,7 +31,7 @@ Patch4: 99-apcupsd-xfer-glitch.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel -%if %{defined fedora} +%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} > 9) BuildRequires: libusb-compat-0.1-devel %endif %if (%{defined rhel} && 0%{?rhel} <= 9) @@ -177,6 +177,10 @@ rm examples/*.in %changelog +* Wed Apr 23 2025 Davide Cavalca - 3.14.14-36 +- Fix libusb conditional to make it build on EPEL 10 + Fixes: RHBZ#2337139 + * Wed Apr 09 2025 Germano Massullo - 3.14.14-35 - Adds 99-apcupsd-xfer-glitch.patch From 583cb0b03b5c595616c18c36e6581e77bf3a680d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 9 May 2025 15:00:02 -0500 Subject: [PATCH 136/139] Move binaries to bin --- apcupsd.service | 2 +- apcupsd.spec | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apcupsd.service b/apcupsd.service index 614fec2..2e199ff 100644 --- a/apcupsd.service +++ b/apcupsd.service @@ -5,7 +5,7 @@ After=network-online.target [Service] ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail -ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf +ExecStart=/usr/bin/apcupsd -b -f /etc/apcupsd/apcupsd.conf KillMode=process [Install] diff --git a/apcupsd.spec b/apcupsd.spec index 42ae7cd..a19abc1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 36%{?dist} +Release: 37%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -87,7 +87,7 @@ printf 'install:\n\techo skipped\n' > platforms/redhat/Makefile %configure \ --sysconfdir="/etc/apcupsd" \ --with-cgi-bin="/var/www/apcupsd" \ - --sbindir=/sbin \ + --sbindir=%{_bindir} \ --enable-cgi \ --enable-pthreads \ --enable-net \ @@ -144,7 +144,11 @@ rm examples/*.in %config(noreplace) /etc/apcupsd/onbattery %config(noreplace) /etc/logrotate.d/apcupsd /usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi -%attr(0755,root,root) /sbin/* +%{_bindir}/apcaccess +%{_bindir}/apctest +%{_bindir}/apcupsd +%{_bindir}/smtp + %{_mandir}/*/* %files cgi @@ -177,6 +181,9 @@ rm examples/*.in %changelog +* Fri May 09 2025 Gwyn Ciesla - 3.14.14-37 +- Move binaries from sbin to bin, 2365293. + * Wed Apr 23 2025 Davide Cavalca - 3.14.14-36 - Fix libusb conditional to make it build on EPEL 10 Fixes: RHBZ#2337139 From c2ac98a5855e73adaf38bded247acf6ffae8b530 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 May 2025 14:25:42 -0500 Subject: [PATCH 137/139] Don't ship /usr/bin/smtp --- apcupsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index a19abc1..451ab87 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 37%{?dist} +Release: 38%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -147,7 +147,7 @@ rm examples/*.in %{_bindir}/apcaccess %{_bindir}/apctest %{_bindir}/apcupsd -%{_bindir}/smtp +%exclude %{_bindir}/smtp %{_mandir}/*/* @@ -181,6 +181,9 @@ rm examples/*.in %changelog +* Thu May 22 2025 Gwyn Ciesla - 3.14.14-38 +- Don't ship /usr/bin/smtp, not used, conflicts with opensmtpd. + * Fri May 09 2025 Gwyn Ciesla - 3.14.14-37 - Move binaries from sbin to bin, 2365293. From f2445acf011ab003c57fc1fb27dc3854ffaad723 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:07:44 +0000 Subject: [PATCH 138/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 451ab87..116113b 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 38%{?dist} +Release: 39%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -181,6 +181,9 @@ rm examples/*.in %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.14.14-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 22 2025 Gwyn Ciesla - 3.14.14-38 - Don't ship /usr/bin/smtp, not used, conflicts with opensmtpd. From d71ed2aa541a78a6e5c525a485c3e34d9169c6cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:48:55 +0000 Subject: [PATCH 139/139] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 116113b..dde0ac9 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 39%{?dist} +Release: 40%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -181,6 +181,9 @@ rm examples/*.in %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.14.14-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 3.14.14-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild