OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jul-2003 16:59:40
Branch: HEAD Handle: 2003070915593406
Modified files:
openpkg-src/exim rc.exim
openpkg-src/gup gup.spec
openpkg-src/jitterbug jitterbug.spec
openpkg-src/majordomo majordomo.spec
openpkg-src/petidomo petidomo.spec
openpkg-src/pks pks.spec
openpkg-src/postfix rc.postfix
openpkg-src/rt rt.spec
openpkg-src/sendmail rc.sendmail
openpkg-web news.txt
Log:
remove mta special case
Summary:
Revision Changes Path
1.7 +3 -3 openpkg-src/exim/rc.exim
1.29 +5 -5 openpkg-src/gup/gup.spec
1.32 +5 -5 openpkg-src/jitterbug/jitterbug.spec
1.31 +5 -5 openpkg-src/majordomo/majordomo.spec
1.43 +4 -4 openpkg-src/petidomo/petidomo.spec
1.14 +13 -13 openpkg-src/pks/pks.spec
1.15 +3 -3 openpkg-src/postfix/rc.postfix
1.75 +12 -12 openpkg-src/rt/rt.spec
1.12 +3 -3 openpkg-src/sendmail/rc.sendmail
1.5478 +4 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/exim/rc.exim
============================================================================
$ cvs diff -u -r1.6 -r1.7 rc.exim
--- openpkg-src/exim/rc.exim 8 Jul 2003 13:02:52 -0000 1.6
+++ openpkg-src/exim/rc.exim 9 Jul 2003 14:59:35 -0000 1.7
@@ -4,9 +4,9 @@
##
%config
- mta_name="exim"
- mta_aliases_file="@l_prefix@/etc/exim/aliases"
- mta_aliases_update="true"
+ MTA_name="exim"
+ MTA_aliases_file="@l_prefix@/etc/exim/aliases"
+ MTA_aliases_update="true"
exim_enable="yes"
exim_flags="-bd -q30m"
exim_log_prolog="true"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gup/gup.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 gup.spec
--- openpkg-src/gup/gup.spec 8 Jul 2003 14:39:56 -0000 1.28
+++ openpkg-src/gup/gup.spec 9 Jul 2003 14:59:36 -0000 1.29
@@ -33,7 +33,7 @@
Group: Converter
License: Public Domain
Version: 0.5.9
-Release: 20030117
+Release: 20030709
# list of sources
Source0: ftp://ftp.debian.org/debian/pool/main/g/gup/gup_%{version}.tar.gz
@@ -96,8 +96,8 @@
rm -rf $RPM_BUILD_ROOT
%post
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
gup="$RPM_INSTALL_PREFIX/sbin/gup"
gup="$gup -d $RPM_INSTALL_PREFIX/etc/gup"
@@ -115,8 +115,8 @@
fi
%preun
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
$RPM_INSTALL_PREFIX/lib/openpkg/rpmtool config \
-r -i "$RPM_INSTALL_PREFIX:gup" $aliases_file
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jitterbug/jitterbug.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 jitterbug.spec
--- openpkg-src/jitterbug/jitterbug.spec 8 Jul 2003 14:40:17 -0000 1.31
+++ openpkg-src/jitterbug/jitterbug.spec 9 Jul 2003 14:59:36 -0000 1.32
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 1.6.2.3
-Release: 20030707
+Release: 20030709
# list of sources
Source0: ossp-jitterbug-%{version}.tar.gz
@@ -113,8 +113,8 @@
%post
if [ ".$1" = .1 ]; then
# add hook into MTA configuration
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
( echo "bugdb: \"|$RPM_INSTALL_PREFIX/bin/jitterbug-mail bugdb-guest\""
echo "owner-bugdb: postmaster"
@@ -141,8 +141,8 @@
%postun
if [ ".$1" = .0 ]; then
# remove hook from MTA configuration
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
$RPM_INSTALL_PREFIX/lib/openpkg/rpmtool config \
-r -i "$RPM_INSTALL_PREFIX:jitterbug" $aliases_file
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/majordomo/majordomo.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 majordomo.spec
--- openpkg-src/majordomo/majordomo.spec 8 Jul 2003 14:40:50 -0000 1.30
+++ openpkg-src/majordomo/majordomo.spec 9 Jul 2003 14:59:37 -0000 1.31
@@ -33,7 +33,7 @@
Group: Mail
License: Majordomo License Agreement
Version: 1.94.5
-Release: 20030219
+Release: 20030709
# list of sources
Source0:
http://www.greatcircle.com/majordomo/%{version}/majordomo-%{version}.tar.gz
@@ -154,8 +154,8 @@
%post
# add hook into MTA configuration
if [ ".$1" = .1 ]; then
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
( echo "# Majordomo Common Interface"
echo "majordomo:
\"|$RPM_INSTALL_PREFIX/bin/majordomo-wrapper majordomo\""
@@ -183,8 +183,8 @@
%postun
# remove hook from MTA configuration
if [ ".$1" = .0 ]; then
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
$RPM_INSTALL_PREFIX/lib/openpkg/rpmtool config \
-r -i "$RPM_INSTALL_PREFIX:majordomo" $aliases_file
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/petidomo/petidomo.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 petidomo.spec
--- openpkg-src/petidomo/petidomo.spec 9 Jul 2003 14:06:21 -0000 1.42
+++ openpkg-src/petidomo/petidomo.spec 9 Jul 2003 14:59:37 -0000 1.43
@@ -134,8 +134,8 @@
%post
# add hook into MTA configuration
if [ ".$1" = .1 ]; then
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
( echo "petidomo: \"|$RPM_INSTALL_PREFIX/bin/petidomo
--mode=listserv\""
echo "petidomo-approve: \"|$RPM_INSTALL_PREFIX/bin/petidomo
--mode=approve\""
@@ -157,8 +157,8 @@
%postun
# remove hook from MTA configuration
if [ ".$1" = .0 ]; then
- aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
- update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ update_command=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
$RPM_INSTALL_PREFIX/lib/openpkg/rpmtool config \
-r -i "$RPM_INSTALL_PREFIX:petidomo" $aliases_file
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 pks.spec
--- openpkg-src/pks/pks.spec 8 Jul 2003 14:41:54 -0000 1.13
+++ openpkg-src/pks/pks.spec 9 Jul 2003 14:59:38 -0000 1.14
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 0.9.6
-Release: 20030708
+Release: 20030709
# package options
%option with_fsl yes
@@ -166,19 +166,19 @@
%{l_prefix}/var/pks/db add %{l_prefix}/etc/openpkg/openpkg.pgp"
>/dev/null 2>&1
# activate in MTA configuration
- mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
- mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
- if [ ".$mta_aliases_file" != . ]; then
+ aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
+ aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ if [ ".$aliases_file" != . ]; then
( echo "pks: pks-request"
echo "pks-request: \"|%{l_prefix}/bin/pks-mail
%{l_prefix}/etc/pks/pksd.conf\""
echo "pks-daemon: MAILER-DAEMON"
echo "pks-admin: postmaster"
echo "pgp-public-keys: pks-request"
echo "pgp: pks-request"
- ) | %{l_rpmtool} config -a -i "%{l_prefix}:pks" $mta_aliases_file
+ ) | %{l_rpmtool} config -a -i "%{l_prefix}:pks" $aliases_file
fi
- if [ ".$mta_aliases_update" != . ]; then
- eval $mta_aliases_update
+ if [ ".$aliases_update" != . ]; then
+ eval $aliases_update
fi
fi
@@ -188,13 +188,13 @@
%{l_prefix}/etc/rc pks stop >/dev/null 2>&1 || true
# deactivate in MTA configuration
- mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
- mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
- if [ ".$mta_aliases_file" != . ]; then
- %{l_rpmtool} config -r -i "%{l_prefix}:pks" $mta_aliases_file
+ aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
+ aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ if [ ".$aliases_file" != . ]; then
+ %{l_rpmtool} config -r -i "%{l_prefix}:pks" $aliases_file
fi
- if [ ".$mta_aliases_update" != . ]; then
- eval $mta_aliases_update
+ if [ ".$aliases_update" != . ]; then
+ eval $aliases_update
fi
# remove generated files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/rc.postfix
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.postfix
--- openpkg-src/postfix/rc.postfix 28 Jun 2003 14:39:38 -0000 1.14
+++ openpkg-src/postfix/rc.postfix 9 Jul 2003 14:59:39 -0000 1.15
@@ -4,9 +4,9 @@
##
%config
- mta_name="postfix"
- mta_aliases_file="@l_prefix@/etc/postfix/aliases"
- mta_aliases_update="cd @l_prefix@/etc/postfix && @l_prefix@/sbin/postalias
aliases"
+ MTA_name="postfix"
+ MTA_aliases_file="@l_prefix@/etc/postfix/aliases"
+ MTA_aliases_update="cd @l_prefix@/etc/postfix && @l_prefix@/sbin/postalias
aliases"
postfix_enable="yes"
postfix_log_prolog="true"
postfix_log_epilog="true"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 rt.spec
--- openpkg-src/rt/rt.spec 9 Jul 2003 07:16:52 -0000 1.74
+++ openpkg-src/rt/rt.spec 9 Jul 2003 14:59:39 -0000 1.75
@@ -372,15 +372,15 @@
%post
if [ $1 -eq 1 ]; then
# activate in MTA configuration
- mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
- mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
- if [ ".$mta_aliases_file" != . ]; then
+ aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
+ aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ if [ ".$aliases_file" != . ]; then
( echo "rt: \"|%{l_prefix}/bin/rt-mailgate --action correspond
--queue general --url http://127.0.0.1:8380/\"";
echo "rt-comment: \"|%{l_prefix}/bin/rt-mailgate --action comment
--queue general --url http://127.0.0.1:8380/\"";
- ) | %{l_rpmtool} config -a -i "%{l_prefix}:rt" $mta_aliases_file
+ ) | %{l_rpmtool} config -a -i "%{l_prefix}:rt" $aliases_file
fi
- if [ ".$mta_aliases_update" != . ]; then
- eval $mta_aliases_update
+ if [ ".$aliases_update" != . ]; then
+ eval $aliases_update
fi
# display final hint after initial installation
@@ -405,13 +405,13 @@
$RPM_INSTALL_PREFIX/etc/rc rt stop
# deactivate in MTA configuration
- mta_aliases_file=`%{l_prefix}/etc/rc --query mta_aliases_file`
- mta_aliases_update=`%{l_prefix}/etc/rc --query mta_aliases_update`
- if [ ".$mta_aliases_file" != . ]; then
- %{l_rpmtool} config -r -i "%{l_prefix}:rt" $mta_aliases_file
+ aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
+ aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ if [ ".$aliases_file" != . ]; then
+ %{l_rpmtool} config -r -i "%{l_prefix}:rt" $aliases_file
fi
- if [ ".$mta_aliases_update" != . ]; then
- eval $mta_aliases_update
+ if [ ".$aliases_update" != . ]; then
+ eval $aliases_update
fi
# remove generated files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/rc.sendmail
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.sendmail
--- openpkg-src/sendmail/rc.sendmail 9 Jul 2003 14:06:26 -0000 1.11
+++ openpkg-src/sendmail/rc.sendmail 9 Jul 2003 14:59:40 -0000 1.12
@@ -24,9 +24,9 @@
##
%config
- mta_name="sendmail"
- mta_aliases_file="@l_prefix@/etc/sendmail/t.aliases"
- mta_aliases_update="cd @l_prefix@/etc/sendmail && make t.aliases.db"
+ MTA_name="sendmail"
+ MTA_aliases_file="@l_prefix@/etc/sendmail/t.aliases"
+ MTA_aliases_update="cd @l_prefix@/etc/sendmail && make t.aliases.db"
sendmail_enable="yes"
sendmail_flags_in="-bd"
sendmail_flags_out="-q60s"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5477 -r1.5478 news.txt
--- openpkg-web/news.txt 9 Jul 2003 14:53:55 -0000 1.5477
+++ openpkg-web/news.txt 9 Jul 2003 14:59:34 -0000 1.5478
@@ -1,3 +1,7 @@
+09-Jul-2003: Upgraded package: P<pks-0.9.6-20030709>
+09-Jul-2003: Upgraded package: P<majordomo-1.94.5-20030709>
+09-Jul-2003: Upgraded package: P<jitterbug-1.6.2.3-20030709>
+09-Jul-2003: Upgraded package: P<gup-0.5.9-20030709>
09-Jul-2003: Upgraded package: P<sqlite-2.8.4-20030709>
09-Jul-2003: Upgraded package: P<perl-tk-20030709-20030709>
09-Jul-2003: Upgraded package: P<perl-curses-20030709-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
