wok diff postfix/receipt @ rev 4441

Update: gettext (build_depends and depends)
author Matthew Sheets <rcx@zoominternet.net>
date Tue Nov 03 10:45:00 2009 +0000 (2009-11-03)
parents 051a78c03e10
children f3327707164a
line diff
     1.1 --- a/postfix/receipt	Mon May 11 15:45:26 2009 +0200
     1.2 +++ b/postfix/receipt	Tue Nov 03 10:45:00 2009 +0000
     1.3 @@ -1,13 +1,13 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="postfix"
     1.7 -VERSION="2.5.5"
     1.8 +VERSION="2.6.3"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="fast, easy to administer, and secure mailer."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.13  WEB_SITE="http://www.postfix.org/"
    1.14 -WGET_URL="ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/official/$TARBALL"
    1.15 +WGET_URL="ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/$TARBALL"
    1.16  BUILD_DEPENDS="db-dev openldap-dev pcre-dev openssl-dev"
    1.17  DEPENDS="libdb libldap pcre openssl slitaz-base-files cyrus-sasl"
    1.18  CONFIG_FILES="/etc/postfix"
    1.19 @@ -15,11 +15,14 @@
    1.20  # Rules to configure and make the package.
    1.21  compile_rules()
    1.22  {
    1.23 -
    1.24  	cd $src
    1.25 -	make makefiles CCARGS="-DHAS_DB -DHAS_LDAP" AUXLIBS="-ldb -lldap -llber"
    1.26 +	make makefiles \
    1.27 +	CCARGS='-DHAS_DB -DHAS_LDAP \
    1.28 +		-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
    1.29 +		-DDEF_MANPAGE_DIR=\"/usr/share/man\"' \
    1.30 +	AUXLIBS="-ldb -lldap -llber" &&
    1.31  	make
    1.32 -	install_root=/home/slitaz/wok/postfix/postfix-$VERSION/_pkg \
    1.33 +	install_root=$PWD/_pkg \
    1.34  		sh postfix-install -non-interactive
    1.35  }
    1.36  
    1.37 @@ -27,10 +30,11 @@
    1.38  genpkg_rules()
    1.39  {
    1.40  	mkdir -p $fs/usr/share/licenses/
    1.41 -	cp -a $_pkg/usr/libexec $fs/usr
    1.42 +	cp -a $_pkg/usr/lib $fs/usr
    1.43  	cp -a $_pkg/usr/bin $fs/usr
    1.44  	cp -a $_pkg/usr/sbin $fs/usr
    1.45  	cp -a $_pkg/etc $fs
    1.46 +
    1.47  	awk 'BEGIN {n=0} /MUST/ {n++} /ALIASES/ {n++} { if (n==1) print }' \
    1.48  		< $_pkg/etc/postfix/aliases > $fs/etc/postfix/aliases
    1.49  	while read keyword data; do
    1.50 @@ -51,22 +55,18 @@
    1.51  	mv $fs/etc/postfix/TLS_LICENSE $fs/usr/share/licenses/POSTFIX_TLS_LICENSE
    1.52  	mv $fs/etc/postfix/LICENSE $fs/usr/share/licenses/POSTFIX_LICENSE
    1.53  	cp -a stuff/etc/init.d $fs/etc
    1.54 -	rm -f $fs/etc/postfix/post*
    1.55 +	rm -f $fs/usr/lib/postfix/post* $fs/usr/lib/postfix/*.cf
    1.56 +	strip -s $fs/usr/lib/postfix/*
    1.57  }
    1.58  
    1.59  # Pre and post install commands for Tazpkg.
    1.60  post_install()
    1.61  {
    1.62 -        # adduser postfix if needed
    1.63 +    # adduser postfix if needed
    1.64  	if ! grep -q postfix $1/etc/passwd; then
    1.65 -		echo -n "Adding user postfix..."
    1.66 -		chroot $1/ adduser postfix -D -H -S -h /dev/null
    1.67 -		status
    1.68 -	fi
    1.69 -	# addgroup postfix if needed
    1.70 -	if ! grep -q postfix $1/etc/group; then
    1.71 -		echo -n "Adding group postfix..."
    1.72 -		chroot $1/ sh -c 'addgroup postfix && addgroup postfix postfix'
    1.73 +		echo -n "Adding user Postfix..."
    1.74 +		chroot $1/ adduser -s /bin/false -h /dev/null \
    1.75 +			-g "Postfix Daemon user" -H -D -S postfix
    1.76  		status
    1.77  	fi
    1.78  	# addgroup postdrop if needed
    1.79 @@ -100,6 +100,5 @@
    1.80  post_remove()
    1.81  {
    1.82  	deluser postfix
    1.83 -	delgroup postfix
    1.84  	delgroup postdrop
    1.85  }