rpms/milter-greylist/devel sources, 1.8, 1.9 milter-greylist.spec, 1.14, 1.15
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Tue Apr 17 18:28:38 UTC 2007
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8929
Modified Files:
sources milter-greylist.spec
Log Message:
- updated to 3.0
- enabled dnsrbl
- removed -initng subpackage
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 18 Sep 2006 06:32:54 -0000 1.8
+++ sources 17 Apr 2007 18:28:04 -0000 1.9
@@ -1 +1 @@
-8582b573a90b2092654cc34fbe8ab6ee milter-greylist-2.1.12.tgz
+ffdd5588c78a405c107d4c8a40c7e01a milter-greylist-3.0.tgz
Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- milter-greylist.spec 4 Oct 2006 23:07:13 -0000 1.14
+++ milter-greylist.spec 17 Apr 2007 18:28:04 -0000 1.15
@@ -2,18 +2,13 @@
## This package accepts the following switches:
## --with spf ... enable SPF support
-## --without minit ... disable creation of 'minit' subpackage
-## --without initng ... disable creation of 'initng' subpackage
## Fedora Extras specific customization below...
%bcond_without fedora
-%{!?_with_minit:%global _without_minit --without minit}
-%{!?_with_initng:%global _without_initng --without initng}
+%bcond_with spf
##
%global username grmilter
-%global minitdir %_sysconfdir/minit
-%global minitsvcdir %minitdir/services/grmilter
%global vardir %_var/lib/%name
%global dbdir %vardir/db
%global rundir %_var/run/%name
@@ -23,8 +18,8 @@
Summary: Milter for greylisting, the next step in the spam control war
Name: milter-greylist
-Version: 2.1.12
-Release: %release_func 3
+Version: 3.0
+Release: %release_func 0
License: BSD w/ advertising
Group: System Environment/Daemons
URL: http://hcpnet.free.fr/milter-greylist/
@@ -32,10 +27,11 @@
Patch0: milter-greylist-2.0.2-sysv.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
-Provides: user(%username)
-Provides: group(%username)
+Provides: user(%username) = 7
+Provides: group(%username) = 7
BuildRequires: bison flex m4
-BuildRequires: sendmail-devel %{?_with_spf:libspf-devel}
+BuildRequires: bind-libbind-devel
+BuildRequires: sendmail-devel %{?with_spf:libspf-devel}
BuildRequires: fedora-usermgmt-devel
%{?FE_USERADD_REQ}
@@ -50,25 +46,6 @@
Requires(post): %__chkconfig
Requires(preun): %__chkconfig
-%package minit
-Summary: Minit initscripts for %name
-Group: System Environment/Daemons
-Source20: milter-greylist.params
-Provides: init(%name) = minit
-Requires: %name = %version-%release
-Requires(pre): minit-setup
-Requires(postun): minit-setup
-
-%package initng
-Summary: initng initscripts for %name
-Group: System Environment/Daemons
-Source30: milter-greylist.i
-Provides: init(%name) = initng
-Requires: %name = %version-%release
-Requires(pre): %_sysconfdir/initng %name
-Requires(preun): initng %name
-Requires(postun): initng %name
-
%description
Greylisting is a new method of blocking significant amounts of spam at
@@ -90,33 +67,13 @@
This package provides the SysV initscripts for the %name package.
-%description minit
-Greylisting is a new method of blocking significant amounts of spam at
-the mailserver level, but without resorting to heavyweight statistical
-analysis or other heuristical (and error-prone) approaches. Consequently,
-implementations are fairly lightweight, and may even decrease network
-traffic and processor load on your mailserver.
-
-This package provides the minit initscripts for the %name package.
-
-
-%description initng
-Greylisting is a new method of blocking significant amounts of spam at
-the mailserver level, but without resorting to heavyweight statistical
-analysis or other heuristical (and error-prone) approaches. Consequently,
-implementations are fairly lightweight, and may even decrease network
-traffic and processor load on your mailserver.
-
-This package provides the initng initscripts for the %name package.
-
-
%prep
%setup -q
%patch0 -p1 -b .sysv
-perl -pi -e 's!--rpath!--XXXX!g' configure
-sed -i -e 's!^\#user .*!user "%username"!;
- s!^\#socket !socket !' greylist.conf
+sed -i -e 's!--rpath!\0X!g' configure
+sed -i -e 's!^\#user .*!user "%username"!;
+ s!^\#socket !socket !' greylist.conf
for i in `find -type f`; do
sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
@@ -131,8 +88,12 @@
%define makeflags TEST=false BINDIR=%_sbindir
%build
%configure \
- --with-user=%username \
- %{?_with_spf:--with-libspf=/usr}
+ --with-user=%username \
+ --enable-dnsrbl \
+ --with-libbind \
+ --disable-drac \
+ --with-drac-db=%vardir/drac/drac.db \
+ %{?with_spf:--with-libspf=/usr}
## is not SMP safe :(
%__make %makeflags
@@ -141,27 +102,16 @@
%install
rm -rf $RPM_BUILD_ROOT
-%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%minitsvcdir,%rundir,%dbdir,%_var/run} \
- $RPM_BUILD_ROOT%_sysconfdir/initng/daemon
+%__install -d -m755 $RPM_BUILD_ROOT{%_initrddir,%rundir,%dbdir,%_var/run}
%__make DESTDIR=$RPM_BUILD_ROOT install %makeflags USER="$(id -u)"
%__install -p -m755 rc-redhat.sh $RPM_BUILD_ROOT%_initrddir/%name
-# the minit stuff
-ln -s %_sbindir/milter-greylist $RPM_BUILD_ROOT%minitsvcdir/run
-%__install -p -m644 %SOURCE20 $RPM_BUILD_ROOT%minitsvcdir/params
-touch $RPM_BUILD_ROOT%minitsvcdir/respawn
-
-# the initng stuff
-%__install -p -m644 %SOURCE30 $RPM_BUILD_ROOT%_sysconfdir/initng/daemon/milter-greylist.i
-
# create temporary files
touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
## Remove the unwanted init-methods
%{?_without_sysv: rm -rf $RPM_BUILD_ROOT%_initrddir}
-%{?_without_minit: rm -rf $RPM_BUILD_ROOT%_sysconfdir/minit}
-%{?_without_initng:rm -rf $RPM_BUILD_ROOT%_sysconfdir/initng}
%pre
@@ -187,16 +137,6 @@
test "$1" = 0 || %_initrddir/%name condrestart >/dev/null || :
-%preun initng
-test "$1" != 0 || {
- /sbin/ngc --stop daemon/milter-greylist &>/dev/null || :
- /sbin/ng-update del daemon/milter-greylist &>/dev/null || :
-}
-
-%postun initng
-test "$1" = 0 || /sbin/ngc --restart daemon/milter-greylist &>/dev/null || :
-
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -219,24 +159,17 @@
%config %_initrddir/*
%endif
-%if 0%{!?_without_initng:1}
-%files initng
- %defattr(-,root,root,-)
- %config %_sysconfdir/initng/daemon/*
-%endif
+%changelog
+* Tue Apr 17 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 3.0-1
+- updated to 3.0
+- enabled dnsrbl
+- removed -initng subpackage
-%if 0%{!?_without_minit:1}
-%files minit
- %defattr(-,root,root,-)
- %dir %minitsvcdir
- %minitsvcdir/run
- %minitsvcdir/respawn
- %config(noreplace) %minitsvcdir/params
-%endif
+* Tue Jan 30 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-3
+- removed -minit subpackage
-%changelog
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.1.12-3
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Sep 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.12-2
- updated to 2.1.12
More information about the scm-commits
mailing list