rpms/milter-greylist/devel milter-greylist-1.4-spfbool.patch, NONE, 1.1 milter-greylist-1.6-group.patch, NONE, 1.1 milter-greylist-1.6-rh.patch, NONE, 1.1 milter-greylist.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Thu Feb 3 10:13:36 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv27707/devel
Modified Files:
.cvsignore sources
Added Files:
milter-greylist-1.4-spfbool.patch
milter-greylist-1.6-group.patch milter-greylist-1.6-rh.patch
milter-greylist.spec
Log Message:
auto-import milter-greylist-1.6-1 on branch devel from milter-greylist-1.6-1.src.rpm
milter-greylist-1.4-spfbool.patch:
--- NEW FILE milter-greylist-1.4-spfbool.patch ---
2005-02-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
* spf.c: fix build issue with libspf
--- milter-greylist-1.4/spf.c.bool 2004-05-04 22:50:33.000000000 +0200
+++ milter-greylist-1.4/spf.c 2004-10-07 22:01:32.000000000 +0200
@@ -72,7 +72,7 @@
inet_ntop(AF_INET, in, addr, IPADDRLEN);
if ((p = SPF_init("milter-greylist", addr,
- NULL, NULL, NULL, FALSE, FALSE)) == NULL) {
+ NULL, NULL, NULL, SPF_FALSE, SPF_FALSE)) == NULL) {
syslog(LOG_ERR, "SPF_Init failed");
goto out1;
}
milter-greylist-1.6-group.patch:
--- NEW FILE milter-greylist-1.6-group.patch ---
2005-02-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
* milter-greylist.c: change gid and supplementary groups also
--- milter-greylist-1.6/milter-greylist.c.group 2004-11-27 15:43:17.000000000 +0100
+++ milter-greylist-1.6/milter-greylist.c 2005-02-03 10:43:26.349877397 +0100
@@ -48,6 +48,7 @@
#include <errno.h>
#include <fcntl.h>
#include <pwd.h>
+#include <grp.h>
#include <unistd.h>
/* On IRIX, <unistd.h> defines a EX_OK that clashes with <sysexits.h> */
@@ -866,6 +867,19 @@
exit(EX_OSERR);
}
+ if (initgroups(conf.c_user, pw->pw_gid) != 0) {
+ syslog(LOG_ERR, "%s: can not change supplementary groups: %s\n",
+ argv[0], strerror(errno));
+ exit(EX_OSERR);
+ }
+
+ if (setgid(pw->pw_gid) != 0 ||
+ setegid(pw->pw_gid) != 0) {
+ syslog(LOG_ERR, "%s: cannot change GID: %s\n",
+ argv[0], strerror(errno));
+ exit(EX_OSERR);
+ }
+
if ((setuid(pw->pw_uid) != 0) ||
(seteuid(pw->pw_uid) != 0)) {
syslog(LOG_ERR, "%s: cannot change UID: %s\n",
milter-greylist-1.6-rh.patch:
--- NEW FILE milter-greylist-1.6-rh.patch ---
2005-02-03 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
* rc-redhat.sh.in: fix startup position; '50' was too early
because important services like 'named' will be started
later (55). '79' seems to be a good value as sendmail is
started at '80'
--- milter-greylist-1.6/rc-redhat.sh.in.rh 2004-11-28 01:33:29.000000000 +0100
+++ milter-greylist-1.6/rc-redhat.sh.in 2005-02-03 09:49:42.277934116 +0100
@@ -2,7 +2,7 @@
# $Id: rc-redhat.sh.in,v 1.1 2004/11/28 00:33:29 manu Exp $
# init file for milter-greylist
#
-# chkconfig: - 50 50
+# chkconfig: - 79 21
# description: Milter Greylist Daemon
#
# processname: @BINDIR@/milter-greylist
--- NEW FILE milter-greylist.spec ---
## This package accepts the following switches:
## --with spf ... enable SPF support
## --with minit ... enable minit support
## Fedora Extras specific customization below...
%{!?release_func:%define release_func() %1}
##
%define username grmilter
%define minitdir %_sysconfdir/minit
%define minitsvcdir %minitdir/services/grmilter
%define vardir /var/lib/%name
%define dbdir %vardir/db
%define rundir %vardir/run
%define __chkconfig /sbin/chkconfig
Summary: A milter for greylisting, the Next Step in the Spam Control War
Name: milter-greylist
Version: 1.6
Release: %release_func 1
Epoch: 0
License: BSD w/ advertising
Group: System Environment/Daemon
URL: http://hcpnet.free.fr/milter-greylist/
Source0: ftp://ftp.espci.fr/pub/milter-greylist/%name-%version.tgz
Patch0: milter-greylist-1.6-rh.patch
Patch1: milter-greylist-1.6-group.patch
Patch2: milter-greylist-1.4-spfbool.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Requires(pre): fedora-usermgmt
Requires(postun): fedora-usermgmt
BuildRequires: bison flex m4
BuildRequires: sendmail-devel %{?_with_spf:libspf-devel}
%package sysv
Summary: The sysv-initscripts for %name
Group: System Environment/Daemon
Provides: init(%name) = sysv
Requires(preun): %name = %epoch:%version-%release
Requires(postun): %name = %epoch:%version-%release
Requires(preun): initscripts
Requires(postun): initscripts
Requires(post): %__chkconfig
Requires(preun): %__chkconfig
%package minit
Summary: The minit-initscripts for %name
Group: System Environment/Daemon
Provides: init(%name) = minit
Requires: %name = %epoch:%version-%release
Requires: %_sbindir/setuidgid
Requires(pre): minit-setup
Requires(postun): minit-setup
%description
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 a greylist filter for sendmail's milter API.
%description sysv
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 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.
%prep
%setup -q
%patch0 -p1 -b .rh
%patch1 -p1 -b .group
%patch2 -p1 -b .spfbool
perl -pi -e 's!(\$\{INSTALL\}.*\s)(\S+\s*)$!$1\${DESTDIR}$2!' Makefile.in
perl -pi -e 's!--rpath!--XXXX!g' configure
for i in `find -type f`; do
sed -e 's!/var/milter-greylist/milter-greylist.sock!%rundir/milter-greylist.sock!g;
s!/var/milter-greylist/greylist.db!%dbdir/greylist.db!g;
' "$i" >"$i.tmp"
cmp -s "$i" "$i.tmp" || cat "$i.tmp" >"$i"
rm -f "$i".tmp
done
%define makeflags TEST=false BINDIR=%_sbindir
%build
%configure \
--with-user=%username \
%{?_with_spf:--with-libspf=/usr}
## is not SMP safe :(
%__make %makeflags
%install
rm -rf $RPM_BUILD_ROOT
%__install -d -m755 \
$RPM_BUILD_ROOT{/etc/mail,%rundir,%dbdir,%_initrddir,%minitsvcdir,%_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
touch $RPM_BUILD_ROOT%minitsvcdir/respawn
cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params
-D
-u%username
-p%rundir/milter-greylist.sock
EOF
# Short hack...
%{!?_with_minit:rm -rf $RPM_BUILD_ROOT%minitdir}
# create temporary files
touch $RPM_BUILD_ROOT%rundir/milter-greylist.sock
touch $RPM_BUILD_ROOT%_var/run/milter-greylist.pid
%pre
/usr/sbin/fedora-groupadd 7 -r %username &>/dev/null || :
/usr/sbin/fedora-useradd 7 -r -s /sbin/nologin -M -d %vardir \
-c 'Greylist-milter user' -g %username %username &>/dev/null || :
%postun
test "$1" != 0 || /usr/sbin/fedora-userdel %username &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :
%post sysv
%__chkconfig --add %name
%preun sysv
test "$1" != 0 || %__chkconfig --del %name
test "$1" != 0 || %_initrddir/%name stop >/dev/null || :
%postun sysv
test "$1" = 0 || %_initrddir/%name condrestart >/dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc ChangeLog README
%_mandir/man*/*
%attr(0640,root,%username) %config(noreplace) /etc/mail/greylist.conf
%dir %attr(0751,%username,%username) %vardir
%dir %attr(0770,root,%username) %dbdir
%dir %attr(0700,%username,root) %rundir
%_sbindir/*
%ghost %rundir/milter-greylist.sock
%ghost %_var/run/milter-greylist.pid
%files sysv
%defattr(-,root,root,-)
%config %_initrddir/*
%if 0%{?_with_minit:1}
%files minit
%defattr(-,root,root,-)
%dir %minitsvcdir
%minitsvcdir/run
%minitsvcdir/respawn
%config(noreplace) %minitsvcdir/params
%endif
%changelog
* Thu Feb 3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.6
- updated to 1.6
* Thu Oct 7 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4-0.fdr.2
- rebuilt
- applied patch to build with libspf-1.0.0
* Tue Jun 15 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4-0.fdr.1
- updated to 1.4
* Fri Jun 11 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.3.9-0.fdr.1
- updated to 1.3.9
* Thu Apr 29 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.2.1-1
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Feb 2005 10:12:54 -0000 1.1
+++ .cvsignore 3 Feb 2005 10:13:34 -0000 1.2
@@ -0,0 +1 @@
+milter-greylist-1.6.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Feb 2005 10:12:54 -0000 1.1
+++ sources 3 Feb 2005 10:13:34 -0000 1.2
@@ -0,0 +1 @@
+9830e3a13aadf851a799131d9a40e931 milter-greylist-1.6.tgz
More information about the fedora-extras-commits
mailing list