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

Fixed build and core 11

Browse Source
This commit is contained in:
Christian Schmidt
2008-04-06 16:41:02 +02:00
parent e65017ca4c
commit 3900a6c7b6
5 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/11/update.sh
View File

@@ -5,5 +5,5 @@
extract_files extract_files
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
squidGuard -d -C all squidGuard -d -C all
chmod 666 /var/ipfire/urlfilter/blacklist/*/*.db chmod 666 /var/ipfire/urlfilter/blacklists/*/*.db
/etc/init.d/squid start /etc/init.d/squid start

5
doc/packages-list.txt
View File

@@ -60,7 +60,7 @@
* collectd-4.3.0 * collectd-4.3.0
* coreutils-5.96 * coreutils-5.96
* cpio-2.6 * cpio-2.6
* cups-1.2.12 * cups-1.3.7
* curl-7.15.3 * curl-7.15.3
* cyrus-imapd-2.2.12 * cyrus-imapd-2.2.12
* cyrus-sasl-2.1.21 * cyrus-sasl-2.1.21
@@ -68,6 +68,7 @@
* dhcp-3.1.0 * dhcp-3.1.0
* dhcpcd-2.0.8 * dhcpcd-2.0.8
* diffutils-2.8.1 * diffutils-2.8.1
* dm9601-2.6
* dnsmasq-2.40 * dnsmasq-2.40
* dosfstools-2.11 * dosfstools-2.11
* e2fsprogs-1.39 * e2fsprogs-1.39
@@ -95,6 +96,7 @@
* gd-2.0.33 * gd-2.0.33
* gdbm-1.8.3 * gdbm-1.8.3
* gettext-0.14.5 * gettext-0.14.5
* git-1.5.4.5
* glib-2.9.6 * glib-2.9.6
* glibc-2.3.6 * glibc-2.3.6
* gmp-4.2 * gmp-4.2
@@ -251,6 +253,7 @@
* squid-2.6.STABLE19 * squid-2.6.STABLE19
* squid-graph-3.2 * squid-graph-3.2
* squidGuard-1.3 * squidGuard-1.3
* squidclamav-3.5
* subversion-1.4.4 * subversion-1.4.4
* sudo-1.6.8p12 * sudo-1.6.8p12
* sysfsutils-1.3.0 * sysfsutils-1.3.0

23
html/cgi-bin/proxy.cgi
View File

@@ -3685,7 +3685,7 @@ END
print FILE "\nnever_direct allow all\n\n"; print FILE "\nnever_direct allow all\n\n";
} }
if (($proxysettings{'ENABLE_FILTER'} eq 'on') && ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')) if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
{ {
print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n"; print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'}) if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'})
@@ -3694,27 +3694,6 @@ END
} else { } else {
print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n"; print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n";
} }
} else
{
if ($proxysettings{'ENABLE_FILTER'} eq 'on')
{
print FILE <<END
url_rewrite_program /usr/sbin/redirect_wrapper
url_rewrite_children $filtersettings{'CHILDREN'}
END
;
}
if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')
{
print FILE <<END
url_rewrite_program /usr/sbin/redirect_wrapper
url_rewrite_children $xlratorsettings{'CHILDREN'}
END
;
}
} }
close FILE; close FILE;
} }

9
lfs/squidclamav
View File

@@ -34,6 +34,8 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = squidclamav PROG = squidclamav
PAK_VER = 1 PAK_VER = 1
DEPS = "clamav"
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
############################################################################### ###############################################################################
@@ -52,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects)) md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
############################################################################### ###############################################################################
# Downloading, checking, md5sum # Downloading, checking, md5sum
############################################################################### ###############################################################################
@@ -72,10 +77,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-20071117.patch
cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
cp -f $(DIR_SRC)/squidclamav/squidclamav.conf /etc/squidclamav.conf cp -f $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

1
make.sh
View File

@@ -566,6 +566,7 @@ buildipfire() {
ipfiremake freefont ipfiremake freefont
ipfiremake vdr ipfiremake vdr
ipfiremake git ipfiremake git
ipfiremake squidclamav
} }
buildinstaller() { buildinstaller() {