diff --git a/.cvsignore b/.cvsignore index 8ecceea..36f3bae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ prelude-correlator-0.9.0-beta2.tar.gz prelude-correlator-0.9.0-beta3.tar.gz prelude-correlator-0.9.0-beta4.tar.gz prelude-correlator-0.9.0-beta6.tar.gz +prelude-correlator-0.9.0-beta8.tar.gz diff --git a/prelude-correlator-0.9.0-beta6-dshield.patch b/prelude-correlator-0.9.0-beta6-dshield.patch deleted file mode 100644 index 7df1c1f..0000000 --- a/prelude-correlator-0.9.0-beta6-dshield.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur prelude-correlator-0.9.0-beta6.orig/setup.py prelude-correlator-0.9.0-beta6/setup.py ---- prelude-correlator-0.9.0-beta6.orig/setup.py 2009-07-10 11:31:34.000000000 -0400 -+++ prelude-correlator-0.9.0-beta6/setup.py 2009-07-13 10:54:54.000000000 -0400 -@@ -11,31 +11,6 @@ - PRELUDE_CORRELATOR_VERSION = "0.9.0-beta6" - - --class my_sdist(sdist): -- def __init__(self, *args, **kwargs): -- import httplib -- -- fin = os.popen('git log --summary --stat --no-merges --date=short', 'r') -- fout = open('ChangeLog', 'w') -- fout.write(fin.read()) -- fout.close() -- -- print "Downloading DShield database, this might take a while..." -- -- con = httplib.HTTPConnection("www.dshield.org") -- con.request("GET", "/ipsascii.html?limit=10000") -- r = con.getresponse() -- if r.status != 200: -- raise Exception, "Could not download DShield host list, error %d" % r.status -- -- fd = open("PreludeCorrelator/plugins/dshield.dat", "w") -- fd.write(r.read()) -- fd.close() -- -- sdist.__init__(self, *args) -- -- -- - class my_install(install): - def __install_data(self): - data_files = self.distribution.data_files -@@ -145,5 +120,5 @@ - data_files = data_files, - package_data = package_data, - -- cmdclass = { 'sdist': my_sdist, 'install': my_install } -+ cmdclass = { 'install': my_install } - ) diff --git a/prelude-correlator-0.9.0-beta6-setup.patch b/prelude-correlator-0.9.0-beta6-setup.patch deleted file mode 100644 index 20ba569..0000000 --- a/prelude-correlator-0.9.0-beta6-setup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur prelude-correlator-0.9.0-beta6.orig/setup.py prelude-correlator-0.9.0-beta6/setup.py ---- prelude-correlator-0.9.0-beta6.orig/setup.py 2009-07-10 11:31:34.000000000 -0400 -+++ prelude-correlator-0.9.0-beta6/setup.py 2009-07-10 11:32:18.000000000 -0400 -@@ -48,7 +48,7 @@ - - root = self.root or "" - for dir, files in data_files: -- dir = os.path.abspath(os.path.join(root, prefix, dir)) -+ dir = os.path.abspath(root + os.sep + os.path.join(root, prefix, dir)) - - self.mkpath(dir) - for f in files: diff --git a/prelude-correlator.spec b/prelude-correlator.spec index 4c31b14..f736dc9 100644 --- a/prelude-correlator.spec +++ b/prelude-correlator.spec @@ -1,11 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This is temporary while its in beta -%define prelude_rel beta6 +%define prelude_rel beta8 Name: prelude-correlator Version: 0.9.0 -Release: 0.9.%{prelude_rel}%{?dist} +Release: 0.10.%{prelude_rel}%{?dist} Summary: Real time correlator of events received by Prelude Manager Group: Applications/Internet @@ -13,8 +13,6 @@ License: GPLv2+ URL: http://www.prelude-ids.com Source0: http://www.prelude-ids.com/download/releases/prelude-correlator/%{name}-%{version}-%{prelude_rel}.tar.gz Source1: prelude-correlator.init -Patch1: prelude-correlator-0.9.0-beta6-setup.patch -Patch2: prelude-correlator-0.9.0-beta6-dshield.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel python-setuptools @@ -38,8 +36,6 @@ correlation rules. %prep %setup -q -n %{name}-%{version}-%{prelude_rel} -%patch1 -p1 -%patch2 -p1 %build @@ -84,6 +80,9 @@ fi %{python_sitelib}/prelude_correlator*.egg-info %changelog +* Tue Nov 03 2009 Steve Grubb - 0.9.0-0.10.beta8 +- New beta release + * Sun Jul 26 2009 Fedora Release Engineering - 0.9.0-0.9.beta6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index c11efc1..c221f4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29f3c3ce5baf43586ec4a4841494cdd0 prelude-correlator-0.9.0-beta6.tar.gz +ff77f83cb0f1b4bdc3caa847fc815e04 prelude-correlator-0.9.0-beta8.tar.gz