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

Merge remote-tracking branch 'origin/thirteen' into thirteen

Browse Source
This commit is contained in:
Michael Tremer
2012-10-09 11:17:53 +02:00
parent 9574fde3f7 79117dc15f
commit 77a03efc2f
34 changed files with 355 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lfs/GeoIP
View File

@@ -25,7 +25,7 @@
include Config
VER = 1.17
DATVER = 05092012
DATVER = 02102012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d
GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696
install : $(TARGET)

11
lfs/apache2
View File

@@ -25,7 +25,7 @@
include Config
VER = 2.2.22
VER = 2.2.23
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 = 9fe3093194c8a57f085ff7c3fc43715f
$(DL_FILE)_MD5 = ca133de0e4b4b15316990a97186b9993
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)
@@ -133,10 +133,9 @@ else
cd $(DIR_APP) && make install
chown -v root:root /usr/lib/apache/httpd.exp \
/usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \
/usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
/usr/share/man/man1/logresolve.1 \
/usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \
/usr/share/man/man8/{rotatelogs,suexec}.8
/usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \
/usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \
/usr/share/man/man8/{logresolve,rotatelogs,suexec}.8
@rm -rf $(DIR_APP)
endif
@$(POSTBUILD)

6
lfs/clamav
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.97.5
VER = 0.97.6
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 = 20
PAK_VER = 21
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4d4b93243a5add0216acc4f24f43a895
$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2
install : $(TARGET)

4
lfs/dhcp
View File

@@ -112,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--sysconfdir=/etc/dhcp \
--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
--disable-static \
--enable-paranoia \
@@ -125,6 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mkdir -pv /var/state/dhcp
touch /var/state/dhcp/dhcpd.leases
ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
lfs/dracut
View File

@@ -96,7 +96,7 @@ ifeq "$(MACHINE_TYPE)" "arm"
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-kirkwood.img $(KVER)-ipfire-kirkwood
cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
# omap kernel
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-omap.img $(KVER3)-ipfire-omap
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-omap.img $(KVER)-ipfire-omap
cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-omap.img uInit-ipfire-omap
else
/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire

75
lfs/fw_ath9k_htc
View File

@@ -1,75 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 1.3
THISAPP = fw_ath9k_htc-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6e83c7d87007e3edd700034990cccd61
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && cp -v htc*.fw /lib/firmware
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/linux
View File

@@ -26,7 +26,7 @@ include Config
VER = 3.2.30
RPI_PATCHES = linux-3.2.27-807223a
RPI_PATCHES = linux-3.2.27-9245b4c
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.bz2
@@ -76,7 +76,7 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(DL_FILE)_MD5 = d899e65520424a27661009ea43b28103
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = b072ccb2534ff910fd5867fc0da1b24a
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = c20baa8dc2527ce89a302862c3fc7f58
install : $(TARGET)

8
lfs/linux-firmware
View File

@@ -24,10 +24,10 @@
include Config
VER = 20110518
VER = 236367d
THISAPP = linux-firmware-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3b215b5ec9a5e8784dd971c039e9b948
$(DL_FILE)_MD5 = 35d2ecf9b7d0b4d339fa0d4cc0736f6f
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
mkdir -p /lib/firmware
cd $(DIR_APP) && cp -vr * /lib/firmware
@rm -rf $(DIR_APP)

6
lfs/rpi-firmware
View File

@@ -24,7 +24,7 @@
include Config
VER = 9f7cff0
VER = b87bc42
THISAPP = rpi-firmware-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4de4db529fc2c0000d381d016675e115
$(DL_FILE)_MD5 = 2e2bb3a72e9a13a90c60c84f76e77fa2
install : $(TARGET)
@@ -70,5 +70,5 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@cd / && tar axf $(DIR_DL)/$(DL_FILE)
cp $(DIR_SRC)/config/rpi-firmware/config.txt /boot
cp -f $(DIR_SRC)/config/rpi-firmware/config.txt /boot
@$(POSTBUILD)

6
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.5.16
VER = 3.5.18
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 41
PAK_VER = 42
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 260cf49b683e86f4cc316c1e6fddbdc5
$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a
install : $(TARGET)

13
lfs/v4l-dvb
View File

@@ -79,6 +79,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_rtl28xx_add_usb_ids.patch
cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
ifeq "$(KCFG)" "-omap"
# Disable failing OMAP2 Video Out and IR RX51 driver
cd $(DIR_APP) && sed -i -e \
"s|^CONFIG_VIDEO_OMAP2_VOUT=m|# CONFIG_VIDEO_OMAP2_VOUT is not set|g" \
v4l/.config
cd $(DIR_APP) && sed -i -e \
"s|^CONFIG_IR_RX51=m|# CONFIG_IR_RX51 is not set|g" \
v4l/.config
endif
# Disable Radio Shark (missing tuner module)
cd $(DIR_APP) && sed -i -e \
"s|^CONFIG_RADIO_SHARK=m|# CONFIG_RADIO_SHARK is not set|g" \
v4l/.config
cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=$(XVER)
ln -sf $(DIR_APP)/ /usr/src/v4l-dvb

2
lfs/zlib
View File

@@ -77,7 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
ln -svf libz.so.$(VER) /lib/libz.so.1
ln -svf libz.so.$(VER) /lib/libz.so
rm -vf /usr/lib/libz.so.1
rm -vf /usr/lib/libz.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)