From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4d376982163c134907415d44778af2a1f03b1485 Date: Wed, 19 Apr 2017 18:39:49 +0100 Message-ID: <20170419173950.4969110853C3@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3809941863420262284==" List-Id: --===============3809941863420262284== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4d376982163c134907415d44778af2a1f03b1485 (commit) via b7d071af817c11b6daf54abfeea82360185208f3 (commit) from 4c6b2034921fcfbff5fc92ab567c56c47fe99137 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4d376982163c134907415d44778af2a1f03b1485 Author: Matthias Fischer Date: Wed Apr 19 15:26:06 2017 +0200 Revert "gdbm: update to 1.13" =20 This reverts commit dc539daf8823ef97c931f12b514453c25e867c45. =20 With "gdbm-Update to 1.13", 'php 5.3.27' failed to build. =20 Best, Matthias =20 Signed-off-by: Michael Tremer commit b7d071af817c11b6daf54abfeea82360185208f3 Author: Matthias Fischer Date: Wed Apr 19 10:10:05 2017 +0200 php 5.3.27: Source format improvements =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: lfs/gdbm | 9 +++---- lfs/php | 82 +++++++++++++++++++++++++++++++++-----------------------------= -- 2 files changed, 47 insertions(+), 44 deletions(-) Difference in files: diff --git a/lfs/gdbm b/lfs/gdbm index 82957c6..4db986c 100644 --- a/lfs/gdbm +++ b/lfs/gdbm @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2017 IPFire Team = # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.13 +VER =3D 1.8.3 =20 THISAPP =3D gdbm-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 8929dcda2a8de3fd2367bdbf66769376 +$(DL_FILE)_MD5 =3D 1d1b1d5c0245b1c00aff92da751e9aa1 =20 install : $(TARGET) =20 @@ -70,8 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=3D$(PREFIX) --disable-nls --disable-s= tatic --enable-libgdbm-compat + cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make BINOWN=3Droot BINGRP=3Droot install + cd $(DIR_APP) && make BINOWN=3Droot BINGRP=3Droot install-compat @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/php b/lfs/php index 8139e21..1f33f0d 100644 --- a/lfs/php +++ b/lfs/php @@ -79,47 +79,49 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_SRC)/idn-* $(DIR_SRC)/Log-* $(DIR_SRC)/package.xml= && \ cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr \ - --sysconfdir=3D/etc \ - --with-apxs2 \ - --enable-force-cgi-redirect \ - --enable-discard-path \ - --enable-fastcgi \ - --with-config-file-path=3D/etc \ - --with-openssl \ - --with-kerberos \ - --with-zlib \ - --enable-bcmath \ - --with-bz2 \ - --enable-calendar \ - --with-curl \ - --with-curlwrappers \ - --enable-dba=3Dshared \ - --with-gdbm \ - --with-db4 \ - --with-inifile \ - --with-flatfile \ - --enable-exif \ - --enable-ftp \ - --with-openssl-dir=3D/usr \ - --with-gd=3D/usr \ - --with-jpeg-dir=3D/usr \ - --with-png-dir=3D/usr \ - --with-zlib-dir=3D/usr \ - --with-freetype-dir=3D/usr \ - --with-gettext \ - --with-gmp \ - --enable-mbstring \ - --with-mysql \ - --with-mysql-sock=3D/var/run/mysql \ - --with-ncurses \ - --with-pdo-mysql \ - --with-pdo-sqlite \ - --with-readline \ - --enable-sockets \ - --with-xsl \ - --with-iconv \ - --enable-zip + --sysconfdir=3D/etc \ + --with-apxs2 \ + --enable-force-cgi-redirect \ + --enable-discard-path \ + --enable-fastcgi \ + --with-config-file-path=3D/etc \ + --with-openssl \ + --with-kerberos \ + --with-zlib \ + --enable-bcmath \ + --with-bz2 \ + --enable-calendar \ + --with-curl \ + --with-curlwrappers \ + --enable-dba=3Dshared \ + --with-gdbm \ + --with-db4 \ + --with-inifile \ + --with-flatfile \ + --enable-exif \ + --enable-ftp \ + --with-openssl-dir=3D/usr \ + --with-gd=3D/usr \ + --with-jpeg-dir=3D/usr \ + --with-png-dir=3D/usr \ + --with-zlib-dir=3D/usr \ + --with-freetype-dir=3D/usr \ + --with-gettext \ + --with-gmp \ + --enable-mbstring \ + --with-mysql \ + --with-mysql-sock=3D/var/run/mysql \ + --with-ncurses \ + --with-pdo-mysql \ + --with-pdo-sqlite \ + --with-readline \ + --enable-sockets \ + --with-xsl \ + --with-iconv \ + --enable-zip + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini hooks/post-receive -- IPFire 2.x development tree --===============3809941863420262284==--