[arch-commits] Commit in dovecot/trunk (PKGBUILD dovecot.install)

[andyrtr at archlinux.org]

    Date: Monday, August 16, 2010 @ 17:19:59
  Author: andyrtr
Revision: 87569

prepare 2.0.0

Modified:
  dovecot/trunk/PKGBUILD
  dovecot/trunk/dovecot.install

-----------------+
 PKGBUILD        |   56 ++++++++++++++++++++++++++++++++++++++++--------------
 dovecot.install |   17 +++++++++++-----
 2 files changed, 54 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-16 20:51:39 UTC (rev 87568)
+++ PKGBUILD	2010-08-16 21:19:59 UTC (rev 87569)
@@ -6,41 +6,69 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=dovecot
-pkgver=1.2.13
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
 license=("LGPL")
 depends=("pam>=1.0.4" "libmysqlclient>=5.1.38" "postgresql-libs>=8.4.1-1" "sqlite3>=3.6.18" "db>=4.8"
-	 "heimdal>=1.3.1" 'libcap>=2.17' 'bzip2')
+	 "heimdal>=1.3.1" 'libcap>=2.17' 'bzip2' 'curl')
 optdepends=('libldap: ldap plugin')
 makedepends=('libldap>=2.4.18-1')
 provides=('imap-server' 'pop3-server')
 options=('!libtool')
+backup=(etc/dovecot/dovecot.conf
+	etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf
+	etc/dovecot/conf.d/{15-lda.conf,20-imap,20-lmtp,20-pop3}.conf
+	etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf
+	etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext
+	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
-source=(http://dovecot.org/releases/1.2/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('aaee3b5fd59e01780305553248f686bc'
+source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
+md5sums=('2ca3cbd523cac1cbd53a904255dcd4f8'
          'd020d43eab4ded6fb379dadc570a9490')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver || return 1
+  cd ${srcdir}/$pkgname-$pkgver
 
   # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc/dovecot --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
-	--with-db --with-mysql --with-pgsql --with-sqlite \
+	--with-nss \
+	--with-pam \
+	--with-mysql \
+	--with-pgsql \
+	--with-sqlite \
 	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
-	--with-gssapi --with-ldap=plugin --enable-header-install --with-docs || return 1
+	--with-gssapi \
+	--with-ldap=plugin \
+	--with-zlib --with-bzlib \
+	--with-libcap \
+	--with-solr \
+	--with-docs
+  make
+}
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
 
   # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname || return 1
+  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
 
+  # install example conf files and ssl.conf
+  install -d -m755 ${pkgdir}/etc/dovecot/conf.d
+  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf ${pkgdir}/etc/dovecot/conf.d
+  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext ${pkgdir}/etc/dovecot/conf.d
+  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/
+  install -d -m755 ${pkgdir}/etc/ssl
+  install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/
+
+  rm ${pkgdir}/etc/dovecot/README
+  
   # fix paths in the config example file where we have a different layout
-  sed -i 's|/usr/lib/dovecot|/usr/lib/dovecot/modules|g;
-	  s|libexec|lib|g;
-	  s|lib/sendmail|sbin/sendmail|g' $pkgdir/etc/dovecot/dovecot-example.conf || return 1
+#  sed -i 's|/usr/lib/dovecot|/usr/lib/dovecot/modules|g;
+#	  s|libexec|lib|g;
+#	  s|lib/sendmail|sbin/sendmail|g' $pkgdir/etc/dovecot/dovecot.conf || return 1
 }

Modified: dovecot.install
===================================================================
--- dovecot.install	2010-08-16 20:51:39 UTC (rev 87568)
+++ dovecot.install	2010-08-16 21:19:59 UTC (rev 87569)
@@ -2,9 +2,11 @@
 post_install() {
     if [ -z "`grep '^dovecot:' /etc/group`" ]; then
 	groupadd -g 76 dovecot >& /dev/null
+	groupadd -g 74 dovenull >& /dev/null
     fi
     if [ -z "`grep '^dovecot:' /etc/passwd`" ]; then
 	useradd -u 76 -d /var/run/dovecot/login -g dovecot -s /bin/false dovecot
+    	useradd -u 74 -d /var/run/dovenull/login -g dovecot -s /bin/false dovenull
     fi
 }
 
@@ -12,15 +14,20 @@
 # arg 2:  the old package version
 post_upgrade() {
     post_install $1
+      if [ "`vercmp $2 2.0.0`" -lt 0 ]; then
+        # important upgrade notice
+        echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE"
+        echo "> ------------------------------------"
+        echo "> see http://wiki2.dovecot.org/Upgrading/2.0"
+	echo "> make sure, you convert the dovecot.conf file"
+    fi
+
 }
 
 # arg 1:  the old package version
 pre_remove() {
     userdel dovecot &> /dev/null
+    userdel dovenull &> /dev/null
     groupdel dovecot &> /dev/null
+    groupdel dovenull &> /dev/null
 }
-
-op=$1
-shift
-
-$op $*