- fix init script LSB compliance (#528151)
- update pflogsumm to 1.1.2 - require Date::Calc for pflogsumm (#536678) - fix some rpmlint warnings
This commit is contained in:
parent
54c4158469
commit
761db69eec
@ -1,2 +1,2 @@
|
|||||||
pflogsumm-1.1.1.tar.gz
|
|
||||||
postfix-2.6.5.tar.gz
|
postfix-2.6.5.tar.gz
|
||||||
|
pflogsumm-1.1.2.tar.gz
|
||||||
|
14
pflogsumm-1.1.2-datecalc.patch
Normal file
14
pflogsumm-1.1.2-datecalc.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up pflogsumm-1.1.2/pflogsumm.pl.datecalc pflogsumm-1.1.2/pflogsumm.pl
|
||||||
|
--- pflogsumm-1.1.2/pflogsumm.pl.datecalc 2008-06-29 15:46:01.000000000 +0200
|
||||||
|
+++ pflogsumm-1.1.2/pflogsumm.pl 2010-01-29 13:53:37.000000000 +0100
|
||||||
|
@@ -359,8 +359,8 @@ Copyright (C) 1998-2007 by James S. Seym
|
||||||
|
use strict;
|
||||||
|
use locale;
|
||||||
|
use Getopt::Long;
|
||||||
|
-eval { require Date::Calc };
|
||||||
|
-my $hasDateCalc = $@ ? 0 : 1;
|
||||||
|
+require Date::Calc;
|
||||||
|
+my $hasDateCalc = 1;
|
||||||
|
|
||||||
|
my $mailqCmd = "mailq";
|
||||||
|
my $release = "1.1.2";
|
@ -33,13 +33,15 @@
|
|||||||
|
|
||||||
RETVAL=0
|
RETVAL=0
|
||||||
prog="postfix"
|
prog="postfix"
|
||||||
|
lockfile=/var/lock/subsys/$prog
|
||||||
|
pidfile=/var/spool/postfix/pid/master.pid
|
||||||
|
|
||||||
ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
|
ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
|
||||||
|
|
||||||
# Script to update chroot environment
|
# Script to update chroot environment
|
||||||
CHROOT_UPDATE=/etc/postfix/chroot-update
|
CHROOT_UPDATE=/etc/postfix/chroot-update
|
||||||
|
|
||||||
status master >/dev/null 2>&1
|
status -p $pidfile -l $(basename $lockfile) master >/dev/null 2>&1
|
||||||
running=$?
|
running=$?
|
||||||
|
|
||||||
conf_check() {
|
conf_check() {
|
||||||
@ -64,6 +66,7 @@ make_aliasesdb() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
|
[ "$EUID" != "0" ] && exit 4
|
||||||
# Check that networking is up.
|
# Check that networking is up.
|
||||||
[ ${NETWORKING} = "no" ] && exit 1
|
[ ${NETWORKING} = "no" ] && exit 1
|
||||||
conf_check
|
conf_check
|
||||||
@ -73,18 +76,19 @@ start() {
|
|||||||
[ -x $CHROOT_UPDATE ] && $CHROOT_UPDATE
|
[ -x $CHROOT_UPDATE ] && $CHROOT_UPDATE
|
||||||
/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"$prog start"
|
/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"$prog start"
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix
|
[ $RETVAL -eq 0 ] && touch $lockfile
|
||||||
echo
|
echo
|
||||||
return $RETVAL
|
return $RETVAL
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
|
[ "$EUID" != "0" ] && exit 4
|
||||||
conf_check
|
conf_check
|
||||||
# Stop daemons.
|
# Stop daemons.
|
||||||
echo -n $"Shutting down postfix: "
|
echo -n $"Shutting down postfix: "
|
||||||
/usr/sbin/postfix stop 2>/dev/null 1>&2 && success || failure $"$prog stop"
|
/usr/sbin/postfix stop 2>/dev/null 1>&2 && success || failure $"$prog stop"
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/postfix
|
[ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile
|
||||||
echo
|
echo
|
||||||
return $RETVAL
|
return $RETVAL
|
||||||
}
|
}
|
||||||
@ -145,7 +149,7 @@ case "$1" in
|
|||||||
check
|
check
|
||||||
;;
|
;;
|
||||||
status)
|
status)
|
||||||
status master
|
status -p $pidfile -l $(basename $lockfile) master
|
||||||
;;
|
;;
|
||||||
condrestart)
|
condrestart)
|
||||||
[ $running -eq 0 ] || exit 0
|
[ $running -eq 0 ] || exit 0
|
||||||
|
18
postfix.spec
18
postfix.spec
@ -14,7 +14,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{PFLOGSUMM}
|
%if %{PFLOGSUMM}
|
||||||
%define pflogsumm_ver 1.1.1
|
%define pflogsumm_ver 1.1.2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Postfix requires one exlusive uid/gid and a 2nd exclusive gid for its own
|
# Postfix requires one exlusive uid/gid and a 2nd exclusive gid for its own
|
||||||
@ -40,7 +40,7 @@
|
|||||||
Name: postfix
|
Name: postfix
|
||||||
Summary: Postfix Mail Transport Agent
|
Summary: Postfix Mail Transport Agent
|
||||||
Version: 2.6.5
|
Version: 2.6.5
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://www.postfix.org
|
URL: http://www.postfix.org
|
||||||
@ -78,6 +78,7 @@ Patch1: postfix-2.6.1-config.patch
|
|||||||
Patch2: postfix-2.6.1-files.patch
|
Patch2: postfix-2.6.1-files.patch
|
||||||
Patch3: postfix-alternatives.patch
|
Patch3: postfix-alternatives.patch
|
||||||
Patch8: postfix-large-fs.patch
|
Patch8: postfix-large-fs.patch
|
||||||
|
Patch9: pflogsumm-1.1.2-datecalc.patch
|
||||||
|
|
||||||
# Optional patches - set the appropriate environment variables to include
|
# Optional patches - set the appropriate environment variables to include
|
||||||
# them when building the package/spec file
|
# them when building the package/spec file
|
||||||
@ -161,9 +162,12 @@ qshape prints Postfix queue domain and age distribution.
|
|||||||
|
|
||||||
%if %{PFLOGSUMM}
|
%if %{PFLOGSUMM}
|
||||||
gzip -dc %{SOURCE53} | tar xf -
|
gzip -dc %{SOURCE53} | tar xf -
|
||||||
|
pushd pflogsumm-%{pflogsumm_ver}
|
||||||
|
%patch9 -p1 -b .datecalc
|
||||||
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
for f in README_FILES/TLS_{LEGACY_,}README; do
|
for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
|
||||||
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
|
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
|
||||||
touch -r ${f}{,_} && mv -f ${f}{_,}
|
touch -r ${f}{,_} && mv -f ${f}{_,}
|
||||||
done
|
done
|
||||||
@ -495,6 +499,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 29 2010 Miroslav Lichvar <mlichvar@redhat.com> 2:2.6.5-3
|
||||||
|
- fix init script LSB compliance (#528151)
|
||||||
|
- update pflogsumm to 1.1.2
|
||||||
|
- require Date::Calc for pflogsumm (#536678)
|
||||||
|
- fix some rpmlint warnings
|
||||||
|
|
||||||
* Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> - 2:2.6.5-2
|
* Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> - 2:2.6.5-2
|
||||||
- use password-auth common PAM configuration instead of system-auth
|
- use password-auth common PAM configuration instead of system-auth
|
||||||
|
|
||||||
@ -570,7 +580,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
- made the MYSQL and PGSQL defines overloadable as build argument
|
- made the MYSQL and PGSQL defines overloadable as build argument
|
||||||
|
|
||||||
* Wed Nov 7 2007 Thomas Woerner <twoerner@redhat.com> 2:2.4.5-3
|
* Wed Nov 7 2007 Thomas Woerner <twoerner@redhat.com> 2:2.4.5-3
|
||||||
- fixed multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
|
- fixed multilib conflict for makedefs.out: rename to makedefs.out-%%{_arch}
|
||||||
(rhbz#342941)
|
(rhbz#342941)
|
||||||
- enabled mysql support
|
- enabled mysql support
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user