[dspam/el5: 18/18] Merge branch 'el6' into el5
by Nathanael Noblet
commit dcc8ee4e7652dbe391274e627a50fc6eff8f6da7
Merge: 86ab539 3327938
Author: Nathanael D. Noblet <nathanael(a)gnat.ca>
Date: Wed Jul 13 13:31:31 2011 -0600
Merge branch 'el6' into el5
dspam-3.9.0-configure.patch | 194 -------------------------------------------
dspam-init.d | 13 ++--
dspam-sysconfig | 3 +-
dspam-tmpfiles | 1 +
dspam.spec | 30 ++++++--
5 files changed, 33 insertions(+), 208 deletions(-)
---
12 years, 10 months
[dspam/el5] (18 commits) ...Merge branch 'el6' into el5
by Nathanael Noblet
Summary of changes:
a1d1ee3... inital F-12 import (*)
d9fa18f... updated dspam cron file (*)
33e7cf3... fixed initscript ordering bug (*)
42bd353... Initialize branch EL-6 for dspam (*)
4c6472b... data dir permissions (*)
db043f1... dist-git conversion (*)
82a2e8d... Merge remote branch 'origin/master' into el6/master (*)
45fc273... Merge remote branch 'origin/master' into el6/master (*)
0ebdcd2... Merge remote branch 'origin/master' into el6/master (*)
cdc77fe... Merge remote branch 'origin/master' into el6/master (*)
34dccaa... Merge remote-tracking branch 'origin/master' into el6 (*)
6b8829c... Merge remote-tracking branch 'origin/master' into el6 (*)
d28a6b7... remove configure patch since bash is fixed (*)
345c5db... rebuilt for libmysqlclient soname bump (*)
18bcc05... added tmpfiles & rpath fix (*)
9424dcf... start as dspam user (*)
3327938... Merge branch 'f15' into el6 (*)
dcc8ee4... Merge branch 'el6' into el5
(*) This commit already existed in another branch; no separate mail sent
12 years, 10 months
[dspam/el6: 5/5] Merge branch 'f15' into el6
by Nathanael Noblet
commit 33279386edb873e3b21f95c295a230245dca45b3
Merge: 6b8829c 9424dcf
Author: Nathanael D. Noblet <nathanael(a)gnat.ca>
Date: Wed Jul 13 13:30:44 2011 -0600
Merge branch 'f15' into el6
dspam-3.9.0-configure.patch | 194 -------------------------------------------
dspam-init.d | 13 ++--
dspam-sysconfig | 3 +-
dspam-tmpfiles | 1 +
dspam.spec | 26 +++++-
5 files changed, 31 insertions(+), 206 deletions(-)
---
12 years, 10 months
[dspam/el6] (5 commits) ...Merge branch 'f15' into el6
by Nathanael Noblet
Summary of changes:
d28a6b7... remove configure patch since bash is fixed (*)
345c5db... rebuilt for libmysqlclient soname bump (*)
18bcc05... added tmpfiles & rpath fix (*)
9424dcf... start as dspam user (*)
3327938... Merge branch 'f15' into el6
(*) This commit already existed in another branch; no separate mail sent
12 years, 10 months
[dspam/f14: 5/5] Merge branch 'f15' into f14
by Nathanael Noblet
commit bda66417ac5ea90bd6ce2978735dfdef02842826
Merge: df00717 9424dcf
Author: Nathanael D. Noblet <nathanael(a)gnat.ca>
Date: Wed Jul 13 13:29:53 2011 -0600
Merge branch 'f15' into f14
dspam-3.9.0-configure.patch | 194 -------------------------------------------
dspam-init.d | 13 ++--
dspam-sysconfig | 3 +-
dspam-tmpfiles | 1 +
dspam.spec | 26 +++++-
5 files changed, 31 insertions(+), 206 deletions(-)
---
12 years, 10 months
[dspam/f14] (5 commits) ...Merge branch 'f15' into f14
by Nathanael Noblet
Summary of changes:
d28a6b7... remove configure patch since bash is fixed (*)
345c5db... rebuilt for libmysqlclient soname bump (*)
18bcc05... added tmpfiles & rpath fix (*)
9424dcf... start as dspam user (*)
bda6641... Merge branch 'f15' into f14
(*) This commit already existed in another branch; no separate mail sent
12 years, 10 months
[dspam/f15] start as dspam user
by Nathanael Noblet
commit 9424dcf0793d78e198c379aa8aac31d9685b17ba
Author: Nathanael D. Noblet <nathanael(a)gnat.ca>
Date: Wed Jul 13 13:28:54 2011 -0600
start as dspam user
dspam-init.d | 13 ++++++-------
dspam-sysconfig | 3 ++-
dspam.spec | 5 ++++-
3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/dspam-init.d b/dspam-init.d
index 8b331b0..eae9f75 100644
--- a/dspam-init.d
+++ b/dspam-init.d
@@ -23,6 +23,7 @@ if [ -f /etc/sysconfig/dspam ] ; then
. /etc/sysconfig/dspam
else
DSPAM_BIN="/usr/bin/dspam"
+ DSPAM_USER="dspam"
fi
# Check that networking is up.
@@ -36,13 +37,11 @@ start() {
if [ -f /var/lock/subsys/dspam ]; then
RETVAL=0
else
- ${DSPAM_BIN} --daemon 2>/dev/null&
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- echo_success
- else
- echo_failure
- fi
+ daemon --check ${DSPAM_BIN} --user ${DSPAM_USER} ${DSPAM_BIN} --daemon 2>/dev/null&
+
+ sleep 1
+
+ status ${prog} &> /dev/null && echo_success || echo_failure
fi
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dspam
diff --git a/dspam-sysconfig b/dspam-sysconfig
index 986b490..dbe961a 100644
--- a/dspam-sysconfig
+++ b/dspam-sysconfig
@@ -1,2 +1,3 @@
# Location of dspam binary
-DSPAM_BIN="/usr/bin/dspam"
\ No newline at end of file
+DSPAM_BIN="/usr/bin/dspam"
+DSPAM_USER="dspam"
\ No newline at end of file
diff --git a/dspam.spec b/dspam.spec
index ff464c6..93255a3 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -11,7 +11,7 @@
Summary: A library and Mail Delivery Agent for Bayesian SPAM filtering
Name: dspam
Version: 3.9.0
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -376,6 +376,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
%changelog
+* Wed July 13 2011 Nathanael Noblet <nathanael(a)gnat.ca> - 3.9.0-21
+- Start daemon as dspam user
+
* Wed May 25 2011 Nathanael Noblet <nathanael(a)gnat.ca> - 3.9.0-20
- add tmpfile for /var/run/dspam
- remove rpaths that suddenly show up in F15
12 years, 10 months
[perl-Net-SSLeay] drop obsolete BRs
by Iain Arnell
commit 6a58efa8d736d5fdcebbe1ce3928b6f3f36c4367
Author: Iain Arnell <iarnell(a)gmail.com>
Date: Wed Jul 13 18:11:43 2011 +0200
drop obsolete BRs
perl-Net-SSLeay.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index 9c5b9fb..35487cc 100644
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -1,6 +1,6 @@
Name: perl-Net-SSLeay
Version: 1.36
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Perl extension for using OpenSSL
Group: Development/Libraries
License: OpenSSL
@@ -9,9 +9,9 @@ Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(ExtUtils::MakeMaker), openssl-devel
-BuildRequires: perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel)
+BuildRequires: perl(MIME::Base64)
BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod)
-BuildRequires: perl(Test::Warn), perl(Tree::DAG_Node)
+BuildRequires: perl(Test::Warn)
# don't "provide" private Perl libs or the redundant unversioned perl(Net::SSLeay) one
%global _use_internal_dependency_generator 0
@@ -67,6 +67,9 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \
%{_mandir}/man3/Net::SSLeay*.3*
%changelog
+* Wed Jul 13 2011 Iain Arnell <iarnell(a)gmail.com> 1.36-5
+- drop obsolete BRs Array::Compare, Sub::Uplevel, Tree::DAG_Node
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.36-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 10 months
[perl-Catalyst-Plugin-Session] drop circular build deps
by Iain Arnell
commit e046513ecef896ddc6cd430f3ee2506be582dfaa
Author: Iain Arnell <iarnell(a)gmail.com>
Date: Wed Jul 13 18:02:27 2011 +0200
drop circular build deps
perl-Catalyst-Plugin-Session.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/perl-Catalyst-Plugin-Session.spec b/perl-Catalyst-Plugin-Session.spec
index ca5188a..903a5bf 100644
--- a/perl-Catalyst-Plugin-Session.spec
+++ b/perl-Catalyst-Plugin-Session.spec
@@ -1,7 +1,7 @@
Name: perl-Catalyst-Plugin-Session
Summary: Catalyst generic session plugin
Version: 0.31
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Source0: http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Sess...
@@ -10,7 +10,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
BuildArch: noarch
BuildRequires: perl(Catalyst::Runtime) >= 5.71001
-BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie) >= 0.03
BuildRequires: perl(Digest)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(File::Spec)
@@ -24,8 +23,10 @@ BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(Test::Pod)
-BuildRequires: perl(Test::WWW::Mechanize::Catalyst) >= 0.51
BuildRequires: perl(Tie::RefHash) >= 1.34
+# these cause circular builddeps
+#BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie) >= 0.03
+#BuildRequires: perl(Test::WWW::Mechanize::Catalyst) >= 0.51
Requires: perl(Catalyst::Runtime) >= 5.71001
Requires: perl(Digest)
@@ -81,6 +82,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Wed Jul 13 2011 Iain Arnell <iarnell(a)gmail.com> 0.31-2
+- drop additional BRs again - they cause circular build deps
+
* Sun Mar 13 2011 Iain Arnell <iarnell(a)gmail.com> 0.31-1
- update to latest upstream version
- clean up spec for modern rpmbuild
12 years, 10 months