* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4d376982163c134907415d44778af2a1f03b1485
@ 2017-04-19 17:39 git
0 siblings, 0 replies; only message in thread
From: git @ 2017-04-19 17:39 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7000 bytes --]
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 <matthias.fischer(a)ipfire.org>
Date: Wed Apr 19 15:26:06 2017 +0200
Revert "gdbm: update to 1.13"
This reverts commit dc539daf8823ef97c931f12b514453c25e867c45.
With "gdbm-Update to 1.13", 'php 5.3.27' failed to build.
Best,
Matthias
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b7d071af817c11b6daf54abfeea82360185208f3
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Apr 19 10:10:05 2017 +0200
php 5.3.27: Source format improvements
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
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 <info(a)ipfire.org> #
+# 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 @@
include Config
-VER = 1.13
+VER = 1.8.3
THISAPP = gdbm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8929dcda2a8de3fd2367bdbf66769376
+$(DL_FILE)_MD5 = 1d1b1d5c0245b1c00aff92da751e9aa1
install : $(TARGET)
@@ -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=$(PREFIX) --disable-nls --disable-static --enable-libgdbm-compat
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make BINOWN=root BINGRP=root install
+ cd $(DIR_APP) && make BINOWN=root BINGRP=root 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=/usr \
- --sysconfdir=/etc \
- --with-apxs2 \
- --enable-force-cgi-redirect \
- --enable-discard-path \
- --enable-fastcgi \
- --with-config-file-path=/etc \
- --with-openssl \
- --with-kerberos \
- --with-zlib \
- --enable-bcmath \
- --with-bz2 \
- --enable-calendar \
- --with-curl \
- --with-curlwrappers \
- --enable-dba=shared \
- --with-gdbm \
- --with-db4 \
- --with-inifile \
- --with-flatfile \
- --enable-exif \
- --enable-ftp \
- --with-openssl-dir=/usr \
- --with-gd=/usr \
- --with-jpeg-dir=/usr \
- --with-png-dir=/usr \
- --with-zlib-dir=/usr \
- --with-freetype-dir=/usr \
- --with-gettext \
- --with-gmp \
- --enable-mbstring \
- --with-mysql \
- --with-mysql-sock=/var/run/mysql \
- --with-ncurses \
- --with-pdo-mysql \
- --with-pdo-sqlite \
- --with-readline \
- --enable-sockets \
- --with-xsl \
- --with-iconv \
- --enable-zip
+ --sysconfdir=/etc \
+ --with-apxs2 \
+ --enable-force-cgi-redirect \
+ --enable-discard-path \
+ --enable-fastcgi \
+ --with-config-file-path=/etc \
+ --with-openssl \
+ --with-kerberos \
+ --with-zlib \
+ --enable-bcmath \
+ --with-bz2 \
+ --enable-calendar \
+ --with-curl \
+ --with-curlwrappers \
+ --enable-dba=shared \
+ --with-gdbm \
+ --with-db4 \
+ --with-inifile \
+ --with-flatfile \
+ --enable-exif \
+ --enable-ftp \
+ --with-openssl-dir=/usr \
+ --with-gd=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ --with-zlib-dir=/usr \
+ --with-freetype-dir=/usr \
+ --with-gettext \
+ --with-gmp \
+ --enable-mbstring \
+ --with-mysql \
+ --with-mysql-sock=/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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-19 17:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-19 17:39 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4d376982163c134907415d44778af2a1f03b1485 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox