wok-6.x rev 6430

Up: cyrus-imapd, cyrus-imapd-dev to 2.3.16.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Sep 27 07:54:50 2010 +0000 (2010-09-27)
parents 9c7938cac484
children 455cdb107cc9
files cyrus-imapd-dev/receipt cyrus-imapd/receipt cyrus-imapd/stuff/50-FTBFS-gcc-4.0-fix.dpatch
line diff
     1.1 --- a/cyrus-imapd-dev/receipt	Mon Sep 27 07:05:26 2010 +0000
     1.2 +++ b/cyrus-imapd-dev/receipt	Mon Sep 27 07:54:50 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cyrus-imapd-dev"
     1.7 -VERSION="2.2.12"
     1.8 +VERSION="2.3.16"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="IMAP server development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/cyrus-imapd/receipt	Mon Sep 27 07:05:26 2010 +0000
     2.2 +++ b/cyrus-imapd/receipt	Mon Sep 27 07:54:50 2010 +0000
     2.3 @@ -1,14 +1,14 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="cyrus-imapd"
     2.7 -VERSION="2.2.12"
     2.8 +VERSION="2.3.16"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="IMAP server."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.13  WEB_SITE="http://cyrusimap.web.cmu.edu/"
    2.14  WGET_URL="ftp://ftp.andrew.cmu.edu/pub/cyrus/$TARBALL"
    2.15 -BUILD_DEPENDS="libcomerr-dev cyrus-sasl cyrus-sasl-dev openssl-dev db-dev"
    2.16 +BUILD_DEPENDS="libcomerr-dev cyrus-sasl cyrus-sasl-dev openssl-dev db-dev perl"
    2.17  DEPENDS="libcomerr cyrus-sasl openssl db perl libwrap slitaz-base-files \
    2.18  net-snmp"
    2.19  CONFIG_FILES="/etc/imapd.conf /etc/cyrus.conf"
    2.20 @@ -17,16 +17,6 @@
    2.21  compile_rules()
    2.22  {
    2.23  	cd $src
    2.24 -	while read arg file; do
    2.25 -		[ -f done.$file ] && continue
    2.26 -		echo "Apply $file..."
    2.27 -		patch $arg < ../stuff/$file
    2.28 -		touch done.$file
    2.29 -	done << EOT
    2.30 --p1 50-FTBFS-gcc-4.0-fix.dpatch
    2.31 --p0 p1.patch
    2.32 --p0 p2.patch
    2.33 -EOT
    2.34  	./configure --prefix=/usr --infodir=/usr/share/info \
    2.35  	--with-service-path=/usr/lib/cyrus \
    2.36  	--with-cyrus-prefix=/usr/lib/cyrus \
    2.37 @@ -42,8 +32,8 @@
    2.38  	cp -a $_pkg/usr/bin $fs/usr
    2.39  	cp -a $_pkg/usr/lib/cyrus $fs/usr/lib
    2.40  	cp -a $_pkg/usr/lib/perl5 $fs/usr/lib
    2.41 -	strip -s $fs/usr/lib/cyrus/bin/*
    2.42 -	cp $src/tools/mkimap $fs/usr/lib/cyrus/bin
    2.43 +	strip -s $fs/usr/lib/cyrus/*
    2.44 +	cp $src/tools/mkimap $fs/usr/lib/cyrus
    2.45  	cp -a stuff/etc $fs
    2.46  	cp $src/master/conf/small.conf $fs/etc/cyrus.conf
    2.47  	for i in proc db socket log msg ptclient; do
     3.1 --- a/cyrus-imapd/stuff/50-FTBFS-gcc-4.0-fix.dpatch	Mon Sep 27 07:05:26 2010 +0000
     3.2 +++ b/cyrus-imapd/stuff/50-FTBFS-gcc-4.0-fix.dpatch	Mon Sep 27 07:54:50 2010 +0000
     3.3 @@ -1,10 +1,3 @@
     3.4 -#! /bin/sh /usr/share/dpatch/dpatch-run
     3.5 -## 50-FTBFS-gcc-4.0-fix.dpatch by Ondřej Surý <ondrej@sury.org>
     3.6 -##
     3.7 -## All lines beginning with `## DP:' are a description of the patch.
     3.8 -## DP: Fix FTBFS when compiling with gcc-4.0, there is imapopts is used before declared
     3.9 -
    3.10 -@DPATCH@
    3.11  diff -urN cyrus22-imapd-2.2.12~/tools/config2header cyrus22-imapd-2.2.12/tools/config2header
    3.12  --- cyrus22-imapd-2.2.12~/tools/config2header	2004-06-22 21:02:31.000000000 +0200
    3.13  +++ cyrus22-imapd-2.2.12/tools/config2header	2005-06-22 07:56:17.180293688 +0200