rpms/postfix/F-9 .cvsignore, 1.28, 1.29 postfix-large-fs.patch, 1.1, 1.2 postfix.spec, 1.68, 1.69 sources, 1.29, 1.30 postfix-2.4.5-open_define.patch, 1.2, NONE
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Nov 20 14:23:49 UTC 2008
Author: mlichvar
Update of /cvs/pkgs/rpms/postfix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2086
Modified Files:
.cvsignore postfix-large-fs.patch postfix.spec sources
Removed Files:
postfix-2.4.5-open_define.patch
Log Message:
- enable Large file support on 32-bit archs (#428996)
- fix mailq(1) and newaliases(1) man pages (#429501)
- move pflogsumm and qshape to -perl-scripts subpackage (#467529)
- update pflogsumm to 1.1.1
- fix large-fs patch
- drop open_define patch
- add -Wno-comment to CFLAGS
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 21 Feb 2008 18:46:06 -0000 1.28
+++ .cvsignore 20 Nov 2008 14:23:18 -0000 1.29
@@ -1,12 +1,2 @@
-pflogsumm-1.1.0.tar.gz
-postfix-2.2.10.tar.gz
-postfix-2.3.0.tar.gz
-postfix-2.3.1.tar.gz
-postfix-2.3.2.tar.gz
-postfix-2.3.3.tar.gz
-postfix-2.3.4.tar.gz
-postfix-2.3.6.tar.gz
-postfix-2.4.3.tar.gz
-postfix-2.4.5.tar.gz
-postfix-2.4.6.tar.gz
-postfix-2.5.1.tar.gz
+pflogsumm-1.1.1.tar.gz
+postfix-2.5.5.tar.gz
postfix-large-fs.patch:
Index: postfix-large-fs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix-large-fs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postfix-large-fs.patch 20 Apr 2005 15:28:22 -0000 1.1
+++ postfix-large-fs.patch 20 Nov 2008 14:23:19 -0000 1.2
@@ -1,6 +1,7 @@
---- postfix-2.2.2/src/util/sys_defs.h.large-fs 2005-02-04 01:07:44.000000000 +0100
-+++ postfix-2.2.2/src/util/sys_defs.h 2005-04-20 16:36:55.621279565 +0200
-@@ -618,8 +618,8 @@
+diff -up postfix-2.5.5/src/util/sys_defs.h.large-fs postfix-2.5.5/src/util/sys_defs.h
+--- postfix-2.5.5/src/util/sys_defs.h.large-fs 2008-01-15 01:51:44.000000000 +0100
++++ postfix-2.5.5/src/util/sys_defs.h 2008-10-21 17:55:29.000000000 +0200
+@@ -709,8 +709,8 @@ extern int initgroups(const char *, int)
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
#define FIONREAD_IN_TERMIOS_H
@@ -8,20 +9,13 @@
-#define STATFS_IN_SYS_VFS_H
+#define USE_STATVFS
+#define STATVFS_IN_SYS_STATVFS_H
- #define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT
#define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP
---- postfix-2.2.2/src/util/fsspace.c.large-fs 1999-06-25 02:06:14.000000000 +0200
-+++ postfix-2.2.2/src/util/fsspace.c 2005-04-20 16:53:28.777232112 +0200
-@@ -38,6 +38,7 @@
- /*--*/
-
- /* System library. */
-+#define _FILE_OFFSET_BITS 64
-
- #include <sys_defs.h>
-
-@@ -91,8 +92,15 @@
+ #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+diff -up postfix-2.5.5/src/util/fsspace.c.large-fs postfix-2.5.5/src/util/fsspace.c
+--- postfix-2.5.5/src/util/fsspace.c.large-fs 2006-06-15 20:07:16.000000000 +0200
++++ postfix-2.5.5/src/util/fsspace.c 2008-10-21 17:56:29.000000000 +0200
+@@ -91,8 +91,15 @@ void fsspace(const char *path, struct
if (statvfs(path, &fsbuf) < 0)
msg_fatal("statvfs %s: %m", path);
Index: postfix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/postfix.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- postfix.spec 30 Sep 2008 14:19:49 -0000 1.68
+++ postfix.spec 20 Nov 2008 14:23:19 -0000 1.69
@@ -14,7 +14,7 @@
%endif
%if %{PFLOGSUMM}
-%define pflogsumm_ver 1.1.0
+%define pflogsumm_ver 1.1.1
%endif
# Postfix requires one exlusive uid/gid and a 2nd exclusive gid for its own
@@ -40,7 +40,7 @@
Name: postfix
Summary: Postfix Mail Transport Agent
Version: 2.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 2
Group: System Environment/Daemons
URL: http://www.postfix.org
@@ -80,7 +80,6 @@
Patch7: postfix-2.1.5-aliases.patch
Patch8: postfix-large-fs.patch
Patch9: postfix-2.4.0-cyrus.patch
-Patch10: postfix-2.4.5-open_define.patch
# Optional patches - set the appropriate environment variables to include
# them when building the package/spec file
@@ -129,6 +128,27 @@
Postfix is a Mail Transport Agent (MTA), supporting LDAP, SMTP AUTH (SASL),
TLS
+%package perl-scripts
+Summary: Postfix utilities written in perl
+Group: Applications/System
+Requires: %{name} = %{epoch}:%{version}-%{release}
+# perl-scripts introduced in 2:2.5.5-2
+Obsoletes: postfix < 2:2.5.5-2
+%if %{PFLOGSUMM}
+Provides: postfix-pflogsumm = %{epoch}:%{version}-%{release}
+Obsoletes: postfix-pflogsumm < 2:2.5.5-2
+%endif
+%description perl-scripts
+This package contains perl scripts pflogsumm and qshape.
+
+Pflogsumm is a log analyzer/summarizer for the Postfix MTA. It is
+designed to provide an over-view of Postfix activity. Pflogsumm
+generates summaries and, in some cases, detailed reports of mail
+server traffic volumes, rejected and bounced email, and server
+warnings, errors and panics.
+
+qshape prints Postfix queue domain and age distribution.
+
%prep
%setup -q
# Apply obligatory patches
@@ -138,31 +158,12 @@
%patch7 -p1 -b .aliases
%patch8 -p1 -b .large-fs
%patch9 -p1 -b .cyrus
-%patch10 -p1 -b .open_define
# resolve multilib conflict for makedefs.out: rename to makedefs.out-%{_arch}
perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile.in */Makefile.in */*/Makefile.in HISTORY
%if %{PFLOGSUMM}
gzip -dc %{SOURCE53} | tar xf -
-pushd pflogsumm-%{pflogsumm_ver}
-patch -p0 < ../pflogsumm-conn-delays-dsn-patch
-popd
-%endif
-
-# pflogsumm subpackage
-%if %{PFLOGSUMM}
-%package pflogsumm
-Group: System Environment/Daemons
-Summary: A Log Summarizer/Analyzer for the Postfix MTA
-Requires: postfix = %{epoch}:%{version}-%{release}
-%description pflogsumm
-Pflogsumm is a log analyzer/summarizer for the Postfix MTA. It is
-designed to provide an over-view of Postfix activity. Pflogsumm
-generates summaries and, in some cases, detailed reports of mail
-server traffic volumes, rejected and bounced email, and server
-warnings, errors and panics.
-
%endif
%build
@@ -222,7 +223,7 @@
make -f Makefile.init makefiles
unset CCARGS AUXLIBS
-make %{?_smp_mflags} DEBUG="" OPT="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} DEBUG="" OPT="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -Wno-comment"
%install
/bin/rm -rf $RPM_BUILD_ROOT
@@ -231,10 +232,11 @@
# install postfix into $RPM_BUILD_ROOT
# Move stuff around so we don't conflict with sendmail
-mv man/man1/mailq.1 man/man1/mailq.postfix.1
-mv man/man1/newaliases.1 man/man1/newaliases.postfix.1
-mv man/man1/sendmail.1 man/man1/sendmail.postfix.1
-mv man/man5/aliases.5 man/man5/aliases.postfix.5
+for i in man1/mailq.1 man1/newaliases.1 man1/sendmail.1 man5/aliases.5; do
+ dest=$(echo $i | sed 's|\.[1-9]$|.postfix\0|')
+ mv man/$i man/$dest
+ sed -i "s|^\.so $i|\.so $dest|" man/man?/*.[1-9]
+done
sh postfix-install -non-interactive \
install_root=$RPM_BUILD_ROOT \
@@ -402,7 +404,6 @@
%attr(0755, root, root) %{postfix_command_dir}/smtp-sink
%attr(0755, root, root) %{postfix_command_dir}/smtp-source
-%attr(0755, root, root) %{postfix_command_dir}/qshape
%attr(0755, root, root) /usr/lib/sendmail.postfix
%dir %attr(0755, root, root) %{postfix_doc_dir}
@@ -433,7 +434,7 @@
%attr(0644, root, root) %{_mandir}/man1/[a-n]*
%attr(0644, root, root) %{_mandir}/man1/post*
-%attr(0644, root, root) %{_mandir}/man1/[q-z]*
+%attr(0644, root, root) %{_mandir}/man1/[s-z]*
%attr(0644, root, root) %{_mandir}/man5/*
%attr(0644, root, root) %{_mandir}/man8/*
@@ -470,16 +471,26 @@
%attr(0755, root, root) %{_bindir}/newaliases.postfix
%attr(0755, root, root) %{_sbindir}/sendmail.postfix
-%if %{PFLOGSUMM}
-%files pflogsumm
+%files perl-scripts
%defattr(-, root, root)
- %doc %{postfix_doc_dir}/pflogsumm-faq.txt
- %{_mandir}/man1/pflogsumm.1.gz
- %attr(0755, root , root) %{postfix_command_dir}/pflogsumm
+%attr(0755, root, root) %{postfix_command_dir}/qshape
+%attr(0644, root, root) %{_mandir}/man1/qshape*
+%if %{PFLOGSUMM}
+%doc %{postfix_doc_dir}/pflogsumm-faq.txt
+%attr(0644, root, root) %{_mandir}/man1/pflogsumm.1.gz
+%attr(0755, root, root) %{postfix_command_dir}/pflogsumm
%endif
-
%changelog
+* Thu Nov 20 2008 Miroslav Lichvar <mlichvar at redhat.com> 2:2.5.5-2
+- enable Large file support on 32-bit archs (#428996)
+- fix mailq(1) and newaliases(1) man pages (#429501)
+- move pflogsumm and qshape to -perl-scripts subpackage (#467529)
+- update pflogsumm to 1.1.1
+- fix large-fs patch
+- drop open_define patch
+- add -Wno-comment to CFLAGS
+
* Wed Sep 17 2008 Thomas Woerner <twoerner at redhat.com> 2:2.5.5-1
- new version 2.5.5
fixes CVE-2008-2936, CVE-2008-2937 and CVE-2008-3889 (rhbz#459101)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/postfix/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 30 Sep 2008 14:19:49 -0000 1.29
+++ sources 20 Nov 2008 14:23:19 -0000 1.30
@@ -1,2 +1,2 @@
-1f78fcaf2a36ec3520ecff286a45251a pflogsumm-1.1.0.tar.gz
+2f570477b2e205f9dfc1df13f00b5c0d pflogsumm-1.1.1.tar.gz
6b4b848bdd2239dddfc9d385e57e19ef postfix-2.5.5.tar.gz
--- postfix-2.4.5-open_define.patch DELETED ---
More information about the fedora-extras-commits
mailing list