Merge branch 'master' into perl_5.12.2

Conflicts:
	config/rootfiles/core/47/filelists/files
	config/rootfiles/core/47/update.sh
This commit is contained in:
Arne Fitzenreiter
2011-02-20 17:37:07 +01:00
45 changed files with 412 additions and 148 deletions

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 = 0.96.5
VER = 0.97
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
PAK_VER = 14
PAK_VER = 15
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a
$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.0.4
VER = 2.0.5
THISAPP = fireinfo-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7433e108cce180980189339886621539
$(DL_FILE)_MD5 = e0e959a6891262f45fc1cedc225a662b
install : $(TARGET)

View File

@@ -24,15 +24,15 @@
include Config
VER = 0.9.4.8
VER = 0.9.6
THISAPP = icecream-$(VER)
DL_FILE = $(THISAPP).tar.gz
THISAPP = icecc-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = icecc
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28
$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd
install : $(TARGET)
@@ -76,7 +76,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch
cd $(DIR_APP) && ./configure \
--prefix=/opt/icecream
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)

View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.9.i586-full-core45.iso.torrent
DL_FILE = ipfire-2.9.i586-full-core46.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 21
PAK_VER = 22
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3e68353572b67ba3837e15134b124a22
$(DL_FILE)_MD5 = 8484574559180f14f9c98d7d3140c3ed
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 = 5.6p1
VER = 5.8p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e6ee52e47c768bf0ec42a232b5d18fb0
$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 = 0.9.8q
VER = 0.9.8r
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 = 5.2.4
VER = 5.3.5
THISAPP = php-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -47,7 +47,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 = 55c97a671fdabf462cc7a82971a656d2
$(DL_FILE)_MD5 = 8aaf20c95e91f25c5b6a591e5d6d61b9
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
@@ -83,7 +83,6 @@ $(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) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c
cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc \
--with-apxs2 \

View File

@@ -87,7 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-referer-log \
--enable-snmp \
--with-pthreads --with-dl \
--with-maxfd="16384"
--with-maxfd="16384" \
--with-large-files
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install