Branch '2.3-stable' - 6 commits - apache-php/apache-php.conf apache-php/apache-php.ini apache-php/apache-php.patch apache-php/apache-php.spec apache-php/Makefile clamav/clamav.spec clamav/Makefile .gitignore .hgignore openssl/openssl.patch openssl/openssl.spec php/Makefile php/php.ini php/php.patch php/php.spec z-push/z-push.spec
Git Service User
git at kolabsys.com
Tue Apr 5 16:39:14 CEST 2011
.gitignore | 25 +
.hgignore | 25 -
apache-php/Makefile | 43 ---
apache-php/apache-php.conf | 14 +
apache-php/apache-php.ini | 25 +
apache-php/apache-php.patch | 18 +
apache-php/apache-php.spec | 600 ++++++++++++++++++++++++++++++++++++++++++++
clamav/Makefile | 2
clamav/clamav.spec | 9
openssl/openssl.patch | 18 -
openssl/openssl.spec | 9
php/Makefile | 40 --
php/php.ini | 19 +
php/php.patch | 18 +
php/php.spec | 579 ++++++++++++++++++++++++++++++++++++++++++
z-push/z-push.spec | 5
16 files changed, 1329 insertions(+), 120 deletions(-)
New commits:
commit fefa4258091a037fdf4d5725d800122c379ae528
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Mar 1 18:19:46 2011 +0100
clamav: Update to 0.97
diff --git a/clamav/Makefile b/clamav/Makefile
index 2affe85..df71e11 100644
--- a/clamav/Makefile
+++ b/clamav/Makefile
@@ -4,7 +4,7 @@ PACKAGE = $(shell grep "^Name:" *.spec | sed -e "s/^Name:\s*\([a-z-]*\).*/\1/")
VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
-SOURCE_URL=http://files.kolab.org/server/development-2.3/externals
+SOURCE_URL=http://downloads.sourceforge.net/clamav
SOURCE_0=$(PACKAGE)-$(VERSION).tar.gz
EXTRA=clamav.patch rc.clamav
diff --git a/clamav/clamav.spec b/clamav/clamav.spec
index ce922d7..020cdef 100644
--- a/clamav/clamav.spec
+++ b/clamav/clamav.spec
@@ -29,8 +29,8 @@ Vendor: Tomasz Kojm
Packager: Intevation GmbH
Group: AntiVirus
License: GPL
-Version: 0.96.5
-Release: 20101202
+Version: 0.97
+Release: 20110301
# package options
%option with_milter no
@@ -187,5 +187,8 @@ AutoReqProv: no
exit 0
%changelog
+* Tue Mar 01 2011 Christoph Wickert <wickert at kolabsys.com> - 0.97-20110301
+- Update to 0.97
+
* Thu Dec 02 2010 Christoph Wickert <wickert at kolabsys.com> - 0.96.5-20101202
--
+- Update to 0.96.5
commit 68a460d556dece89c8ee06c1837a295de5a9845e
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Mar 1 17:19:18 2011 +0100
php: switch from patched openpkg to full packaging
diff --git a/php/Makefile b/php/Makefile
index 8d9ea1c..dcd8308 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -1,30 +1,16 @@
include ../make-helper/kolab.mk
PACKAGE=php
-DOWNLOAD_VERSION=5.3.1
-OPENPKG_RELEASE=20091129
VERSION=5.3.4
-VERSION_SUHOSHIN_EXTENSION=0.9.32.1
-VERSION_SUHOSHIN_PATCH=5.3.4-0.9.10
-VERSION_MEMCACHE=2.2.6
RELEASE=20101230_kolab1
SOURCE_URL=http://www.php.net/distributions
-SOURCE_1_URL=http://download.suhosin.org
-SOURCE_2_URL=http://pecl.php.net/get
-SOURCE_3_URL=http://download.suhosin.org
SOURCE_0=php-$(VERSION).tar.bz2
-SOURCE_1=suhosin-$(VERSION_SUHOSHIN_EXTENSION).tar.gz
-SOURCE_2=memcache-$(VERSION_MEMCACHE).tgz
-SOURCE_3=suhosin-patch-$(VERSION_SUHOSHIN_PATCH).patch.gz
-
-SOURCES=$(SOURCE_0) $(SOURCE_1) $(SOURCE_2) $(SOURCE_3)
-RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3)
PATCHES=patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
-EXTRA=$(PATCHES) kolab.patch
+EXTRA=$(PATCHES) php.ini php.patch
BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
--define 'with_pear yes' --define 'with_gettext yes' \
@@ -36,28 +22,6 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_simplexml yes' --define 'with_sqlite yes' --define 'with_spl yes' \
--define 'with_json yes' --define 'with_tokenizer yes'
-# Target for retrieving the second source package
-$(SOURCE_1):
- wget -c "$(SOURCE_1_URL)/$(SOURCE_1)"
-
-# Target for retrieving the third source package
-$(SOURCE_2):
- wget -c "$(SOURCE_2_URL)/$(SOURCE_2)"
-
-# Target for retrieving the fourth source package
-$(SOURCE_3):
- wget -c "$(SOURCE_3_URL)/$(SOURCE_3)"
-
-# Target for the source files in the src rpm directory.
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_1)
- cp $(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/
-
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_2)
- cp $(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/
-
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_3)
- cp $(SOURCE_3) $(KOLABRPMSRC)/$(PACKAGE)/
-
include ../make-helper/package.mk
-include ../make-helper/openpkg-patched.mk
+include ../make-helper/package-new.mk
include ../make-helper/fetch.mk
diff --git a/php/php.ini b/php/php.ini
new file mode 100644
index 0000000..c8ec96f
--- /dev/null
+++ b/php/php.ini
@@ -0,0 +1,19 @@
+;;
+;; php.ini -- PHP Configuration
+;;
+
+[PHP]
+
+; Resource Limits
+register_globals = off ; Global variables are no longer registered for input data
+allow_url_fopen = off ; Disable the opening of remote URLs
+display_errors = off ; Errors will NOT be displayed
+log_errors = on ; Errors will be logged
+max_execution_time = 60 ; Maximum execution time of each script, in seconds
+max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
+memory_limit = 128M ; Maximum amount of memory a script may consume
+post_max_size = 128M ; Maximum amount of POST data accepted
+
+; Include Paths
+include_path = ".:@l_prefix@/lib/php"
+
diff --git a/php/php.patch b/php/php.patch
new file mode 100644
index 0000000..8fcb2c7
--- /dev/null
+++ b/php/php.patch
@@ -0,0 +1,18 @@
+Index: ext/gd/libgd/gd_arc.c
+--- ext/gd/libgd/gd_arc.c.orig 2009-05-26 22:14:31 +0200
++++ ext/gd/libgd/gd_arc.c 2009-07-01 08:56:12 +0200
+@@ -53,6 +53,7 @@
+ }
+ }
+
++#if 0
+ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
+ {
+ int x=0,mx1=0,mx2=0,my1=0,my2=0;
+@@ -106,5 +107,6 @@
+ old_y1 = my1;
+ }
+ }
++#endif
+
+
diff --git a/php/php.spec b/php/php.spec
new file mode 100644
index 0000000..ded346b
--- /dev/null
+++ b/php/php.spec
@@ -0,0 +1,579 @@
+##
+## php.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package versions
+%define V_php 5.3.4
+
+# package information
+Name: php
+Summary: Personal HomePage (PHP)
+URL: http://www.php.net/
+Vendor: The PHP Project
+Packager: OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class: BASE
+Group: Language
+License: PHP
+Version: %{V_php}
+Release: 20101230_kolab1
+
+# package options
+%option with_bc no
+%option with_bdb no
+%option with_bzip2 no
+%option with_calendar no
+%option with_ctype no
+%option with_curl no
+%option with_debug no
+%option with_dom no
+%option with_exif no
+%option with_freetype no
+%option with_ftp no
+%option with_gd no
+%option with_gdbm no
+%option with_gettext no
+%option with_iconv no
+%option with_imap no
+%option with_imap_annotate no
+%option with_hash no
+%option with_imap_myrights no
+%option with_json no
+%option with_tokenizer no
+%option with_mbregex no
+%option with_mbstring no
+%option with_mcrypt no
+%option with_hash no
+%option with_mm no
+%option with_mysql no
+%option with_mysqlnd no
+%option with_oci8 no
+%option with_odbc no
+%option with_openldap no
+%option with_openldapsasl no
+%option with_pear no
+%option with_pgsql no
+%option with_posix no
+%option with_sendmail no
+%option with_session no
+%option with_simplexml no
+%option with_snmp no
+%option with_soap no
+%option with_sqlite no
+%option with_ssl no
+%option with_tidy no
+%option with_versioning no
+%option with_wddx no
+%option with_xml no
+%option with_xslt no
+%option with_zlib no
+%option with_zip no
+
+# fixing implicit extension dependencies and correlations
+%if "%{with_mm}" == "yes"
+%undefine with_session
+%define with_session yes
+%endif
+%if "%{with_pear}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
+%if "%{with_freetype}" == "yes"
+%undefine with_gd
+%define with_gd yes
+%endif
+%if "%{with_imap_annotate}" == "yes"
+%undefine with_imap
+%define with_imap yes
+%endif
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" == "yes" || "%{with_zip}" == "yes"
+%undefine with_zlib
+%define with_zlib yes
+%endif
+%if "%{with_xslt}" == "yes"
+%undefine with_dom
+%define with_dom yes
+%endif
+%if "%{with_dom}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
+%if "%{with_soap}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
+%if "%{with_pgsql}" == "yes"
+%undefine with_ssl
+%define with_ssl yes
+%endif
+
+# list of sources
+Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
+Source2: php.ini
+Patch1: http://git.kolab.org/server/tree/php/patches/%{V_php}/KOLAB_php-%{V_php}_Annotations.patch
+Patch2: php.patch
+Patch3: http://git.kolab.org/server/tree/php/patches/%{V_php}/KOLAB_php-%{V_php}_myrights.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, flex, bison
+PreReq: OpenPKG, openpkg >= 20050615
+BuildPreReq: pcre
+PreReq: pcre
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
+%if "%{with_mysql}" == "yes"
+BuildPreReq: mysql
+PreReq: mysql
+%endif
+%if "%{with_pgsql}" == "yes"
+BuildPreReq: postgresql
+PreReq: postgresql
+%endif
+%if "%{with_gd}" == "yes"
+BuildPreReq: gd >= 2.0.20, jpeg, png
+PreReq: gd >= 2.0.20, jpeg, png
+%endif
+%if "%{with_bdb}" == "yes"
+BuildPreReq: db
+PreReq: db
+%endif
+%if "%{with_zlib}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
+%if "%{with_bzip2}" == "yes"
+BuildPreReq: bzip2
+PreReq: bzip2
+%endif
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+%if "%{with_openldap}" == "yes"
+BuildPreReq: openldap
+PreReq: openldap
+%if "%{with_openldapsasl}" == "yes"
+BuildPreReq: openldap::with_sasl = yes
+PreReq: openldap::with_sasl = yes
+%else
+BuildPreReq: openldap::with_sasl = no
+PreReq: openldap::with_sasl = no
+%endif
+%endif
+%if "%{with_mm}" == "yes"
+BuildPreReq: mm
+PreReq: mm
+%endif
+%if "%{with_freetype}" == "yes"
+BuildPreReq: freetype
+PreReq: freetype
+%endif
+%if "%{with_gettext}" == "yes"
+BuildPreReq: gettext, libiconv
+PreReq: gettext, libiconv
+%endif
+%if "%{with_iconv}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
+%if "%{with_imap}" == "yes"
+BuildPreReq: imap, openssl
+PreReq: imap, openssl
+%if "%{with_imap_annotate}" == "yes"
+BuildPreReq: imap::with_annotate = yes
+PreReq: imap::with_annotate = yes
+%endif
+%endif
+%if "%{with_xml}" == "yes"
+BuildPreReq: libxml
+PreReq: libxml
+%endif
+%if "%{with_xslt}" == "yes"
+BuildPreReq: libxslt
+PreReq: libxslt
+%endif
+%if "%{with_dom}" == "yes"
+BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
+%endif
+%if "%{with_curl}" == "yes"
+BuildPreReq: curl
+PreReq: curl
+%endif
+%if "%{with_hash}" == "yes"
+BuildPreReq: mhash
+PreReq: mhash
+%endif
+%if "%{with_mcrypt}" == "yes"
+BuildPreReq: libmcrypt
+PreReq: libmcrypt
+%endif
+%if "%{with_gdbm}" == "yes"
+BuildPreReq: gdbm, gdbm::with_ndbm = yes
+PreReq: gdbm, gdbm::with_ndbm = yes
+%endif
+%if "%{with_oci8}" == "yes"
+BuildPreReq: oracle
+PreReq: oracle
+%endif
+%if "%{with_snmp}" == "yes"
+BuildPreReq: snmp
+PreReq: snmp
+%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
+%if "%{with_sendmail}" == "yes"
+BuildPreReq: MTA
+PreReq: MTA
+%endif
+%if "%{with_simplexml}" == "yes"
+BuildPreReq: libxml
+PreReq: libxml
+%endif
+%if "%{with_tidy}" == "yes"
+BuildPreReq: tidy
+PreReq: tidy
+%endif
+AutoReq: no
+AutoReqProv: no
+
+%description
+ PHP is an HTML-embedded scripting language. Much of its syntax is
+ borrowed from C, Java and Perl with a couple of unique PHP-specific
+ features thrown in. The goal of the language is to allow web
+ developers to write dynamically generated pages quickly.
+
+ This is the Command Line Interface (CLI) and Common Gateway
+ Interface (CGI) version of PHP, intended for use in the "shebang"
+ line ("#!%{l_prefix}/bin/php") of stand-alone PHP based programs
+ and for use in the "shebang" line ("#!%{l_prefix}/cgi/php") of
+ stand-alone webserver-independent CGI scripts.
+
+%track
+ prog php = {
+ version = %{V_php}
+ url = http://www.php.net/downloads.php
+ regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
+ }
+ prog php:kolab = {
+ version = %{V_php}
+ url = http://git.kolab.org/server/tree/php/patches/
+ regex = php-(\d+(\.\d+)+)/
+ }
+
+%prep
+ %setup -q
+ %{l_shtool} subst \
+ -e 's;\(/include\)/freetype2;\1;' \
+ configure \
+ ext/gd/config.m4
+%if "%{with_imap_annotate}" == "yes"
+ %patch -p1 -P 1
+%endif
+%if "%{with_imap_myrights}" == "yes"
+ %patch -p1 -P 3
+%endif
+ %patch -p0 -P 2
+
+%build
+ # configure package
+ case "%{l_platform -t}" in
+ *-sunos5.10 ) cflags="%{l_cflags}" ;;
+ * ) cflags="%{l_cflags -O}" ;;
+ esac
+ cppflags="%{l_cppflags}"
+ ldflags="%{l_ldflags}"
+ libs=""
+%if "%{with_gdbm}" == "yes"
+ libs="$libs -lndbm -lgdbm"
+%endif
+%if "%{with_gd}" == "yes"
+ libs="$libs -lpng -lz"
+%endif
+%if "%{with_gettext}" == "yes"
+ libs="$libs -liconv"
+%endif
+%if "%{with_openldap}" == "yes" && "%{with_openldapsasl}" == "yes"
+ libs="$libs -lsasl2"
+%endif
+%if "%{with_imap}" == "yes"
+ libs="$libs -lssl -lcrypto"
+%endif
+%if "%{with_bdb}" == "yes"
+ libs="$libs -ldb"
+%endif
+%if "%{with_pgsql}" == "yes"
+ libs="$libs `pg_config --libs`"
+%endif
+%if "%{with_oci8}" == "yes"
+ ORACLE_HOME="`%{l_rc} --query oracle_home`"
+ export ORACLE_HOME
+%endif
+ CC="%{l_cc}" \
+ CFLAGS="$cflags" \
+ CPPFLAGS="$cppflags" \
+ LDFLAGS="$ldflags" \
+ LIBS="$libs" \
+%if "%{with_sendmail}" == "yes"
+ PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
+%else
+ PROG_SENDMAIL="`%{l_shtool} path false`" \
+%endif
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/php \
+ --with-config-file-path=%{l_prefix}/etc/php \
+ --libdir=%{l_prefix}/lib/php \
+ --disable-all \
+ --enable-pdo \
+ --with-pcre-regex=%{l_prefix} \
+%if "%{with_calendar}" == "yes"
+ --enable-calendar \
+%endif
+ %if "%{with_hash}" == "yes"
+ --enable-hash \
+ %endif
+ --with-pdo-sqlite=%{l_prefix} \
+%if "%{with_sqlite}" == "yes"
+ --with-sqlite=%{l_prefix} \
+ --with-sqlite3=%{l_prefix} \
+%else
+ --without-sqlite \
+%endif
+%if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
+%if "%{with_mysqlnd}" == "yes"
+ --with-mysql=mysqlnd \
+ --with-pdo-mysql=mysqlnd \
+%else
+ --with-mysql=%{l_prefix} \
+ --with-pdo-mysql=%{l_prefix} \
+%endif
+ --with-mysqli=mysqlnd \
+ --with-mysql-sock=%{l_prefix}/var/mysql/mysql.sock \
+%else
+ --without-mysql \
+ --without-pdo-mysql \
+%endif
+%if "%{with_pgsql}" == "yes"
+ --with-pgsql=%{l_prefix} \
+ --with-pdo-pgsql=%{l_prefix} \
+%else
+ --without-pgsql \
+%endif
+%if "%{with_posix}" == "yes"
+ --enable-posix \
+%endif
+%if "%{with_gd}" == "yes"
+ --with-gd=%{l_prefix} \
+ --with-jpeg-dir=%{l_prefix} \
+ --with-png-dir=%{l_prefix} \
+%endif
+%if "%{with_freetype}" == "yes"
+ --enable-gd-native-ttf \
+ --with-freetype-dir=%{l_prefix} \
+%endif
+%if "%{with_bdb}" == "yes"
+ --with-db4=%{l_prefix} \
+%endif
+%if "%{with_debug}" == "yes"
+ --enable-debug \
+%else
+ --disable-debug \
+%endif
+%if "%{with_zlib}" == "yes"
+ --with-zlib=%{l_prefix} \
+ --with-zlib-dir=%{l_prefix} \
+%endif
+%if "%{with_bzip2}" == "yes"
+ --with-bz2=%{l_prefix} \
+%endif
+%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
+ --with-openssl=%{l_prefix} \
+%endif
+%if "%{with_openldap}" == "yes"
+ --with-ldap=%{l_prefix} \
+%endif
+%if "%{with_session}" == "yes"
+ --enable-session \
+%endif
+%if "%{with_mm}" == "yes"
+ --with-mm=%{l_prefix} \
+%endif
+%if "%{with_ftp}" == "yes"
+ --enable-ftp \
+%endif
+%if "%{with_oci8}" == "yes"
+ --with-oci8 \
+%endif
+%if "%{with_gettext}" == "yes"
+ --with-gettext=%{l_prefix} \
+%endif
+%if "%{with_imap}" == "yes"
+ --with-imap=%{l_prefix} \
+ --with-imap-ssl=%{l_prefix} \
+%endif
+%if "%{with_json}" == "yes"
+ --enable-json \
+%else
+ --disable-json \
+%endif
+%if "%{with_tokenizer}" == "yes"
+ --enable-tokenizer \
+%else
+ --disable-tokenizer \
+%endif
+%if "%{with_xml}" == "yes"
+ --enable-xml \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
+%else
+ --disable-xml \
+%endif
+%if "%{with_xslt}" == "yes"
+ --with-xsl=%{l_prefix} \
+%else
+ --without-xsl \
+%endif
+%if "%{with_dom}" == "yes"
+ --enable-dom \
+%else
+ --disable-dom \
+%endif
+%if "%{with_wddx}" == "yes"
+ --enable-wddx \
+%endif
+%if "%{with_soap}" == "yes"
+ --enable-soap \
+%endif
+%if "%{with_bc}" == "yes"
+ --enable-bcmath \
+%endif
+%if "%{with_hash}" == "yes"
+ --with-hash=%{l_prefix} \
+%endif
+%if "%{with_mcrypt}" == "yes"
+ --with-mcrypt=%{l_prefix} \
+%endif
+%if "%{with_ctype}" == "yes"
+ --enable-ctype \
+%endif
+%if "%{with_curl}" == "yes"
+ --with-curl=%{l_prefix} \
+%endif
+%if "%{with_gdbm}" == "yes"
+ --with-gdbm=%{l_prefix} \
+%endif
+%if "%{with_versioning}" == "yes"
+ --enable-versioning \
+%endif
+%if "%{with_pear}" == "yes"
+ --with-pear=%{l_prefix}/lib/php \
+%else
+ --without-pear \
+%endif
+%if "%{with_simplexml}" == "yes"
+ --enable-simplexml \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
+%else
+ --disable-simplexml \
+%endif
+%if "%{with_snmp}" == "yes"
+ --with-snmp=%{l_prefix} \
+ --with-openssl-dir=%{l_prefix} \
+%endif
+%if "%{with_odbc}" == "yes"
+ --with-unixODBC=%{l_prefix} \
+ --with-pdo-odbc=unixODBC,%{l_prefix} \
+%endif
+%if "%{with_mbregex}" == "yes"
+ --enable-mbregex \
+%endif
+%if "%{with_mbstring}" == "yes"
+ --enable-mbstring \
+%endif
+%if "%{with_exif}" == "yes"
+ --with-exif \
+%endif
+%if "%{with_iconv}" == "yes"
+ --with-iconv=%{l_prefix} \
+%endif
+%if "%{with_tidy}" == "yes"
+ --with-tidy=%{l_prefix} \
+%else
+ --without-tidy \
+%endif
+%if "%{with_zip}" == "yes"
+ --enable-zip \
+%endif
+ --enable-cli \
+ --enable-cgi
+
+ # build package
+ %{l_make} %{l_mflags}
+
+%install
+ # install package
+ rm -rf $RPM_BUILD_ROOT
+ %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
+
+ # move CGI executale
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/php-cgi \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi/php
+
+ # install default configuration file
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/php
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE php.ini} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/php/
+
+ # strip down installation
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+ '%config %{l_prefix}/etc/php/*'
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Wed Feb 02 2011 Christoph Wickert <wickert at kolabsys.com> - 5.3.5-20110202
+- Update to 5.3.5
+
+* Tue Feb 01 2011 Christoph Wickert <wickert at kolabsys.com> - 5.3.4-20110201
+- Remove unused suhoshin and memcache options
+
+* Tue Jan 11 2011 Christoph Wickert <wickert at kolabsys.com> - 5.3.4-20110111_kolab1
+- Update to 5.3.4
commit 8d45f14314b4335b2804f1d85231f0e18ecab570
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Mar 1 17:19:03 2011 +0100
apache-php: switch from patched openpkg to full packaging
diff --git a/apache-php/Makefile b/apache-php/Makefile
index eeac55e..16290ca 100644
--- a/apache-php/Makefile
+++ b/apache-php/Makefile
@@ -1,30 +1,17 @@
include ../make-helper/kolab.mk
-PACKAGE=apache-php
-DOWNLOAD_VERSION=5.3.1
-OPENPKG_RELEASE=20091129
+NAME=apache-php
+PACKAGE = $(NAME)
VERSION=5.3.4
-VERSION_SUHOSHIN_EXTENSION=0.9.32.1
-VERSION_SUHOSHIN_PATCH=5.3.4-0.9.10
-VERSION_MEMCACHE=2.2.6
RELEASE=20101230_kolab1
SOURCE_URL=http://www.php.net/distributions
-SOURCE_1_URL=http://download.suhosin.org
-SOURCE_2_URL=http://pecl.php.net/get
-SOURCE_3_URL=http://download.suhosin.org
SOURCE_0=php-$(VERSION).tar.bz2
-SOURCE_1=suhosin-$(VERSION_SUHOSHIN_EXTENSION).tar.gz
-SOURCE_2=memcache-$(VERSION_MEMCACHE).tgz
-SOURCE_3=suhosin-patch-$(VERSION_SUHOSHIN_PATCH).patch.gz
-
-SOURCES=$(SOURCE_0) $(SOURCE_1) $(SOURCE_2) $(SOURCE_3)
-RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3)
PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch
-EXTRA=$(PATCHES) kolab.patch
+EXTRA=$(PATCHES) apache-php.conf apache-php.ini apache-php.patch
BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes' \
--define 'with_pear yes' --define 'with_gettext yes' \
@@ -36,28 +23,6 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_simplexml yes' --define 'with_sqlite yes' --define 'with_spl yes' \
--define 'with_json yes' --define 'with_tokenizer yes'
-# Target for retrieving the second source package
-$(SOURCE_1):
- wget -c "$(SOURCE_1_URL)/$(SOURCE_1)"
-
-# Target for retrieving the third source package
-$(SOURCE_2):
- wget -c "$(SOURCE_2_URL)/$(SOURCE_2)"
-
-# Target for retrieving the fourth source package
-$(SOURCE_3):
- wget -c "$(SOURCE_3_URL)/$(SOURCE_3)"
-
-# Target for the source files in the src rpm directory.
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_1)
- cp $(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/
-
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_2)
- cp $(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/
-
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_3)
- cp $(SOURCE_3) $(KOLABRPMSRC)/$(PACKAGE)/
-
include ../make-helper/package.mk
-include ../make-helper/openpkg-patched.mk
+include ../make-helper/package-new.mk
include ../make-helper/fetch.mk
diff --git a/apache-php/apache-php.conf b/apache-php/apache-php.conf
new file mode 100644
index 0000000..ade300f
--- /dev/null
+++ b/apache-php/apache-php.conf
@@ -0,0 +1,14 @@
+##
+## apache-php.conf -- Apache configuration for PHP
+##
+
+# load DSO
+LoadModule php5_module @l_prefix@/libexec/apache/mod_php.so
+
+# activate PHP handler by file extension
+AddType application/x-httpd-php .php
+
+# configure the PHP initialization file
+# (this directory directive really accepts a file, too!)
+PHPINIDir @l_prefix@/etc/apache/php.ini
+
diff --git a/apache-php/apache-php.ini b/apache-php/apache-php.ini
new file mode 100644
index 0000000..fa19e3e
--- /dev/null
+++ b/apache-php/apache-php.ini
@@ -0,0 +1,25 @@
+;;
+;; apache-php.ini -- PHP Configuration
+;;
+
+[PHP]
+
+; Resource Limits
+register_globals = off ; Global variables are no longer registered for input data
+safe_mode = on ; Enable Safe Mode (file UID comparisons)
+safe_mode_gid = off ; Whether to relax Safe Mode to file GID comparisons
+allow_url_fopen = off ; Disable the opening of remote URLs
+display_errors = off ; Errors will NOT be displayed
+log_errors = on ; Errors will be logged
+max_execution_time = 60 ; Maximum execution time of each script, in seconds
+max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
+memory_limit = 8M ; Maximum amount of memory a script may consume
+post_max_size = 8M ; Maximum amount of POST data accepted
+
+; Include Paths
+include_path = ".:@l_prefix@/lib/php"
+safe_mode_include_dir = "@l_prefix@/lib/php"
+
+; Session Paths
+session.save_path = "@l_prefix@/var/apache/run/apache-php.session"
+
diff --git a/apache-php/apache-php.patch b/apache-php/apache-php.patch
new file mode 100644
index 0000000..8fcb2c7
--- /dev/null
+++ b/apache-php/apache-php.patch
@@ -0,0 +1,18 @@
+Index: ext/gd/libgd/gd_arc.c
+--- ext/gd/libgd/gd_arc.c.orig 2009-05-26 22:14:31 +0200
++++ ext/gd/libgd/gd_arc.c 2009-07-01 08:56:12 +0200
+@@ -53,6 +53,7 @@
+ }
+ }
+
++#if 0
+ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
+ {
+ int x=0,mx1=0,mx2=0,my1=0,my2=0;
+@@ -106,5 +107,6 @@
+ old_y1 = my1;
+ }
+ }
++#endif
+
+
diff --git a/apache-php/apache-php.spec b/apache-php/apache-php.spec
new file mode 100644
index 0000000..d501c3f
--- /dev/null
+++ b/apache-php/apache-php.spec
@@ -0,0 +1,600 @@
+##
+## apache-php.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package versions
+%define V_php 5.3.4
+
+# package information
+Name: apache-php
+Summary: Apache Extension: PHP Scripting Language
+URL: http://www.php.net/
+Vendor: The PHP Project
+Packager: OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class: BASE
+Group: Web
+License: PHP
+Version: %{V_php}
+Release: 20101230_kolab1
+
+# package options
+%option with_bc no
+%option with_bdb no
+%option with_bzip2 no
+%option with_calendar no
+%option with_ctype no
+%option with_curl no
+%option with_debug no
+%option with_dom no
+%option with_exif no
+%option with_freetype no
+%option with_ftp no
+%option with_gd no
+%option with_gdbm no
+%option with_gettext no
+%option with_iconv no
+%option with_imap no
+%option with_imap_annotate no
+%option with_hash no
+%option with_imap_myrights no
+%option with_json no
+%option with_tokenizer no
+%option with_mbregex no
+%option with_mbstring no
+%option with_mcrypt no
+%option with_mhash no
+%option with_mm no
+%option with_mysql no
+%option with_mysqlnd no
+%option with_oci8 no
+%option with_odbc no
+%option with_openldap no
+%option with_openldapsasl no
+%option with_pear no
+%option with_pgsql no
+%option with_posix no
+%option with_sendmail no
+%option with_session no
+%option with_simplexml no
+%option with_snmp no
+%option with_soap no
+%option with_sqlite no
+%option with_ssl no
+%option with_tidy no
+%option with_versioning no
+%option with_wddx no
+%option with_xml no
+%option with_xslt no
+%option with_zlib no
+%option with_zip no
+
+# fixing implicit extension dependencies and correlations
+%if "%{with_mm}" == "yes" || "%{with_pecl_memcache}" == "yes"
+%undefine with_session
+%define with_session yes
+%endif
+%if "%{with_pear}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
+%if "%{with_freetype}" == "yes"
+%undefine with_gd
+%define with_gd yes
+%endif
+%if "%{with_imap_annotate}" == "yes"
+%undefine with_imap
+%define with_imap yes
+%endif
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" == "yes" || "%{with_zip}" == "yes" || "%{with_pecl_memcache}" == "yes"
+%undefine with_zlib
+%define with_zlib yes
+%endif
+%if "%{with_xslt}" == "yes"
+%undefine with_dom
+%define with_dom yes
+%endif
+%if "%{with_dom}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
+%if "%{with_soap}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
+%if "%{with_pgsql}" == "yes"
+%undefine with_ssl
+%define with_ssl yes
+%endif
+
+# list of sources
+Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
+Source2: apache-php.ini
+Source3: apache-php.conf
+Patch1: http://git.kolab.org/server/tree/php/patches/%{V_php}/KOLAB_php-%{V_php}_Annotations.patch
+Patch2: apache-php.patch
+Patch3: http://git.kolab.org/server/tree/php/patches/%{V_php}/KOLAB_php-%{V_php}_myrights.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, flex, bison
+PreReq: OpenPKG, openpkg >= 20050615
+BuildPreReq: apache
+PreReq: apache
+BuildPreReq: pcre
+PreReq: pcre
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
+%if "%{with_mysql}" == "yes"
+BuildPreReq: mysql
+PreReq: mysql
+%endif
+%if "%{with_pgsql}" == "yes"
+BuildPreReq: postgresql
+PreReq: postgresql
+%endif
+%if "%{with_gd}" == "yes"
+BuildPreReq: gd >= 2.0.20, jpeg, png
+PreReq: gd >= 2.0.20, jpeg, png
+%endif
+%if "%{with_bdb}" == "yes"
+BuildPreReq: db
+PreReq: db
+%endif
+%if "%{with_zlib}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
+%if "%{with_bzip2}" == "yes"
+BuildPreReq: bzip2
+PreReq: bzip2
+%endif
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+%if "%{with_openldap}" == "yes"
+BuildPreReq: openldap
+PreReq: openldap
+%if "%{with_openldapsasl}" == "yes"
+BuildPreReq: openldap::with_sasl = yes
+PreReq: openldap::with_sasl = yes
+%else
+BuildPreReq: openldap::with_sasl = no
+PreReq: openldap::with_sasl = no
+%endif
+%endif
+%if "%{with_mm}" == "yes"
+BuildPreReq: mm
+PreReq: mm
+%endif
+%if "%{with_freetype}" == "yes"
+BuildPreReq: freetype
+PreReq: freetype
+%endif
+%if "%{with_gettext}" == "yes"
+BuildPreReq: gettext, libiconv
+PreReq: gettext, libiconv
+%endif
+%if "%{with_iconv}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
+%if "%{with_imap}" == "yes"
+BuildPreReq: imap, openssl
+PreReq: imap, openssl
+%if "%{with_imap_annotate}" == "yes"
+BuildPreReq: imap::with_annotate = yes
+PreReq: imap::with_annotate = yes
+%endif
+%endif
+%if "%{with_xml}" == "yes"
+BuildPreReq: libxml
+PreReq: libxml
+%endif
+%if "%{with_xslt}" == "yes"
+BuildPreReq: libxslt
+PreReq: libxslt
+%endif
+%if "%{with_dom}" == "yes"
+BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
+%endif
+%if "%{with_curl}" == "yes"
+BuildPreReq: curl
+PreReq: curl
+%endif
+%if "%{with_mhash}" == "yes"
+BuildPreReq: mhash
+PreReq: mhash
+%endif
+%if "%{with_mcrypt}" == "yes"
+BuildPreReq: libmcrypt
+PreReq: libmcrypt
+%endif
+%if "%{with_gdbm}" == "yes"
+BuildPreReq: gdbm, gdbm::with_ndbm = yes
+PreReq: gdbm, gdbm::with_ndbm = yes
+%endif
+%if "%{with_oci8}" == "yes"
+BuildPreReq: oracle
+PreReq: oracle
+%endif
+%if "%{with_snmp}" == "yes"
+BuildPreReq: snmp
+PreReq: snmp
+%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
+%if "%{with_sendmail}" == "yes"
+BuildPreReq: MTA
+PreReq: MTA
+%endif
+%if "%{with_simplexml}" == "yes"
+BuildPreReq: libxml
+PreReq: libxml
+%endif
+%if "%{with_tidy}" == "yes"
+BuildPreReq: tidy
+PreReq: tidy
+%endif
+%if "%{with_pecl_memcache}" == "yes"
+BuildPreReq: memcached
+PreReq: memcached
+%endif
+AutoReq: no
+AutoReqProv: no
+
+%description
+ PHP is an HTML-embedded scripting language. Much of its syntax is
+ borrowed from C, Java and Perl with a couple of unique PHP-specific
+ features thrown in. The goal of the language is to allow web
+ developers to write dynamically generated pages quickly.
+
+ This package provides a Dynamic Shared Object (DSO) for the Apache
+ HTTP 2.2 web server. In general speaking, this module is also known
+ as mod_php.
+
+%track
+ prog apache-php = {
+ version = %{V_php}
+ url = http://www.php.net/downloads.php
+ regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
+ }
+ prog apache-php:kolab = {
+ version = %{V_php}
+ url = http://git.kolab.org/server/tree/php/patches/
+ regex = php-(\d+(\.\d+)+)/
+ }
+
+%prep
+ %setup -q -n php-%{V_php}
+ %{l_shtool} subst \
+ -e 's;-i -a -n php5;-i -n php5;' \
+ configure
+ %{l_shtool} subst \
+ -e 's;\(/include\)/freetype2;\1;' \
+ configure \
+ ext/gd/config.m4
+%if "%{with_imap_annotate}" == "yes"
+ %patch -p1 -P 1
+%endif
+%if "%{with_imap_myrights}" == "yes"
+ %patch -p1 -P 3
+%endif
+ %patch -p0 -P 2
+
+%build
+ # configure package
+ case "%{l_platform -t}" in
+ *-sunos5.10 ) cflags="%{l_cflags}" ;;
+ * ) cflags="%{l_cflags -O}" ;;
+ esac
+ cppflags="%{l_cppflags}"
+ ldflags="%{l_ldflags}"
+ libs=""
+%if "%{with_gdbm}" == "yes"
+ libs="$libs -lndbm -lgdbm"
+%endif
+%if "%{with_gd}" == "yes"
+ libs="$libs -lpng -lz"
+%endif
+%if "%{with_gettext}" == "yes"
+ libs="$libs -liconv"
+%endif
+%if "%{with_openldap}" == "yes" && "%{with_openldapsasl}" == "yes"
+ libs="$libs -lsasl2"
+%endif
+%if "%{with_imap}" == "yes"
+ libs="$libs -lssl -lcrypto"
+%endif
+%if "%{with_bdb}" == "yes"
+ libs="$libs -ldb"
+%endif
+%if "%{with_pgsql}" == "yes"
+ libs="$libs `pg_config --libs`"
+%endif
+%if "%{with_oci8}" == "yes"
+ ORACLE_HOME="`%{l_rc} --query oracle_home`"
+ export ORACLE_HOME
+%endif
+ CC="%{l_cc}" \
+ CFLAGS="$cflags" \
+ CPPFLAGS="$cppflags" \
+ LDFLAGS="$ldflags" \
+ LIBS="$libs" \
+%if "%{with_sendmail}" == "yes"
+ PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
+%else
+ PROG_SENDMAIL="`%{l_shtool} path false`" \
+%endif
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/apache \
+ --with-config-file-path=%{l_prefix}/etc/apache \
+ --libdir=%{l_prefix}/lib/php \
+ --disable-all \
+ --enable-pdo \
+ --with-pcre-regex=%{l_prefix} \
+%if "%{with_calendar}" == "yes"
+ --enable-calendar \
+%endif
+ %if "%{with_hash}" == "yes"
+ --enable-hash \
+ %endif
+%if "%{with_sqlite}" == "yes"
+ --with-pdo-sqlite=%{l_prefix} \
+ --with-sqlite=%{l_prefix} \
+%else
+ --without-pdo-sqlite \
+ --without-sqlite \
+%endif
+%if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
+%if "%{with_mysqlnd}" == "yes"
+ --with-mysql=mysqlnd \
+ --with-pdo-mysql=mysqlnd \
+%else
+ --with-mysql=%{l_prefix} \
+ --with-pdo-mysql=%{l_prefix} \
+%endif
+ --with-mysqli=mysqlnd \
+ --with-mysql-sock=%{l_prefix}/var/mysql/mysql.sock \
+%else
+ --without-mysql \
+ --without-pdo-mysql \
+%endif
+%if "%{with_pgsql}" == "yes"
+ --with-pgsql=%{l_prefix} \
+ --with-pdo-pgsql=%{l_prefix} \
+%else
+ --without-pgsql \
+%endif
+%if "%{with_posix}" == "yes"
+ --enable-posix \
+%endif
+%if "%{with_gd}" == "yes"
+ --with-gd=%{l_prefix} \
+ --with-jpeg-dir=%{l_prefix} \
+ --with-png-dir=%{l_prefix} \
+%endif
+%if "%{with_freetype}" == "yes"
+ --enable-gd-native-ttf \
+ --with-freetype-dir=%{l_prefix} \
+%endif
+%if "%{with_bdb}" == "yes"
+ --with-db4=%{l_prefix} \
+%endif
+%if "%{with_debug}" == "yes"
+ --enable-debug \
+%else
+ --disable-debug \
+%endif
+%if "%{with_zlib}" == "yes"
+ --with-zlib=%{l_prefix} \
+ --with-zlib-dir=%{l_prefix} \
+%endif
+%if "%{with_bzip2}" == "yes"
+ --with-bz2=%{l_prefix} \
+%endif
+%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
+ --with-openssl=%{l_prefix} \
+%endif
+%if "%{with_openldap}" == "yes"
+ --with-ldap=%{l_prefix} \
+%endif
+%if "%{with_session}" == "yes"
+ --enable-session \
+%endif
+%if "%{with_mm}" == "yes"
+ --with-mm=%{l_prefix} \
+%endif
+%if "%{with_ftp}" == "yes"
+ --enable-ftp \
+%endif
+%if "%{with_oci8}" == "yes"
+ --with-oci8 \
+%endif
+%if "%{with_gettext}" == "yes"
+ --with-gettext=%{l_prefix} \
+%endif
+%if "%{with_imap}" == "yes"
+ --with-imap=%{l_prefix} \
+ --with-imap-ssl=%{l_prefix} \
+%endif
+%if "%{with_json}" == "yes"
+ --enable-json \
+%else
+ --disable-json \
+%endif
+%if "%{with_tokenizer}" == "yes"
+ --enable-tokenizer \
+%else
+ --disable-tokenizer \
+%endif
+%if "%{with_xml}" == "yes"
+ --enable-xml \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
+%else
+ --disable-xml \
+%endif
+%if "%{with_xslt}" == "yes"
+ --with-xsl=%{l_prefix} \
+%else
+ --without-xsl \
+%endif
+%if "%{with_dom}" == "yes"
+ --enable-dom \
+%else
+ --disable-dom \
+%endif
+%if "%{with_wddx}" == "yes"
+ --enable-wddx \
+%endif
+%if "%{with_soap}" == "yes"
+ --enable-soap \
+%endif
+%if "%{with_bc}" == "yes"
+ --enable-bcmath \
+%endif
+%if "%{with_mhash}" == "yes"
+ --with-mhash=%{l_prefix} \
+%endif
+%if "%{with_mcrypt}" == "yes"
+ --with-mcrypt=%{l_prefix} \
+%endif
+%if "%{with_ctype}" == "yes"
+ --enable-ctype \
+%endif
+%if "%{with_curl}" == "yes"
+ --with-curl=%{l_prefix} \
+%endif
+%if "%{with_gdbm}" == "yes"
+ --with-gdbm=%{l_prefix} \
+%endif
+%if "%{with_versioning}" == "yes"
+ --enable-versioning \
+%endif
+%if "%{with_pear}" == "yes"
+ --with-pear=%{l_prefix}/lib/php \
+%else
+ --without-pear \
+%endif
+%if "%{with_simplexml}" == "yes"
+ --enable-simplexml \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
+%else
+ --disable-simplexml \
+%endif
+%if "%{with_snmp}" == "yes"
+ --with-snmp=%{l_prefix} \
+ --with-openssl-dir=%{l_prefix} \
+%endif
+%if "%{with_odbc}" == "yes"
+ --with-unixODBC=%{l_prefix} \
+ --with-pdo-odbc=unixODBC,%{l_prefix} \
+%endif
+%if "%{with_mbregex}" == "yes"
+ --enable-mbregex \
+%endif
+%if "%{with_mbstring}" == "yes"
+ --enable-mbstring \
+%endif
+%if "%{with_exif}" == "yes"
+ --with-exif \
+%endif
+%if "%{with_iconv}" == "yes"
+ --with-iconv=%{l_prefix} \
+%endif
+%if "%{with_tidy}" == "yes"
+ --with-tidy=%{l_prefix} \
+%else
+ --without-tidy \
+%endif
+%if "%{with_zip}" == "yes"
+ --enable-zip \
+%endif
+ --with-apxs2=%{l_prefix}/sbin/apxs \
+ --disable-cli \
+ --disable-cgi
+
+ # build package
+ %{l_make} %{l_mflags}
+
+%install
+ # install package
+ rm -rf $RPM_BUILD_ROOT
+ %{l_make} %{l_mflags} install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/libphp5.so \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/apache/mod_php.so
+
+ # install default configuration file
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE apache-php.ini} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache/
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE apache-php.conf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
+
+ # create session storage directory
+%if "%{with_session}" == "yes"
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache-php.session
+%endif
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+%if "%{with_session}" == "yes"
+ '%attr(0750,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/apache/run/apache-php.session' \
+%endif
+ '%config %{l_prefix}/etc/apache/apache-php.ini' \
+ '%config %{l_prefix}/etc/apache/apache.d/apache-php.conf'
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} apache status 2>/dev/null`
+ [ ".$apache_active" = .yes ] && %{l_rc} apache restart
+ exit 0
+
+%changelog
+* Wed Feb 02 2011 Christoph Wickert <wickert at kolabsys.com> - 5.3.5-20110202
+- Update to 5.3.5
+
+* Tue Feb 01 2011 Christoph Wickert <wickert at kolabsys.com> - 5.3.4-20110201
+- Remove unused suhoshin and memcache options
+
+* Tue Jan 11 2011 Christoph Wickert <wickert at kolabsys.com> - 5.3.4-20110111_kolab1
+- Update to 5.3.4
commit ae28167caaf36fb99f64ae965f45234f9a119183
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Thu Feb 24 00:44:54 2011 +0100
z-push: Update to 1.5.1
diff --git a/z-push/z-push.spec b/z-push/z-push.spec
index c0191c1..448775d 100644
--- a/z-push/z-push.spec
+++ b/z-push/z-push.spec
@@ -3,7 +3,7 @@
# Package Information
Name: z-push
-Version: 1.5
+Version: 1.5.1
Release: 1
Summary: Implementation of the ActiveSync protocol
# "Web" seems the most reasonable choice from
@@ -89,6 +89,9 @@ chown kolab-n:kolab-n %{l_prefix}/var/kolab/www/z-push/state/ ||:
%changelog
+* Tue Feb 22 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.1-1
+- Update to 1.5.1
+
* Fri Jan 21 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-1
- Update to 1.5 final
commit 8d377bfc074e4b67701a0daaacdd132607e87ff0
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Apr 5 16:37:13 2011 +0200
openssl: Update to 1.0.0d (fixes CVE-2011-0014)
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index d549a72..9c99bf7 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,6 +1,5 @@
-Index: Configure
---- Configure.orig 2010-01-19 22:40:54.000000000 +0100
-+++ Configure 2010-03-30 09:15:55.000000000 +0200
+--- Configure.orig 2010-11-30 23:19:26.000000000 +0100
++++ Configure 2011-02-22 13:16:43.082015162 +0100
@@ -34,6 +34,7 @@
# (Default: KRB5_DIR/include)
# --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
@@ -34,7 +33,7 @@ Index: Configure
#
# Cray T90 and similar (SDSC)
-@@ -780,6 +782,10 @@
+@@ -783,6 +785,10 @@
{
$strict_warnings = 1;
}
@@ -45,7 +44,7 @@ Index: Configure
elsif (/^reconfigure/ || /^reconf/)
{
if (open(IN,"<$Makefile"))
-@@ -1058,7 +1064,7 @@
+@@ -1061,7 +1067,7 @@
print "IsMK1MF=$IsMK1MF\n";
my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
@@ -54,9 +53,8 @@ Index: Configure
# Allow environment CC to override compiler...
if($ENV{CC}) {
$cc = $ENV{CC};
-Index: config
--- config.orig 2010-03-09 18:08:39.000000000 +0100
-+++ config 2010-03-30 09:13:58.000000000 +0200
++++ config 2011-02-22 13:16:43.083015228 +0100
@@ -277,6 +277,9 @@
Power*)
echo "ppc-apple-darwin${VERSION}"
@@ -116,14 +114,14 @@ Index: config
CCVER=`(cc -V 2>&1) 2>/dev/null | \
egrep -e '^cc: .* C [0-9]\.[0-9]' | \
sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
-@@ -466,6 +476,7 @@
- sleep 5
+@@ -467,6 +477,7 @@
fi
fi
-+ fi
fi
++fi
if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
+ # check for Compaq C, expected output is "blah-blah C Vx.x"
@@ -483,6 +494,7 @@
if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
diff --git a/openssl/openssl.spec b/openssl/openssl.spec
index 2fc76f2..251364c 100644
--- a/openssl/openssl.spec
+++ b/openssl/openssl.spec
@@ -22,7 +22,7 @@
##
# package version
-%define V_openssl 1.0.0c
+%define V_openssl 1.0.0d
%define V_zlib 1.2.5
# package information
@@ -36,7 +36,7 @@ Class: CORE
Group: SSL
License: BSD-style
Version: %{V_openssl}
-Release: 20101209
+Release: 20110222
# package options
%option with_zlib no
@@ -184,5 +184,8 @@ AutoReqProv: no
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 22 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0d-20110222
+- Update to 1.0.0d (fixes CVE-2011-0014)
+
* Thu Dec 09 2010 Christoph Wickert <wickert at kolabsys.com> - 1.0.0c-20101209
-- Update to 1.0.0c
+- Update to 1.0.0c (fixes CVE-2010-4252)
commit 7ab608c52469973d0e09b8a2a658be59bdcc54e1
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Feb 22 12:31:54 2011 +0100
Move .hgignore to .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..310b62f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+syntax: glob
+
+# build and imported archives:
+*.src.rpm
+*.tar.gz
+
+# various automake/autotools generated stuff:
+configure
+config.{log,status}
+Makefile.in
+aclocal.m4
+install-sh
+missing
+autom4te.cache/
+
+# specific files and hierarchies
+# which might be generated during build:
+kolab-webadmin/kolab-webadmin/dist_conf/
+kolab-webadmin/kolab-webadmin/{COPYING,INSTALL,README,Makefile}
+kolab-webadmin/kolab-webadmin/kolab-webadmin.spec
+kolabd/kolabd/{INSTALL,README,Makefile,kolabd.spec}
+kolabd/kolabd/dist_conf/kolabsrv
+perl-kolab/{Makefile,kolab.mk}
+pear/*/*.tgz
+pear/*/package.patch
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 310b62f..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,25 +0,0 @@
-syntax: glob
-
-# build and imported archives:
-*.src.rpm
-*.tar.gz
-
-# various automake/autotools generated stuff:
-configure
-config.{log,status}
-Makefile.in
-aclocal.m4
-install-sh
-missing
-autom4te.cache/
-
-# specific files and hierarchies
-# which might be generated during build:
-kolab-webadmin/kolab-webadmin/dist_conf/
-kolab-webadmin/kolab-webadmin/{COPYING,INSTALL,README,Makefile}
-kolab-webadmin/kolab-webadmin/kolab-webadmin.spec
-kolabd/kolabd/{INSTALL,README,Makefile,kolabd.spec}
-kolabd/kolabd/dist_conf/kolabsrv
-perl-kolab/{Makefile,kolab.mk}
-pear/*/*.tgz
-pear/*/package.patch
More information about the commits
mailing list