X-Original-To: alpine-aports@lists.alpinelinux.org Received: from newmail.tetrasec.net (unknown [172.21.74.12]) by lists.alpinelinux.org (Postfix) with ESMTP id 83F625C4428 for ; Thu, 9 Mar 2017 10:52:44 +0000 (GMT) Received: from ncopa-desktop.copa.dup.pw (15.63.200.37.customer.cdi.no [37.200.63.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by newmail.tetrasec.net (Postfix) with ESMTPSA id 8E3E65A1144; Thu, 9 Mar 2017 10:52:43 +0000 (GMT) Date: Thu, 9 Mar 2017 11:52:38 +0100 From: Natanael Copa To: Jesse Young Cc: Valery Kartel , alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] testing/exim: upgrade to 4.89 Message-ID: <20170309115238.790d2aee@ncopa-desktop.copa.dup.pw> In-Reply-To: <20170308210357.17310-1-valery.kartel@gmail.com> References: <20170308210357.17310-1-valery.kartel@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Jesse, You are the maintainer. Are you ok with this change? -nc On Wed, 8 Mar 2017 23:03:57 +0200 Valery Kartel wrote: > - APKBUILD cleanups and improve redability > - add redis lookup backend support > - rewrite lookup backends building in APKBUILD > - rename lookup backends subpackages to $pkgname-lookup_$backend > and make it provides its old $pkgname-$backend subpackages name. > --- > testing/exim/APKBUILD | 67 +++++++++++++++++++++++++++------------------- > testing/exim/exim.Makefile | 2 ++ > 2 files changed, 41 insertions(+), 28 deletions(-) > > diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD > index a25f5e58e1..0230372620 100644 > --- a/testing/exim/APKBUILD > +++ b/testing/exim/APKBUILD > @@ -4,27 +4,36 @@ > # Contributor: Jesse Young > # Maintainer: Jesse Young > pkgname=exim > -pkgver=4.88 > -pkgrel=2 > -pkgdesc="A Message Transfer Agent" > +pkgver=4.89 > +pkgrel=0 > +pkgdesc="EXIM - A Message Transfer Agent" > url="http://www.exim.org/" > arch="all" > license="GPL2" > -options="suid" > +options="suid !check" > depends="ca-certificates" > pkgusers="exim" > pkggroups="exim" > makedepends="bash gawk perl $depends_dev db-dev pcre-dev libressl-dev libspf2-dev mariadb-dev > - postgresql-dev sqlite-dev libidn-dev linux-headers" > + postgresql-dev sqlite-dev libidn-dev linux-headers hiredis-dev > + " > install="exim.pre-install" > -subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql > - $pkgname-utils $pkgname-scripts::noarch $pkgname-doc" > +subpackages="$pkgname-doc $pkgname-utils $pkgname-scripts::noarch > + $pkgname-lookup_dbmdb:_lookup > + $pkgname-lookup_dnsdb:_lookup > + $pkgname-lookup_mysql:_lookup > + $pkgname-lookup_pgsql:_lookup > + $pkgname-lookup_redis:_lookup > + $pkgname-lookup_sqlite:_lookup > + $pkgname-postgresql::noarch > + " > source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.bz2 > - exim.Makefile > - exim.confd > - exim.initd > - exim.logrotate > - exim.gencert" > + $pkgname.Makefile > + $pkgname.confd > + $pkgname.initd > + $pkgname.logrotate > + $pkgname.gencert > + " > builddir="$srcdir/$pkgname-$pkgver" > > prepare() { > @@ -53,7 +62,7 @@ package() { > mv exim-${pkgver%.*}* exim > chmod u+s exim > for i in mailq rmail rsmtp runq sendmail newaliases; do > - ln -s exim $i > + ln -s /usr/sbin/exim $i > done > install -Dm644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname > install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname > @@ -66,8 +75,8 @@ package() { > } > > scripts() { > - pkgdesc="exim scripts" > - depends="exim perl" > + pkgdesc="$pkgdesc (scripts)" > + depends="$pkgname perl" > cd "$builddir" > make DESTDIR="$subpkgdir" \ > INSTALL_ARG="exicyclog exim_checkaccess eximstats exiqgrep exigrep exinext exiqsumm exipick exiwhat convert4r3 convert4r4" \ > @@ -76,8 +85,8 @@ scripts() { > } > > utils() { > - pkgdesc="exim utils" > - depends="exim" > + pkgdesc="$pkgdesc (utils)" > + depends="$pkgname" > cd "$builddir" > make DESTDIR="$subpkgdir" \ > INSTALL_ARG="exim_dbmbuild exim_dumpdb exim_tidydb exim_fixdb exim_lock" \ > @@ -86,21 +95,23 @@ utils() { > rm -fr "$subpkgdir"/etc > } > > -_mv_ext() { > - pkgdesc="EXIM extension: $1" > +_lookup() { > + local name=${subpkgname#$pkgname-lookup_} > + pkgdesc="EXIM lookup backend: $name" > depends="$pkgname" > - install -D -m755 "$builddir"/build-Linux-*/lookups/$1.so "$subpkgdir"/usr/lib/$pkgname/$1.so > + provides="$pkgname-$name" > + install -D -m755 "$builddir"/build-Linux-*/lookups/$name.so \ > + "$subpkgdir"/usr/lib/$pkgname/$name.so > } > > -sqlite() { _mv_ext sqlite; } > -mysql() { _mv_ext mysql; } > -postgresql() { _mv_ext pgsql; } > -cdb() { _mv_ext cdb; } > -dbmdb() { _mv_ext dbmdb; } > -dnsdb() { _mv_ext dnsdb; } > +postgresql() { > + depends="$pkgname-lookup_pgsql" > + pkgdesc="FOR COMPATIBILITY ONLY: use $pkgname-lookup_pgsql" > + mkdir -p "$subpkgdir" > +} > > -sha512sums="ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf exim-4.88.tar.bz2 > -c0733014f52d78e3380c018109cf5628b498cea29e901344598ff128d9f3a190766ce9a5858f4fff6fc4b1c6f921dd1a3589f566eebc1f0ec709d2a8da2bbd82 exim.Makefile > +sha512sums="1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65 exim-4.89.tar.bz2 > +8c0fc93fa18d81a9bba90404a41262748f175637027716171fc4b0d5b019d14b71a924d6b36f484ffb2279a18b9e6711f8583924995512ec9574597c57de4739 exim.Makefile > bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66 exim.confd > 3769e74a54566362bcdf57c45fbf7d130d7a7529fbc40befce431eef0387df117c71a5b57779c507e30d5b125913b5f26c9d16b17995521a1d94997be6dc3e02 exim.initd > 28e748693a6a72d9943fa9c342ff041fe650fa6977f468dee127e845e6c2a91872ce33fb6f5698838906bde3ed92de7a91cdb0349cedc40b806261867e8c06cb exim.logrotate > diff --git a/testing/exim/exim.Makefile b/testing/exim/exim.Makefile > index c372d73016..b3b618c2c6 100644 > --- a/testing/exim/exim.Makefile > +++ b/testing/exim/exim.Makefile > @@ -29,6 +29,8 @@ LOOKUP_MYSQL_LIBS=-Wl,--no-as-needed -lmysqlclient > LOOKUP_PGSQL=2 > LOOKUP_PGSQL_INCLUDE=-I/usr/include/postgresql > LOOKUP_PGSQL_LIBS=-Wl,--no-as-needed -lpq > +LOOKUP_REDIS=2 > +LOOKUP_REDIS_LIBS=-Wl,--no-as-needed -lhiredis > LOOKUP_SQLITE=2 > LOOKUP_SQLITE_LIBS=-Wl,--no-as-needed -lsqlite3 > PCRE_CONFIG=yes --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---