webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated and patched squidGuard

Browse Source 
Updated squid to current stable
Added some targets to qemu
Updated ntfs3g to current stable
Fixed urlfilter autoupdate script
Started building nagios addon


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1284 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2008-03-22 21:56:43 +00:00
parent 85d8a9caf2
commit 0bd7d00b43
13 changed files with 260 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/common/ntfs-3g
View File

@@ -2,8 +2,8 @@ bin/ntfs-3g
#lib/libntfs-3g.a
#lib/libntfs-3g.la
lib/libntfs-3g.so
lib/libntfs-3g.so.23
lib/libntfs-3g.so.23.0.0
lib/libntfs-3g.so.24
lib/libntfs-3g.so.24.0.0
sbin/mount.ntfs-3g
#usr/include/ntfs-3g
#usr/include/ntfs-3g/attrib.h

10
config/rootfiles/core/11/files
View File

@@ -1 +1,11 @@
usr/bin/tunctl
usr/bin/squidGuard
var/ipfire/urlfilter/bin/autoupdate.pl
etc/squid
usr/lib/squid
usr/sbin/squid
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.24
lib/libntfs-3g.so.24.0.0
sbin/mount.ntfs-3g

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

@@ -1,4 +1,8 @@
#!/bin/bash
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
/etc/init.d/squid stop
extract_files
squidGuard -d -C all
chmod 666 /var/ipfire/urlfilter/blacklist/*/*.db
/etc/init.d/squid start

5
config/rootfiles/core/8/files
View File

@@ -5,8 +5,3 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8168.ko
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
etc/ntp
usr/local/bin/wirelessctrl
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.23
lib/libntfs-3g.so.23.0.0
sbin/mount.ntfs-3g

4
config/urlfilter/autoupdate.pl
View File

@@ -110,7 +110,7 @@ unless ($blacklist_url eq '')
print FILE "}\n";
close FILE;
system("/usr/sbin/squidGuard -d -c $target/update.conf -C all");
system("/usr/bin/squidGuard -d -c $target/update.conf -C all");
system("cp -r $target/blacklists/* $dbdir");
@@ -121,7 +121,7 @@ unless ($blacklist_url eq '')
system("touch $updflagfile");
system("chown nobody.nobody $updflagfile");
system("/usr/local/bin/restartsquid");
system("/etc/init.d/squid restart");
system("logger -t installpackage[urlfilter] \"URL filter blacklist - Update from $blacklist_src completed\"");

5
doc/packages-list.txt
View File

@@ -183,6 +183,7 @@
* mtd-CVS-20070507
* mtools-3.9.10
* mysql-5.0.24a
* nagios-3.0
* nano-1.2.5
* nasm-0.98.39
* ncftp-3.2.1-src
@@ -194,7 +195,7 @@
* nfs-utils-1.1.1
* nmap-4.03
* noip_updater_v1.6
* ntfs-3g-1.2216
* ntfs-3g-1.2310
* ntp-4.2.2
* ocaml-3.09.2
* oinkmaster-2.0
@@ -243,7 +244,7 @@
* sox-12.18.1
* spandsp-0.0.3pre24
* squashfs3.2-r2
* squid-2.6.STABLE18
* squid-2.6.STABLE19
* squid-graph-3.2
* squidGuard-1.3
* subversion-1.4.4

94
lfs/nagios Normal file
View File

@@ -0,0 +1,94 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 = 3.0
THISAPP = nagios-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nagios
PAK_VER = 1
DEPS = "glib"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2e7b82622d187d88a3b94f48b8549630
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# 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 zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr \
--datadir=/usr/share/nagios \
--sbindir=/usr/share/nagios/cgi-bin \
--localstatedir=/var \
--with-nagios-user=nobody \
--with-nagios-group=nobody \
--with-command-user=nobody \
--with-command-group=nobody \
--enable-embedded-perl \
--with-perlcache \
--with-httpd-conf=/etc/httpd/conf/conf.d
cd $(DIR_APP) && make all $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/ntfs-3g
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.2216
VER = 1.2310
THISAPP = ntfs-3g-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d1664636d38e4ce8eb2af1f09bc5a15d
$(DL_FILE)_MD5 = 70579e20da7cb5c1649096c6bf6d1b73
install : $(TARGET)

5
lfs/qemu
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu
PAK_VER = 1
PAK_VER = 2
DEPS = "sdl"
@@ -85,7 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4-opts.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-gcc-check \
--disable-gfx-check --target-list="i386-linux-user i386-softmmu"
--disable-gfx-check --target-list="i386-linux-user i386-softmmu ppc-softmmu ppc-linux-user" \
--enable-alsa
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

4
lfs/squid
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.6.STABLE18
VER = 2.6.STABLE19
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = eb49bc06ea1a40421b6f1ac9e76d1757
$(DL_FILE)_MD5 = e1f355ab907369903b5e28aff0fe8386
install : $(TARGET)

2
lfs/squidguard
View File

@@ -70,7 +70,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-ipfire.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-20071117.patch
cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
--sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man \
--with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \

1
make.sh
View File

@@ -547,6 +547,7 @@ buildipfire() {
ipfiremake netpbm
ipfiremake phpSANE
ipfiremake tunctl
ipfiremake nagios
}
buildinstaller() {

136
src/patches/squidGuard-1.3-20071117.patch Normal file
View File

@@ -0,0 +1,136 @@
diff -Naur squidGuard-1.3.orig/src/sgDb.c squidGuard-1.3/src/sgDb.c
--- squidGuard-1.3.orig/src/sgDb.c 2007-11-03 14:59:49.000000000 +0100
+++ squidGuard-1.3/src/sgDb.c 2007-11-17 22:56:07.000000000 +0100
@@ -1,10 +1,12 @@
/*
By accepting this notice, you agree to be bound by the following
agreements:
-
- This software product, squidGuard, is copyrighted (C) 1998-2007
- by Christine Kronberg, Shalla Secure Services. All rights reserved.
-
+
+ This software product, squidGuard, is copyrighted (C) 1998 by
+ ElTele <20>st AS, Oslo, Norway, with all rights reserved.
+ With December 27th 2006 all rights moved to Christine Kronberg,
+ Shalla Secure Services.
+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License (version 2) as
published by the Free Software Foundation. It is distributed in the
@@ -287,29 +289,75 @@
return result;
}
+static int stdoutisatty;
+
+#if __STDC__
+void startProgressBar()
+#else
+void startProgressBar()
+#endif
+{
+ stdoutisatty = isatty(STDOUT_FILENO);
+
+ if(1 == stdoutisatty)
+ {
+ /* do nothing */
+ }
+ else
+ {
+ printf(" [");
+ fflush(stdout);
+ }
+ return;
+}
+
#if __STDC__
-void drawProgressBar(float prog)
+void finishProgressBar()
#else
-void drawProgressBar(prog)
+void finishProgressBar()
+#endif
+{
+ if(1 == stdoutisatty)
+ {
+ printf("\n");
+ }
+ else
+ {
+ printf("] 100 %% done\n");
+ }
+ fflush(stdout);
+ return;
+}
+
+#if __STDC__
+void updateProgressBar(float prog)
+#else
+void updateProgressBar(prog)
float prog;
#endif
{
- int j,k=0;
- k = (int)(prog * 50.0);
- printf(" [");
- for(j=0; j<50; j++)
+ if(1 == stdoutisatty)
{
- if(j <= k)
+ int j,k=0;
+ k = (int)(prog * 50.0);
+ printf("\r");fflush(stdout);
+ printf(" [");
+ for(j=0; j<50; j++)
+ {
+ if(j <= k)
printf("=");
- else
+ else
printf(" ");
+ }
+ printf("] %d %% done", (int)(prog*100.0));fflush(stdout);
}
- printf("] %d %% done", (int)(prog*100.0));fflush(stdout);
- for(j=0; j<1000000; j++) {/*slow down to make progress bar more obvious*/}
- printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout);
- printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout);
- printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout);
- printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");fflush(stdout);
+ else
+ {
+ if(((int)(prog*100.0) % 100) == 0)
+ printf(".");fflush(stdout);
+ }
+
+ return;
}
#if __STDC__
@@ -340,13 +388,14 @@
fstat(fileno(fp), &fpst);
fpsz = fpst.st_size;
+ startProgressBar();
memset(&Db->key, 0, sizeof(DBT));
memset(&Db->data, 0, sizeof(DBT));
while(fgets(line, sizeof(line), fp) != NULL){
lnsz += strlen(line);
- drawProgressBar((float)lnsz/(float)fpsz);
+ updateProgressBar((float)lnsz/(float)fpsz);
if(*line == '#')
continue;
@@ -418,7 +467,7 @@
if(update){
sgLogError("update: added %d entries, deleted %d entries",entries,deleted);
}
- printf("\n");
+ finishProgressBar();
Db->entries = entries;
fclose(fp);
}