Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6f3f46ca4ec34be074d3c86114bf326081dc414
commit f6f3f46ca4ec34be074d3c86114bf326081dc414 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Nov 5 11:50:32 2012 +0100 postfix-2.9.4-2-x86_64 - drop sysvinit support diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index 12db95d..1457816 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -4,7 +4,7 @@ pkgname=postfix pkgver=2.9.4 -pkgrel=1 +pkgrel=2 vdaver=2.9.1 pkgdesc="A fast, easy to administer, and secure MTA" url="http://www.postfix.org/"; @@ -23,13 +23,11 @@ Finclude systemd mirror="http://de.postfix.org/ftpmirror"; up2date="lynx -dump $mirror/index.html|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.gz/\1/'" source=($mirror/official/$pkgname-$pkgver.tar.gz \ - rc.$pkgname \ postfix.service \ README.Frugalware \ http://vda.sourceforge.net/VDA/postfix-vda-v11-$vdaver.patch) sha1sums=('ac53c2c6e15b642d5d06eb0fc092d6a35ab7eec7' \ - 'e4ce292fa25da586027bd1085575f327969507bd' \ '09cdb731899b0fac0438589b03e1a9b14ddf1878' \ 'b05736300a01bc6d4d0ca7bb92704de29b68651d' \ 'f259c489d76271ac1780510e20a60962f97ac36f') @@ -50,7 +48,6 @@ build() # aliases Fsed '\(^#alias_maps = netinfo:/aliases$\)' '\1\nalias_maps = hash:/etc/postfix/aliases' $Fdestdir/etc/postfix/main.cf Fsed '\(^#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases$\)' '\1\nalias_database = hash:/etc/postfix/aliases' $Fdestdir/etc/postfix/main.cf - Frcd Ffile /lib/systemd/system/postfix.service # For compatibility reasons - some app searches the sendmail # binary in /usr/lib diff --git a/source/network/postfix/messages/postfix.en b/source/network/postfix/messages/postfix.en deleted file mode 100644 index 758af93..0000000 --- a/source/network/postfix/messages/postfix.en +++ /dev/null @@ -1,3 +0,0 @@ -stoppostfix="Stopping Postfix" -startpostfix="Starting Postfix" -restartpostfix="Restarting Postfix" diff --git a/source/network/postfix/messages/postfix.hu b/source/network/postfix/messages/postfix.hu deleted file mode 100644 index 142cd3c..0000000 --- a/source/network/postfix/messages/postfix.hu +++ /dev/null @@ -1,3 +0,0 @@ -stoppostfix="A postfix leállítása" -startpostfix="A postfix indítása" -restartpostfix="A postfix ujraindítása" diff --git a/source/network/postfix/postfix.install b/source/network/postfix/postfix.install index def8f61..fd4d781 100644 --- a/source/network/postfix/postfix.install +++ b/source/network/postfix/postfix.install @@ -1,4 +1,3 @@ -sysvinit_units=(@_F_sysvinit_units@) systemd_units=(@_F_systemd_units@) post_install() @@ -16,10 +15,6 @@ post_install() local unit local op - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - for i in ${systemd_units[@]}; do unit=$(echo $i | cut -f 1 -d '=') op=$(echo $i | cut -f 2 -d '=') @@ -34,10 +29,6 @@ post_install() post_upgrade() { - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - systemctl daemon-reload >/dev/null 2>&1 } @@ -49,10 +40,6 @@ pre_remove() local unit - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - for i in ${systemd_units[@]}; do unit=$(echo $i | cut -f 1 -d '=') systemctl --no-reload disable $unit.service >/dev/null 2>&1 diff --git a/source/network/postfix/rc.postfix b/source/network/postfix/rc.postfix deleted file mode 100644 index a058eba..0000000 --- a/source/network/postfix/rc.postfix +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -# (c) 2003, 2007, 2010 Miklos Vajna <vmik...@frugalware.org> -# rc.postfix for Frugalware -# distributed under GPL License - -. /etc/rc.d/rc.functions - -# chkconfig: 2345 80 30 -# description: Postfix - -if [ "$1" = "stop" ]; then - stop "$stoppostfix" - postfix stop > /dev/null 2>&1 - ok $? -elif [ "$1" = "restart" ]; then - start "$restartpostfix" - postfix reload - ok $? -else # start - start "$startpostfix" - if ! grep -q '^myhostname =' /etc/postfix/main.cf; then - sed -i "s/^#myhostname = host.domain.tld$/myhostname = `cat /etc/hostname`/" /etc/postfix/main.cf - fi - newaliases - - # see if anything is running chrooted. - NEED_CHROOT=$(awk '/^[0-9a-z]/ && ($5 ~ "[-yY]") { print "y"; exit }' /etc/postfix/master.cf) - - if [ -n "$NEED_CHROOT" ]; then - # Make sure that the chroot environment is set up correctly. - oldumask=$(umask) - umask 022 - cd $(postconf -h queue_directory) - - FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \ - etc/nsswitch.conf" - for file in $FILES; do - [ -d ${file%/*} ] || mkdir -p ${file%/*} - if [ -f /${file} ]; then rm -f ${file} && cp /${file} ${file}; fi - if [ -f ${file} ]; then chmod a+rX ${file}; fi - done - - # if we're using unix:passwd.byname, then we need to add etc/passwd. - local_maps=$(postconf -h local_recipient_maps) - if [ "X$local_maps" != "X${local_maps#*unix:passwd.byname}" ]; then - if [ "X$local_maps" = "X${local_maps#*proxy:unix:passwd.byname}" ]; then - sed 's/^\([^:]*\):[^:]*/\1:x/' /etc/passwd > etc/passwd - chmod a+r etc/passwd - fi - fi - - if [ -d usr/lib/zoneinfo ]; then - rm -f usr/lib/zoneinfo/localtime - else - mkdir -p usr/lib/zoneinfo - fi - ln -sf /etc/localtime usr/lib/zoneinfo/localtime - rm -f lib/libnss_*so* - tar cf - /lib/libnss_*so* 2>/dev/null |tar xf - - umask $oldumask - fi - - postfix start > /dev/null 2>&1 - ok $? -fi
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
