diff --git a/.gitignore b/.gitignore index 49b38c3..aa01034 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ syslog-ng_3.1.1.tar.gz /syslog-ng_3.2.5.tar.gz /syslog-ng-3.3.6.91-20121008-v3.3.6.91.tar.gz /syslog-ng_3.3.7.tar.gz +/syslog-ng_3.3.8.tar.gz diff --git a/sources b/sources index 534aa3a..a7cbcd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -426f34985ab0ce4d46b5bd7a4c5fcf63 syslog-ng_3.3.7.tar.gz +df8910af42336988f209cbe61c996e1d syslog-ng_3.3.8.tar.gz diff --git a/syslog-ng.spec b/syslog-ng.spec index c45819a..79223c4 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -1,9 +1,9 @@ %global evtlog_ver 0.2.12 -%global ivykis_ver 0.30.4 +%global ivykis_ver 0.30.5 Name: syslog-ng -Version: 3.3.7 -Release: 3%{?dist} +Version: 3.3.8 +Release: 1%{?dist} Summary: Next-generation syslog server Group: System Environment/Daemons @@ -98,8 +98,6 @@ developing applications that use %{name}. /usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \ %{__mv} -f AUTHORS.conv AUTHORS -# create an ld.so conf file -echo %{_libdir}/%{name} > %{name}-%{_arch}.conf %build %configure \ @@ -110,6 +108,7 @@ echo %{_libdir}/%{name} > %{name}-%{_arch}.conf --with-module-dir=/%{_libdir}/%{name} \ --with-systemdsystemunitdir=%{_unitdir} \ --with-ivykis=system \ + --with-embedded-crypto \ --enable-ipv6 \ --enable-tcp-wrapper \ --enable-pcre \ @@ -147,10 +146,6 @@ make DESTDIR=%{buildroot} install %{__install} -p -m 644 config.h %{buildroot}%{_includedir}/%{name} %{__install} -p -m 644 lib/*.h %{buildroot}%{_includedir}/%{name} -# install the ld.so conf file -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/ld.so.conf.d/ -%{__install} -p -m 644 %{name}-%{_arch}.conf %{buildroot}%{_sysconfdir}/ld.so.conf.d/ - # install vim files %{__install} -d -m 755 %{buildroot}%{_datadir}/%{name} %{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name} @@ -219,7 +214,6 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/modules.conf %config(noreplace) %{_sysconfdir}/%{name}/scl.conf %config(noreplace) %{_sysconfdir}/logrotate.d/syslog -%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %{_unitdir}/%{name}.service %dir %{_sharedstatedir}/%{name} @@ -259,6 +253,11 @@ fi %changelog +* Thu Jan 17 2013 Jose Pedro Oliveira - 3.3.8-1 +- Update to 3.3.8 +- Use the new --with-embedded-crypto configure's option in order to + avoid shipping a ld.so.conf file + * Fri Nov 30 2012 Jose Pedro Oliveira - 3.3.7-3 - Introduce the new systemd-rpm macros (#850332)