webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pakfire3

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-06-15 08:23:18 +02:00
parent ea9cfe0784 88af830315
commit ca8e0b97d1
41 changed files with 581 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lfs/apache2
View File

@@ -25,7 +25,7 @@
include Config
VER = 2.2.17
VER = 2.2.19
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
$(DL_FILE)_MD5 = 16eadc59ea6b38af33874d300973202e
$(DL_FILE)_MD5 = 832f96a6ec4b8fc7cf49b9efd4e89060
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)

4
lfs/binutils
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 #
@@ -54,7 +54,7 @@ endif
else
ifeq "$(PASS)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror
EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof
EXTRA_MAKE = LDFLAGS="-all-static"
EXTRA_INSTALL =
else

6
lfs/clamav
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.97
VER = 0.97.1
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 = 15
PAK_VER = 16
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b
$(DL_FILE)_MD5 = 4f3fb74ff1098c25eef8e10721478c29
install : $(TARGET)

10
lfs/client175
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.5a
VER = 0.7
THISAPP = client175_$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = client175
PAK_VER = 2
PAK_VER = 3
DEPS = "mpfire"
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8
$(DL_FILE)_MD5 = 975b69de79dc2649d8acba294cc0c5eb
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -76,11 +77,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxvf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
@rm -rf /srv/client175
mkdir -pv /srv/client175
cd $(DIR_APP) && mv -vf * /srv/client175
cp -vf $(DIR_SRC)/config/client175/site.conf /srv/client175/
install -v -m 644 $(DIR_SRC)/config/backup/includes/client175 \

8
lfs/cups
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 = 1.4.4
VER = 1.4.6
THISAPP = cups-$(VER)
DL_FILE = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
PAK_VER = 6
PAK_VER = 7
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8776403ad60fea9e85eab9c04d88560d
$(DL_FILE)_MD5 = de8fb5a29c36554925c0c6a6e2c0dae1
install : $(TARGET)

6
lfs/ipfireseeder
View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent
DL_FILE = ipfire-2.9.i586-full-core49.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 24
PAK_VER = 25
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e
$(DL_FILE)_MD5 = 0da274af552f5de5b0f65102b17631f1
install : $(TARGET)

8
lfs/libmpdclient
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 = 2.1
VER = 2.4
THISAPP = libmpdclient-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libmpdclient
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 67efa0c3d107c090ef277dfb3442d1e3
$(DL_FILE)_MD5 = 8c166c5212dd95d538d3a35bb9ad4634
install : $(TARGET)

4
lfs/make
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 #
@@ -43,7 +43,7 @@ ifeq "$(ROOT)" ""
EXTRA_MAKE =
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
TARGET = $(DIR_INFO)/$(THISAPP)-tools-pass$(PASS)
EXTRA_CONFIG = --prefix=/tools --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =

8
lfs/mpc
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 = 0.19
VER = 0.20
THISAPP = mpc-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpc
PAK_VER = 4
PAK_VER = 5
DEPS = "mpd libmpdclient"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9ab2967d9ec719b06a86f3b4121be654
$(DL_FILE)_MD5 = 24c81ad6afe6099e8d7a6826ef4b7105
install : $(TARGET)

17
lfs/mpd
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 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,15 +24,15 @@
include Config
VER = 0.15.12
VER = 0.16.2
THISAPP = mpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
PAK_VER = 11
PAK_VER = 12
DEPS = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b00b289a20ecd9accfd4972d6395135c
$(DL_FILE)_MD5 = a75ad715cc381dc5efeff6dbf313a954
install : $(TARGET)
@@ -76,8 +76,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr \
--disable-ipv6 \
--sysconfdir=/etc \
--disable-sqlite
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

4
lfs/mpfire
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2011 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 #
@@ -30,7 +30,7 @@ THISAPP = mpfire-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpfire
PAK_VER = 10
PAK_VER = 11
DEPS = "mpd mpc"

11
lfs/qemu
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.12.3
VER = 0.14.1
THISAPP = qemu-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu
PAK_VER = 10
PAK_VER = 11
DEPS = "sdl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1
$(DL_FILE)_MD5 = b6c713a8db638e173af53a62d5178640
install : $(TARGET)
@@ -77,7 +77,10 @@ $(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=/usr \
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--target-list="i386-linux-user i386-softmmu"
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

8
lfs/rsync
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 = 3.0.7
VER = 3.0.8
THISAPP = rsync-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rsync
PAK_VER = 5
PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b53525900817cf1ba7ad3a516ab5bfe9
$(DL_FILE)_MD5 = 0ee8346ce16bdfe4c88a236e94c752b4
install : $(TARGET)

34
lfs/sane
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,23 +24,16 @@
include Config
VER = 1.0.19
VER = 1.0.22
THISAPP = sane-$(VER)
DL_FILE = sane-backends-$(VER).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/sane-backends-$(VER)
ifeq "$(KMOD)" "1"
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-kmod-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)-kmod
endif
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
PROG = sane
PAK_VER = 1
PAK_VER = 2
DEPS = "libtiff"
@@ -52,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f
$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5
install : $(TARGET)
@@ -85,21 +78,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(KMOD)" "1"
cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \
$(DIR_APP)/backend/Makefile
ifeq "$(SMP)" "1"
cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \
SUBDIRS=$(DIR_APP)/backend modules
cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
/lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/
else
cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \
SUBDIRS=$(DIR_APP)/backend modules
cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
/lib/modules/$(KVER)-ipfire/kernel/drivers/parport/
endif
else
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--disable-ipv6 \
--enable-parport-directio
@@ -112,7 +90,5 @@ else
ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
install -v -m 644 $(DIR_SRC)/config/backup/includes/sane \
/var/ipfire/backup/addons/includes/sane
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)