OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-re Date: 31-Dec-2002 10:32:32
Branch: HEAD Handle: 2002123109323101
Modified files:
openpkg-re/vcheck vc.postfix
openpkg-src/postfix postfix.spec
Log:
- upgrade to pflogsumm 1.0.6
- add version tracking for pflogsumm
- simplify packaging by removing unnecessary top-level directory
- fix hard-core configuration part I
Summary:
Revision Changes Path
1.22 +5 -0 openpkg-re/vcheck/vc.postfix
1.100 +30 -31 openpkg-src/postfix/postfix.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.postfix
============================================================================
$ cvs diff -u -r1.21 -r1.22 vc.postfix
--- openpkg-re/vcheck/vc.postfix 25 Dec 2002 08:52:32 -0000 1.21
+++ openpkg-re/vcheck/vc.postfix 31 Dec 2002 09:32:31 -0000 1.22
@@ -11,4 +11,9 @@
url = ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/
regex = pfixtls-([^-]+-[^-]+-[^-]+)\.tar\.gz
}
+prog postfix:pflogsumm = {
+ version = 1.0.6
+ url = http://jimsun.linxnet.com/postfix_contrib.html
+ regex = pflogsumm-(__VER__)\.tar\.gz
+}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.99 -r1.100 postfix.spec
--- openpkg-src/postfix/postfix.spec 31 Dec 2002 09:02:21 -0000 1.99
+++ openpkg-src/postfix/postfix.spec 31 Dec 2002 09:32:32 -0000 1.100
@@ -26,7 +26,7 @@
# package versions
%define V_postfix 2.0.0.1
%define V_tls 0.8.12-2.0.0.1-0.9.6h
-%define V_pflogsumm 1.0.5
+%define V_pflogsumm 1.0.6
# package options
%option with_tls no
@@ -48,9 +48,9 @@
# list of sources
Source0:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%{V_postfix}.tar.gz
Source1: ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-%{V_tls}.tar.gz
-Source2: fsl.postfix
+Source2: http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.tar.gz
Source3: etc.tar
-Source4: http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.pl
+Source4: fsl.postfix
Source5: rc.postfix
# build information
@@ -92,16 +92,16 @@
%prep
# unpack distribution files
- %setup0 -q -c -a 0
+ %setup0 -q
%if "%{with_tls}" == "yes"
%setup1 -q -T -D -a 1
%endif
+ %setup2 -q -T -D -a 2
%setup3 -q -T -D -a 3
# apply external TLS patches
- cd postfix-%{V_postfix}
%if "%{with_tls}" == "yes"
- %{l_patch} -p1 < ../pfixtls-%{V_tls}/pfixtls.diff
+ %{l_patch} -p1 <pfixtls-%{V_tls}/pfixtls.diff
%endif
%build
@@ -112,13 +112,12 @@
%{l_shtool} subst \
-e 's;config_directory/postfix-script;command_directory/postfix-script;' \
-e 's;config_directory/post-install;command_directory/postfix-install;' \
- conf/postfix-script*
+ conf/postfix-script
%{l_shtool} subst \
-e 's;/usr/include;%{l_prefix}/include;g' \
makedefs
# configure Postfix (regular part)
- cd postfix-%{V_postfix}
unset LD_LIBRARY_PATH || true
CCARGS=""
CCARGS="$CCARGS %{l_cflags -O}"
@@ -162,23 +161,22 @@
rm -rf $RPM_BUILD_ROOT
# perform standard installation procedure
- ( cd postfix-%{V_postfix}
- %{l_shtool} subst -e "s;chown;true;" postfix-install
- sh postfix-install -non-interactive \
- install_root=$RPM_BUILD_ROOT \
- config_directory=%{l_prefix}/etc/postfix \
- daemon_directory=%{l_prefix}/libexec/postfix \
- command_directory=%{l_prefix}/sbin \
- queue_directory=%{l_prefix}/var/postfix \
- sendmail_path=%{l_prefix}/sbin/sendmail \
- newaliases_path=%{l_prefix}/sbin/newaliases \
- mailq_path=%{l_prefix}/sbin/mailq \
- manpage_directory=%{l_prefix}/man \
- mail_user=%{l_musr} \
- setgid_group=%{l_rgrp}
- %{l_shtool} install -c -m 755 \
- -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
- auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail )
+ %{l_shtool} subst -e "s;chown;true;" postfix-install
+ sh postfix-install -non-interactive \
+ install_root=$RPM_BUILD_ROOT \
+ config_directory=%{l_prefix}/etc/postfix \
+ daemon_directory=%{l_prefix}/libexec/postfix \
+ command_directory=%{l_prefix}/sbin \
+ queue_directory=%{l_prefix}/var/postfix \
+ sendmail_path=%{l_prefix}/sbin/sendmail \
+ newaliases_path=%{l_prefix}/sbin/newaliases \
+ mailq_path=%{l_prefix}/sbin/mailq \
+ manpage_directory=%{l_prefix}/man \
+ mail_user=%{l_musr} \
+ setgid_group=%{l_rgrp}
+ %{l_shtool} install -c -m 755 \
+ -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
+ auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
# post-adjust binaries
rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/mailq
@@ -230,10 +228,12 @@
%{l_shtool} mkdir -f -p -m 755 log pid )
# install addons
- %{l_shtool} install -c -m 755 \
- -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
- %{SOURCE pflogsumm-%{V_pflogsumm}.pl} \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/pflogsumm
+ ( cd pflogsumm-%{V_pflogsumm}
+ %{l_shtool} install -c -m 755 \
+ -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+ pflogsumm.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/pflogsumm
+ %{l_shtool} install -c -m 644 \
+ pflogsumm.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ )
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
@@ -255,8 +255,7 @@
# adjust installation to avoid file name conflicts
( cd $RPM_BUILD_ROOT%{l_prefix}/man/man8
- mv master.8 postfix_master.8
- )
+ mv master.8 postfix_master.8 )
# generate file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
