From e7ab08f7e55109f646a8f5894f6377a38ddd5121 Mon Sep 17 00:00:00 2001 From: Chris Efant Date: Tue, 4 May 2004 09:27:41 +0000 Subject: [PATCH] Chris Efant: Updated dansguardian to 2.6.1-13, added option to add virus scanning support (using DGVirus) and added option to add the follow-x-forwarded-for patch to Squid. Added package perl-mail-sender (required for DGVirus) [2004042711344928698] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2856 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/sirkull/dansguardian/config.hlp | 8 ++++++++ package/sirkull/dansguardian/config.in | 9 +++++++++ .../sirkull/dansguardian/dansguardian.conf | 19 ++++++++++++++++--- .../sirkull/dansguardian/dansguardian.desc | 8 ++++++-- .../sirkull/dansguardian/pkg_squid_pre.conf | 17 +++++++++++++++++ .../perl-mail-sender/perl-mail-sender.desc | 17 +++++++++++++++++ 6 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 package/sirkull/dansguardian/config.hlp create mode 100644 package/sirkull/dansguardian/config.in create mode 100644 package/sirkull/dansguardian/pkg_squid_pre.conf create mode 100644 package/sirkull/perl-mail-sender/perl-mail-sender.desc diff --git a/package/sirkull/dansguardian/config.hlp b/package/sirkull/dansguardian/config.hlp new file mode 100644 index 000000000..32f5dcb4c --- /dev/null +++ b/package/sirkull/dansguardian/config.hlp @@ -0,0 +1,8 @@ + +ROCKCFG_PKG_DANSGUARDIAN_SQUID + This adds the Follow X-Forwarded-For support to Squid. This is needed + if you wish to use ACLs on clients accessing through DansGuardian. +ROCKCFG_PKG_DANSGUARDIAN_DGVIRUS + This adds Virus Scanning support to DansGuardian using the + DansGuardian Anti-Virus Plugin. + diff --git a/package/sirkull/dansguardian/config.in b/package/sirkull/dansguardian/config.in new file mode 100644 index 000000000..4eb6d6f79 --- /dev/null +++ b/package/sirkull/dansguardian/config.in @@ -0,0 +1,9 @@ + +if pkgcheck dansguardian X +then + menu_begin MENU_PKG_DANSGUARDIAN 'DansGuardian Options' + bool 'Add Follow X-Forwarded-For support to Squid' ROCKCFG_PKG_DANSGUARDIAN_SQUID 0 + bool 'Add Virus Scanning support to DansGuardian' ROCKCFG_PKG_DANSGUARDIAN_DGVIRUS 0 + menu_end +fi + diff --git a/package/sirkull/dansguardian/dansguardian.conf b/package/sirkull/dansguardian/dansguardian.conf index 9b2cc7d4d..aacf45af6 100644 --- a/package/sirkull/dansguardian/dansguardian.conf +++ b/package/sirkull/dansguardian/dansguardian.conf @@ -20,9 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -srctar="DansGuardian-$ver-$extraver.source.tar.bz2" -srcdir="DansGuardian-$ver" - # I have to define all of this manually or it doesn't install properly. # Don't remove the trailing slash. confopt="--bindir=$root/usr/sbin/ --sysconfdir=$root/etc/dansguardian/ \ @@ -32,3 +29,19 @@ confopt="--bindir=$root/usr/sbin/ --sysconfdir=$root/etc/dansguardian/ \ hook_add postmake 3 "install_init dansguardian $confdir/dansguardian.init" +if [ "$ROCKCFG_PKG_DANSGUARDIAN_DGVIRUS" == 1 ]; then + # Apply the DG Anti-Virus patch + hook_add preconf 3 "bunzip2 -c $archdir/$dgav_patch|patch -p1" + + # Install a filter for ClamAV + function dg_clamav() { + mkdir -pv $root/$prefix/lib/DGVirus + cat > $root/$prefix/lib/DGVirus/clamav-wrapper <<-'EOR' +#!/bin/sh +ClamScan=/usr/bin/clamdscan +exec $ClamScan $ScanOptions "$@" +EOR + chmod 755 $root/$prefix/lib/DGVirus/clamav-wrapper + } + hook_add postmake 3 "dg_clamav" +fi diff --git a/package/sirkull/dansguardian/dansguardian.desc b/package/sirkull/dansguardian/dansguardian.desc index 8a8c37c35..376321f46 100644 --- a/package/sirkull/dansguardian/dansguardian.desc +++ b/package/sirkull/dansguardian/dansguardian.desc @@ -40,8 +40,12 @@ [L] GPL [S] Stable -[V] 2.6.1 12 +[V] 2.6.1-13 [P] X -----5---9 307.000 -[D] 141105017 DansGuardian-2.6.1-12.source.tar.gz http://sun.dansguardian.org/downloads/2/Stable/ +[D] 3441682658 DansGuardian-2.6.1-13.source.tar.gz http://sun.dansguardian.org/downloads/2/Stable/ +[D] 1647486319 follow_xff-2.5-rediff-1.patch.bz2 http://www.sirkull.org/downloads/rock/patches/ +[D] 2571121125 DansGuardian-2.6.1-3-AntiVirus-3.1.patch.gz http://www.pcxperience.org/dgvirus/patches/DG2.6/ + +[O] dgav_patch=DansGuardian-2.6.1-3-AntiVirus-3.1.patch.bz2 diff --git a/package/sirkull/dansguardian/pkg_squid_pre.conf b/package/sirkull/dansguardian/pkg_squid_pre.conf new file mode 100644 index 000000000..0f1d7e832 --- /dev/null +++ b/package/sirkull/dansguardian/pkg_squid_pre.conf @@ -0,0 +1,17 @@ + +if [ "$ROCKCFG_PKG_DANSGUARDIAN_SQUID" == 1 ]; then + function dg_squid_preconf() { + # Add the X-Forwarded-For patch + echo "Adding Follow X-Forwarded-For patch" + bunzip2 -c $base/download/sirkull/dansguardian/follow_xff-2.5-rediff-1.patch.bz2 \ + | patch -p1 + + # Need to regenerate the config files + ./bootstrap.sh||true + + # Add X-Forwarded-For support + var_append confopt " " "--enable-follow-x-forwarded-for" + } + hook_add preconf 3 "dg_squid_preconf" +fi + diff --git a/package/sirkull/perl-mail-sender/perl-mail-sender.desc b/package/sirkull/perl-mail-sender/perl-mail-sender.desc new file mode 100644 index 000000000..49d1f7aed --- /dev/null +++ b/package/sirkull/perl-mail-sender/perl-mail-sender.desc @@ -0,0 +1,17 @@ + +[I] Perl module for sending mails with attachments + +[T] Module for sending mails with attachments through an SMTP server + +[A] Jan Krynicky +[M] Chris Efant + +[C] extra/development + +[L] OpenSource +[S] Stable +[V] 0.8.10 +[P] X -----5---9 224.000 + +[D] 2746755259 Mail-Sender-0.8.10.tar.gz http://www.cpan.org/authors/id/J/JE/JENDA/ +