rpms/syslog-ng
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer disable the SSL tests.

Browse Source
This commit is contained in:
Jose Pedro Oliveira 2012-04-16 06:15:38 +01:00
parent e3631080b0
commit fdd7fbb005
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
syslog-ng-3.2.4-disable-ssl-tests.patch
View File

@ -1,18 +0,0 @@
diff -ruN syslog-ng-3.2.4/tests/functional/func_test.py syslog-ng-3.2.4-modified/tests/functional/func_test.py
--- syslog-ng-3.2.4/tests/functional/func_test.py 2010-07-09 11:19:27.000000000 +0100
+++ syslog-ng-3.2.4-modified/tests/functional/func_test.py 2011-05-16 20:47:48.586752031 +0100
@@ -60,11 +60,12 @@
# import test modules
import test_file_source
import test_filters
-import test_input_drivers
+#import test_input_drivers
import test_performance
import test_sql
-tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
+#tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
+tests = (test_sql, test_file_source, test_filters, test_performance)
init_env()
seed_rnd()

15
syslog-ng.spec
View File

@ -2,7 +2,7 @@
Name: syslog-ng Name: syslog-ng
Version: 3.2.5 Version: 3.2.5
Release: 11%{?dist} Release: 12%{?dist}
Summary: Next-generation syslog server Summary: Next-generation syslog server
Group: System Environment/Daemons Group: System Environment/Daemons
@ -12,11 +12,10 @@ Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{versio
Source1: syslog-ng.conf Source1: syslog-ng.conf
Source2: syslog-ng.logrotate Source2: syslog-ng.logrotate
Patch0: syslog-ng-3.2.4-disable-ssl-tests.patch Patch0: syslog-ng-3.2.5-syslog-ng.service.patch
Patch1: syslog-ng-3.2.5-syslog-ng.service.patch Patch1: syslog-ng-3.3.4-afunix.c-diagnostic-messages.patch
Patch2: syslog-ng-3.3.4-afunix.c-diagnostic-messages.patch Patch2: syslog-ng-3.2.5-tests-functional-control.py.patch
Patch3: syslog-ng-3.2.5-tests-functional-control.py.patch Patch3: syslog-ng-3.2.5-tests-functional-sql-test.patch
Patch4: syslog-ng-3.2.5-tests-functional-sql-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -83,7 +82,6 @@ developing applications that use %{name}.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# fix perl path # fix perl path
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@ -262,6 +260,9 @@ fi
%changelog %changelog
* Mon Apr 16 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-12
- No longer disable the SSL tests.
* Mon Apr 16 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-11 * Mon Apr 16 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-11
- Correct the path in syslog-ng-3.2.5-syslog-ng.service.patch. - Correct the path in syslog-ng-3.2.5-syslog-ng.service.patch.