From 5930e09a38347736be65a160df8da7c4773d4286 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 3 Jan 2002 13:45:33 +0000
Subject: [PATCH] enhance package by providing a more reasonable default
 configuration ;)

---
 postfix/etc.tar      | Bin 0 -> 20480 bytes
 postfix/postfix.spec |  35 ++++++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 postfix/etc.tar

diff --git a/postfix/etc.tar b/postfix/etc.tar
new file mode 100644
index 0000000000000000000000000000000000000000..d8bf2e2f270ef133e36a877ea6869a34ab670157
GIT binary patch
literal 20480
zcmeHO`%fdu5$4yMzoKK%3Fq)*jEyfyT;N!r#O?ABIMGH)WDVms%<Xu_HxIxG_rK?>
z>h5`%v0+(ON^<sUnSNDuO?6lG*HyMm+}6fd{)le7-|vYH(b?^G+J&bupSBSFuH9?*
z@OKZ5{cgX#A$ng~E@q#`i4zI25yf)lbkFs#B>wO1lvw{$=aZax{_6Mtf>*HH?Y(Zd
zu<m9bsO8_?-R+du-?lrQ?uKZ8!JIE9{hhD>=BBl|Da4^annl<I4~H$<5wkE(P|0?N
zXf(vs@qz^Zoxqi17KN@Hr;&_7Zdu?UW=?V|+%TAUH)-S~UKm&xmxG^9K58RBC`@8q
z{djWr?&MN+9f+-MHMHJ}uf4z;43D!;QS60mda@|IiJa-ee3!?1E_x81VpMNMu61#K
zH9Y!oa&%?-v<P*6S;zOBn8%zRT_`3*Um7!YW;`N$r6(hxG9_N(T>DaxO$E+WE=V~X
z9UUJJu2>LA>A0?pV{14%J~}%;J2^i3K(f0|5C)#>_~`iS$>s1b)Jz?BUX-NVd^z}V
zeta|>yrbqw`l0J2a*XlA%cHZai}TANbtI7!#IrC;(82FN&>G-Z#`^K%jpa-RV;Q(}
zB5*%>!HqRMIUPV}r>u_y(M)HJBy5Z^iS=%9F*tiSI6FQ8w*z4u2=+*v$f)T~c(*iN
zsBn1n<A=djT}?A}0_R4K1?wl?=cyYajirzei40<F8c}PGuWMowM&j0qZ}m{IU87p9
zULXm=0u_yq<c)mD31)62L7)VHl>e|ugOEt;zmAEhC2!AGfV=W`y#SgZZ_id>VSKg#
z3+-C})N0f|aZ*2l%+ZZZEXVivbCpraEP>XaH=X&O>m|aymApv83C6tk&X|_0NI{&6
z>r}VCftkSyuz%}{L8*mykTVuPw8rwT6{Nl|IzN1Ci^oUoh*VnNBw^~_R>&kD7G$zm
zxcw4yZc^`@uc}CAw43zX$0U7WX;>4cj(Jay-ou-G7-a7OORbYUW(?DpmQb<Cn^tnk
zhcTnVnkzP@VI>nYh*^}jhhma9tz?rAV@9R@q!{H*D;ed(m{DN^DmJE}iV62=4U^-{
ztl0IX6Qnb<Yq`2FtZy38R5T{ykF>o_rMM&2`t#8d$M6v33#KwiEP`MOZ<x#Dy3mJ@
z;8sg*%O{<x8I<AdNgp*@){7Cq?|LAe_L<lIN}3@2x3>cSb$hnPf8D+I?yeBFy}P%!
z#(!UFIZA9-<G*ZY5CFVTpim$33If88`79?CxG4_a>;q=8jP5)@&1624K$nqsM`uME
zP)XqYio!4v;vRPwxFQJkK#m1aYYN9Q7T*aRsQ{;Rz!yH-a~aoBfAS3Eos8;YyVoX&
z@n-LFV8zn};?c(oBm@prMKtttv2NOlZfwmw_Y=LI0GOPFIkllO&%L%{2SehIqO**r
z7SNmbAhJo#B!=A7H5Z}jtY4=$xEs@_JiQrj=y%(S(o9cu)@DZidBg!zNAf=Mu;4Eh
z-H4Q6dw7oD(Dc@In9_yi#e9qk6rDAe6RA}2c^cH@6F&upeSUVh$o8Kx%*@Vog}w8#
z$&C(Z?^y9|c>il*YO_{m&|=-RGo2-)2#ET5!3~vpGMz<t5x;`k%xRv6$~>9Q(pMbN
zmtWgZnWv#LPjfZ$Gm|URn{mtNiO$+|=TRCzeQ`r%o`#uu&OErOiSOLR2bXlCi4GJa
zxS_j)7MEMN+X7wt9$bxRNYR*zt$$}1pWjd+y5FqLG<9dM&|X1=pOgs9h$TqV2hqT+
zfoS|oG@PxNu6wA9tpF0-hO<9JxZwL@dn=NzH}e3?;0V15H-7FyJQZY;1muvRi8PK{
zzIWYHto4ILGlDFLaBUoDc`eN{n5S6=^DK(cRLYoyVNnL!q8x5$sVRV5jaD*Ia%KF#
z!byeyya0Fh5-xbl%5(9*eh)EU75}w+{XXHp_U;=0z2y=t<@GB3=LHKPEzRXJMfj!=
zN~B;Ohu0`92;Wl^NeEmg1p*z27b1Ws5iW{F2!|MX9KoPqB+gulio`o2TFr1=W*Ek?
zhqxODGz;7b4kowKi!#PKYJzA7+7W8<{qP>)6S|U8XpLl;;cgmp6lyGEH}Yl_&=lcB
zNC#1njQhS&2mSW<^&NwnsLVVVJ8%!5id^D@olA7ur~-K+E-AQ8MI{4+KkgxS#s$Jg
zT;O9`l?)?>jH+qo+y_)*J`0ct?M<}n+c=`Ov87S-XzaoJCt)<_)5rWNMs8JrcI?P$
z7%Ul%P+MUSz}L$MnT3?CUsIXNWt3&oJ0~)cXeBHikFiBZ(kQ$SG%hnz>L*V=iE+#v
z5_qGHgwVEk$47c;ERPIkJd!U83bowgnqzHF=k(<0ZHb602iPf|-;@sy;&HMG?GeE^
zM5{TE%0vf<RF=kuk$1Cn>{dRxdT%}gmCmhAUggoX6I3YxA?ci046aUx7ib}c(W~G<
z#~oyZIKGS~4#LihQrew<vyFeYnioM9XHIcNyd4Pd!|2ljiB^Z9Yq!2<O~^PwqJT}N
zJOviGAmEN*m6N8MXjTfeHhJ2Ssy&&H8NepZ1Uur%C2wI$jwA0Ewq!BGp`-6ws~Pqg
zA+rIqap@Ie2tAY0)JsOW8eT9h$2>=_PgrWC=6QiAFxf@<7wU>{Nl9wCkf6YgH_IH1
zsJ=jZuu_7I)Y{Zox{3#76)1?iOr-{f(>ki0L=~6SJTg*iGfQB6K9`IXk#*#Esu-|-
zR?A`%C5i_k*3PwqjK#v|WjqRgMqdQxwBI%29#I?iS<$l{i0@!hu;A<PVPv8krMXM)
zmQP#+LWlx5U(~h+ABTgptCRDyT2)MxY(eeKr4ZqZJD$ORcHiDL@xR_)A29^G-S64!
z_}>>R{sjzH<3H`S5d7060J$UzeFjGCf%tS#IpizpMDR^x?z|3>4JLG@{GZr1$LS7%
zCwN4m{riqMxe(5H42K&lxRRYT;Wg!(!SH&HWB@SOj6fQa4{;)5?<VjjNRWb4=q54&
zSc}3bm@(wh4C{>a3a5pcNo-@j(7yxoie3%BigNA<ghTkWg80c{9nn0r&=nex7H~Ga
zr!*X&mQ8Ufe*ui5)VN?BL=vb6LVFWkjVbBp#o}`C^Wb<$tZRSo_Wt?tqeyTYuQkO5
zpEn4u-YPh|l*9RZqDH>x=x<bjB#j`QN*rB|pQF61Ia2ozVw<ry=bN{C^}5QxKJxAO
zu#8?DKKa;NJ?fPz`J7Te!Lq|rH?|9Z0f3IOM}Y-x5_V|Psx-0AVnx5=Q%PT#VzIx_
z#l=GZ{jH3osHv73X*~=iki2?(*8AC+()*66sTHZAbpD?H7H~kb*{oR<<`!b0(45X-
zKR$tj;{3hVT><wg8Px>3*ZxzdY43ech)eZmbh<~i(%%vtrO4D};ZThL-RmM0<o~l{
z{{{ZyHA9~9|6;F?uqWUDyS?3A^8a?%Ui<&osQR;MR{Q^KXHfn}`&9ka6!N{w#w)yk
zPN#|VU79_G@-#c_cGy2_-^1>58-6vpB_k#0TDYhdU0B9`sTb4JYBQs0m7U;kxvS*&
zvaU)aFBl!6tK#*KbJp4*3l^`Z|0TSwz7|57pV8NR7sAV<@+b}q)S1M(Q0RK4u~+O4
zvVRTOD|+9i=^6WnwRbZ6xBDpDw!O~(zK!mm<FeZR_0AycH$`nD>U(AWau={L9uDC1
zjbEH3KvgOz#b+!-O9~!lS0)4rRoEs(!VxwUAuyH5rWgWx;{MBs(V0vLj^W(*=RyW|
zxRxSUle4JCN%{qzb1^%{q3j3%gcS~_a$uGFsTf%4j|%=^(N&PgDY_CZR>6ZU66ald
zY>|acA+CH5>ar__b)F9Eyq%|dZYQt%U!wu?|5>o*H4I)r^Njx&eH)lh<G)TDu>it<
z>-^6PH2dX4R{Q^KXV3{?Dk8kb)ft%^<N4H=z{&fTLI7s`I3M@QGeG57=qrN=YSA}+
z%SS-9|IVgg>cQdBGQ@|nx(MfPZn3xItBbUi-kJTU7u+FgI3}J&f2uMDXnf>m>NcMx
z!ww6aXy}t+ue<$iY>@qDVbU+(PL&*<wf}w||LZIJ?{#|X_+O<m-?(wL{bxIa>_4x>
z(g&cTUwCNplHKb_5~W?6y1aO+BVebP<RPwjhA{ZVqhAM@pDYL@sXX6H=4|vPU|wzR
z8Bx*PO;9WA+}GcB(dfm<SJ7W-)Kgiy^%<k3C!<gkQJaV9vVoMo+h4pt?su@^wM>i1
ztT0I>t$CH@bk$_aW03vp1jifiteo95_HTE0^Y~A<%kdw((_Y(uuEDQYT5bP&XOQ))
zTNZ6xB%*KtBcHb9-2b1y`RSJ{IugpB?`M{XLp_x{LO;y4PX(H}@kx|f;|z)@x9DeK
zEn-NuN1f86^1c_iema)>g&|7<&UF66d1;xbwj)s0z90&be#yjrY|&5iT1nXAc0Go2
zHTWW;9+eHz&3X`B+2f2+E}vn@{Y~GaZ%jZtkAlCJ(J*92O8qT{1V@4sjTMYjKY5C+
z0J4tf*&Ig4*{_hS(<A)o=d$tcXmEOdmX9l3Sb1*zTBN`o`T7`{dyBG8DlV5(VhZ~1
zxRrBw+V@&G_4N#O&3UbXwFcH2SZiRdfwczK8dz&!t%0=$)*4uAV6B0*2G$x_YhbN`
HS7_ir?7Kio

literal 0
HcmV?d00001

diff --git a/postfix/postfix.spec b/postfix/postfix.spec
index 02b2cc077d..a9f9fc98cc 100644
--- a/postfix/postfix.spec
+++ b/postfix/postfix.spec
@@ -67,6 +67,7 @@ Source3:      ftp://ftp.kame.net/pub/kame/misc/postfix-%{V_ipv6}.diff.gz
 Source4:      http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.pl
 Source5:      rc.postfix
 Source6:      ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/snapshot-%{V_unstable}.tar.gz
+Source7:      etc.tar
 
 #   build information
 Prefix:       %{l_prefix}
@@ -110,6 +111,7 @@ Provides:     MTA
     %setup1 -q -T -D -a 1
 %endif
     %setup2 -q -T -D -a 2
+    %setup7 -q -T -D -a 7
 %if "%{branch}" == "stable"
     cd postfix-%{V_real}
 %else
@@ -230,11 +232,19 @@ Provides:     MTA
     ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/postfix
       %{l_shtool} mkdir -f -p -m 755 sample
       for cfg in access aliases canonical pcre_table regexp_table \
-                 relocated sample-* transport virtual main.cf.default; do
+                 relocated sample-* transport virtual \
+                 main.cf master.cf main.cf.default; do
           mv $cfg sample/
-      done 
+      done
     )
 
+    #   install default configuration
+    %{l_shtool} install -c -m 644 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_fsusr@;%{l_fsusr};g' \
+        -e 's;@l_npusr@;%{l_npusr};g' \
+        etc/* $RPM_BUILD_ROOT%{l_prefix}/etc/postfix/
+
     #   pre-create variable stuff
     ( cd $RPM_BUILD_ROOT%{l_prefix}/var/postfix
       %{l_shtool} mkdir -f -p -m 700 \
@@ -275,10 +285,21 @@ Provides:     MTA
 %clean
     rm -rf $RPM_BUILD_ROOT
 
+%post
+    if [ $1 -eq 1 ]; then
+        (cd $RPM_INSTALL_PREFIX/etc/postfix; %{l_make} all >/dev/null 2>&1 || true)
+    elif [ $1 -gt 1 ]; then
+        (cd $RPM_INSTALL_PREFIX/etc/postfix; %{l_make} clean all >/dev/null 2>&1 || true)
+        $RPM_INSTALL_PREFIX/etc/rc postfix reload >/dev/null 2>&1 || true
+    fi
+
 %preun
-    $RPM_INSTALL_PREFIX/sbin/postfix stop
-    rm -rf $RPM_INSTALL_PREFIX/etc/postfix/prng_exch
-    rm -rf $RPM_INSTALL_PREFIX/var/postfix/pid/*
-    rm -rf $RPM_INSTALL_PREFIX/var/postfix/private/*
-    rm -rf $RPM_INSTALL_PREFIX/var/postfix/public/*
+    if [ $1 -eq 0 ]; then
+        $RPM_INSTALL_PREFIX/etc/rc postfix stop >/dev/null 2>&1 || true
+        (cd $RPM_INSTALL_PREFIX/etc/postfix/; %{l_make} clean >/dev/null 2>&1 || true)
+        rm -rf $RPM_INSTALL_PREFIX/etc/postfix/prng_exch
+        rm -rf $RPM_INSTALL_PREFIX/var/postfix/pid/*
+        rm -rf $RPM_INSTALL_PREFIX/var/postfix/private/*
+        rm -rf $RPM_INSTALL_PREFIX/var/postfix/public/*
+    fi