diff --git a/.gitignore b/.gitignore index 908a689..ae3f3c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gofer-1.4.1.tar.gz /gofer-2.0.0.tar.gz /gofer-2.5.1.tar.gz +/gofer-2.7.1.tar.gz diff --git a/gofer.spec b/gofer.spec index 5803c02..9d1d0d7 100644 --- a/gofer.spec +++ b/gofer.spec @@ -6,8 +6,8 @@ %endif Name: gofer -Version: 2.5.1 -Release: 3%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: A lightweight, extensible python agent Group: Development/Languages License: LGPLv2 @@ -20,7 +20,6 @@ BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: rpm-python Requires: python-%{name} = %{version} -Requires: python-iniparse %if 0%{?systemd} BuildRequires: systemd Requires(post): systemd @@ -58,17 +57,20 @@ mkdir -p %{buildroot}/%{_sysconfdir}/%{name} mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/plugins mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/conf.d mkdir -p %{buildroot}/%{_sysconfdir}/init.d +mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}/%{_usr}/lib/%{name}/plugins mkdir -p %{buildroot}/%{_usr}/share/%{name}/plugins mkdir -p %{buildroot}/%{_mandir}/man1 -cp bin/%{name}d %{buildroot}/usr/bin +cp bin/* %{buildroot}/usr/bin cp etc/%{name}/*.conf %{buildroot}/%{_sysconfdir}/%{name} -cp etc/%{name}/plugins/*.conf %{buildroot}/%{_sysconfdir}/%{name}/plugins -cp src/plugins/*.py %{buildroot}/%{_usr}/share/%{name}/plugins +cp etc/sysconfig/%{name}d %{buildroot}/%{_sysconfdir}/sysconfig cp docs/man/man1/* %{buildroot}/%{_mandir}/man1 +cp plugins/demo.conf %{buildroot}/%{_sysconfdir}/%{name}/plugins +cp plugins/demo.py %{buildroot}/%{_usr}/share/%{name}/plugins + %if 0%{?systemd} cp usr/lib/systemd/system/* %{buildroot}/%{_unitdir} %else @@ -83,21 +85,24 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/conf.d/ +%dir %{_sysconfdir}/%{name}/plugins/ %dir %{_usr}/lib/%{name}/plugins/ %dir %{_usr}/share/%{name}/plugins/ -%dir %{_sysconfdir}/%{name}/conf.d/ %{python_sitelib}/%{name}/agent/ %{_bindir}/%{name}d %if 0%{?systemd} -%attr(755,root,root) %{_unitdir}/%{name}d.service +%attr(644,root,root) %{_unitdir}/%{name}d.service %else %attr(755,root,root) %{_sysconfdir}/init.d/%{name}d %endif +%attr(644,root,root) %{_sysconfdir}/sysconfig/%{name}d %config(noreplace) %{_sysconfdir}/%{name}/agent.conf -%config(noreplace) %{_sysconfdir}/%{name}/plugins/builtin.conf -%{_usr}/share/%{name}/plugins/builtin.* +%config(noreplace) %{_sysconfdir}/%{name}/plugins/demo.conf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}d +%{_usr}/share/%{name}/plugins/demo.* %doc LICENSE -%doc %{_mandir}/man1/gofer* +%doc %{_mandir}/man1/goferd.* %post %if 0%{?systemd} @@ -127,7 +132,6 @@ fi %package -n python-%{name} Summary: Gofer python lib modules Group: Development/Languages -Obsoletes: %{name}-lib BuildRequires: python Requires: pam %if 0%{?rhel} && 0%{?rhel} < 6 @@ -152,6 +156,25 @@ Provides gofer python lib modules. %doc LICENSE +# --- tools ------------------------------------------------------------------ + +%package -n %{name}-tools +Summary: Gofer tools +Group: Development/Languages +BuildRequires: python +Requires: python-%{name} = %{version} + +%description -n%{name}-tools +Provides the gofer tools. + +%files -n %{name}-tools +%defattr(-,root,root,-) +%{python_sitelib}/%{name}/tools/ +%{_bindir}/%{name} +%doc LICENSE +%doc %{_mandir}/man1/gofer.* + + # --- python-qpid messaging adapter ------------------------------------------ %package -n python-%{name}-qpid @@ -160,6 +183,9 @@ Group: Development/Languages BuildRequires: python Requires: python-%{name} = %{version} Requires: python-qpid >= 0.18 +%if 0%{?rhel} && 0%{?rhel} < 6 +Requires: python-ssl +%endif %description -n python-%{name}-qpid Provides the gofer qpid messaging adapter package. @@ -176,7 +202,7 @@ Summary: Gofer Qpid proton messaging adapter python package Group: Development/Languages BuildRequires: python Requires: python-%{name} = %{version} -Requires: python-qpid-proton >= 0.8 +Requires: python-qpid-proton >= 0.9-5 %description -n python-%{name}-proton Provides the gofer qpid proton messaging adapter package. @@ -202,71 +228,51 @@ Provides the gofer amqp messaging adapter package. %{python_sitelib}/%{name}/messaging/adapter/amqp %doc LICENSE -# --- plugin: system --------------------------------------------------------- - -%package -n gofer-system -Summary: The system plug-in -Group: Development/Languages -BuildRequires: python -Requires: %{name} >= %{version} - -%description -n gofer-system -Provides the system plug-in. -The system plug-in provides system functionality. - -%files -n gofer-system -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/system.conf -%{_usr}/share/%{name}/plugins/system.* -%doc LICENSE - - -# --- plugin: virt ----------------------------------------------------------- - -%package -n gofer-virt -Summary: The virtualization plugin -Group: Development/Languages -BuildRequires: python -Requires: libvirt-python -Requires: %{name} >= %{version} - -%description -n gofer-virt -Provides the virtualization plugin. -This plug-in provides RMI access to libvirt functionality. - -%files -n gofer-virt -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/virt.conf -%{_usr}/share/%{name}/plugins/virt.* -%doc LICENSE - - -# --- plugin: package -------------------------------------------------------- - -%package -n gofer-package -Summary: The package (RPM) plugin -Group: Development/Languages -BuildRequires: python -Requires: yum -Requires: %{name} >= %{version} - -%description -n gofer-package -Provides the package plugin. -This plug-in provides RMI access to package (RPM) management. - -%files -n gofer-package -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/package.conf -%{_usr}/share/%{name}/plugins/package.* -%doc LICENSE - # --- changelog -------------------------------------------------------------- %changelog -* Wed Jun 17 2015 Fedora Release Engineering - 2.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Mon Jan 11 2016 Jeff Ortel 2.7.1-1 +- Reference plugins relocated and not packaged. (jortel@redhat.com) +- Support runtime plugin load/unload/reload. (jortel@redhat.com) +- Add manager. (jortel@redhat.com) +- Add gofer CLI for management and RMI. (jortel@redhat.com) +- Renamed builtin plugin to demo plugin. (jortel@redhat.com) +- Fix -f option passed to goferd. (jortel@redhat.com) +- Resend logic removed from proton reliability. (jortel@redhat.com) +- Added a ton of unit tests. (jortel@redhat.com) +- Run goferd optimized by default (sean.myers@redhat.com) +- Add additional logging in adapter reliability. (jortel@redhat.com) +- Improved handling of malformed AMQP messages. (jortel@redhat.com) +- In agent.rmi, add transactions; discard request for plugins without URL + configured. (jortel@redhat.com) +- Support proton heartbeats; requires proton >= 0.9-5. (jortel@redhat.com) +- Persistent canceled tracking. (jortel@redhat.com) +- Authorization deprectated. (jortel@redhat.com) +- Using utf8() instead of: str(). (jortel@redhat.com) +* Mon Mar 09 2015 Jeff Ortel 2.6.0-1 +- Support one-time actions. (jortel@redhat.com) +- Support authenticator in the plugin descriptor. (jortel@redhat.com) +- Support plugin monitoring. (jortel@redhat.com) +- Support dynamic plugin loading, reloading, unloading. +- Support services in system plugin. (jortel@redhat.com) +- Support forwarding/accepting. (jortel@redhat.com) +- Support comprehensive broker connection clean up. +- Requires: python-ssl only on RHEL 5. (jortel@redhat.com) +- 1198797 - Fixed recursion in adapter reliability logic. (jortel@redhat.com) +- Fix not-authenticated error message. (jortel@redhat.com) +- Fix systemd unit permissions. (jortel@redhat.com) +- Window deprecated (jortel@redhat.com) + +* Fri Feb 20 2015 Jeff Ortel 2.5.3-1 +- Broker renamed: Connector. (jortel@redhat.com) +- Plugin not-found logged and discarded. (jortel@redhat.com) + +* Fri Feb 20 2015 Jeff Ortel 2.5.2-1 +- proton 0.9-1.20150219 compat; proton.reactors renamed: proton.reactor. + (jortel@redhat.com) +- 1192563 - validate SSL file paths. (jortel@redhat.com) * Thu Feb 12 2015 Jeff Ortel 2.5.1-1 - Fix virtual hosts. (jortel@redhat.com) diff --git a/sources b/sources index eb89420..bea9d24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd8c1e520f5fe763f61502674e4261ed gofer-2.5.1.tar.gz +5d8d3d327e1457b53362f2685b6fc41b gofer-2.7.1.tar.gz