Merge remote-tracking branch 'origin/next' into fifteen

Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.tr
	doc/language_missings
This commit is contained in:
Michael Tremer
2013-10-03 14:26:33 +02:00
27 changed files with 130 additions and 22 deletions

View File

@@ -17,7 +17,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = iptraf-ng
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -63,6 +63,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr

View File

@@ -24,7 +24,7 @@
include Config
VER = 5.3.16
VER = 5.3.27
THISAPP = php-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
@@ -114,11 +114,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-mysql-sock=/var/run/mysql \
--with-ncurses \
--with-pdo-mysql \
--without-pdo-sqlite \
--with-pdo-sqlite \
--with-readline \
--enable-sockets \
--with-xsl \
--with-iconv
--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

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.2.3.25
VER = 0.2.4.17-rc
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
PAK_VER = 3
PAK_VER = 4
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf
$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d
install : $(TARGET)