[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 35fcdc416d9d86ab291cd65ecfacd4f785e05593 - IPFire-SCM

16 Feb 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  35fcdc416d9d86ab291cd65ecfacd4f785e05593 (commit)
       via  23212f068a53030d6413c27a9a2dfa7d513623b2 (commit)
       via  440d12ec5138c094a752f960ff345d6fbdcc4616 (commit)
       via  4f30ec1e2a89e47e77af10ad56282da38e216d1d (commit)
       via  1b5f497af36b3980b8ecfeb4f6ca8a6ebf807153 (commit)
      from  d6754f4b7eb4c81ed63afb2419e635509caef607 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 35fcdc416d9d86ab291cd65ecfacd4f785e05593
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Feb 16 22:01:15 2010 +0100
Changed ffmpeg-libs package version to match with ffmpeg.
commit 23212f068a53030d6413c27a9a2dfa7d513623b2
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Tue Feb 16 21:16:15 2010 +0100
Fixed faad2 package.
commit 440d12ec5138c094a752f960ff345d6fbdcc4616
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Tue Feb 16 08:54:22 2010 +0100
Update squidclamav to latest stable. Config layout has changed.
The old config will not be restored by the update process, you have
    to check you old config (still backuped) and change the config to
    you needs.
commit 4f30ec1e2a89e47e77af10ad56282da38e216d1d
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Tue Feb 16 08:49:32 2010 +0100
Enabled pthreads for ffmpeg.
commit 1b5f497af36b3980b8ecfeb4f6ca8a6ebf807153
Author: Christian Schmidt maniacikarus@ipfire.org
Date:   Tue Feb 16 08:48:48 2010 +0100
Added faad2 to build, this enables mp4a playback for vlc.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/faad2       |   13 +++++++
 config/rootfiles/packages/squidclamav |   13 ++++++-
 config/rootfiles/packages/videolan    |    1 +
 config/squidclamav/squidclamav.conf   |   59 +++++++++++++++++++--------------
 lfs/{taglib => faad}                  |   11 +++---
 lfs/{taglib => faad2}                 |   11 +++---
 lfs/ffmpeg                            |    7 ++--
 lfs/ffmpeg-libs                       |    2 +-
 lfs/squidclamav                       |    6 ++--
 lfs/videolan                          |    6 ++--
 make.sh                               |    1 +
 src/paks/squidclamav/update.sh        |    7 +++-
 12 files changed, 88 insertions(+), 49 deletions(-)
 create mode 100644 config/rootfiles/packages/faad2
 copy lfs/{taglib => faad} (94%)
 copy lfs/{taglib => faad2} (94%)
Difference in files:

diff --git a/config/rootfiles/packages/faad2 b/config/rootfiles/packages/faad2
new file mode 100644
index 0000000..b59e6b2
--- /dev/null
+++ b/config/rootfiles/packages/faad2
@@ -0,0 +1,13 @@
+usr/bin/faad
+#usr/include/faad.h
+#usr/include/mp4ff.h
+#usr/include/mp4ffint.h
+#usr/include/neaacdec.h
+usr/lib/libfaad.a
+usr/lib/libfaad.la
+usr/lib/libfaad.so
+usr/lib/libfaad.so.2
+usr/lib/libfaad.so.2.0.0
+usr/lib/libmp4ff.a
+#usr/share/man/manm
+#usr/share/man/manm/faad.man
\ No newline at end of file
diff --git a/config/rootfiles/packages/squidclamav b/config/rootfiles/packages/squidclamav
index 7dff2a6..0ebab0a 100644
--- a/config/rootfiles/packages/squidclamav
+++ b/config/rootfiles/packages/squidclamav
@@ -1,4 +1,13 @@
-usr/bin/squidclamav
 etc/squidclamav.conf
-srv/web/ipfire/html/clwarn.cgi
+usr/bin/squidclamav
+#usr/libexec/squidclamav
+#usr/libexec/squidclamav/clwarn.cgi
+#usr/libexec/squidclamav/clwarn.cgi.de_DE
+#usr/libexec/squidclamav/clwarn.cgi.en_EN
+#usr/libexec/squidclamav/clwarn.cgi.fr_FR
+#usr/libexec/squidclamav/clwarn.cgi.pt_BR
+#usr/share/man/man1/squidclamav.1
+#usr/share/squidclamav
+#usr/share/squidclamav/README
 var/ipfire/backup/addons/includes/squidclamav
+srv/web/ipfire/html/clwarn.cgi
\ No newline at end of file
diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan
index ddad494..2b980f9 100644
--- a/config/rootfiles/packages/videolan
+++ b/config/rootfiles/packages/videolan
@@ -83,6 +83,7 @@ usr/lib/vlc/codec/libcmml_plugin.so
 usr/lib/vlc/codec/libcvdsub_plugin.so
 usr/lib/vlc/codec/libdts_plugin.so
 usr/lib/vlc/codec/libdvbsub_plugin.so
+usr/lib/vlc/codec/libfaad_plugin.so
 usr/lib/vlc/codec/libfake_plugin.so
 usr/lib/vlc/codec/libflacdec_plugin.so
 usr/lib/vlc/codec/liblibmpeg2_plugin.so
diff --git a/config/squidclamav/squidclamav.conf b/config/squidclamav/squidclamav.conf
index 62b85b5..de8e13f 100644
--- a/config/squidclamav/squidclamav.conf
+++ b/config/squidclamav/squidclamav.conf
@@ -1,31 +1,40 @@
+#squid_ip 127.0.0.1
+#squid_port 3128
 proxy none
+#
 logfile /var/log/squidclamav.log
 redirect http://127.0.0.1:81/clwarn.cgi
+#
 debug 0
-force 1
 stat 0
+#
 clamd_local /var/run/clamav/clamd
-timeout 30
-abort ^.*.pdf$
-abort ^.*.js$
-abort ^.*.html$
-abort ^.*.css$
-abort ^.*.xml$
-abort ^.*.xsl$
-abort ^.*.js$
-abort ^.*.html$
-abort ^.*.css$
-abort ^.*.xml$
-abort ^.*.xsl$
-abort ^.*.js$
-abort ^.*.jsp$
-abort ^.*.jsp?.*$
-aborti ^.*servlet.*$
-abort ^.*.ico$
-aborti ^.*.gif$
-aborti ^.*.png$
-aborti ^.*.jpg$
-aborti ^.*.swf$
-abortcontenti ^.*application/x-mms-framed.*$
-abortcontenti ^.*application/x-javascript.*$
-content ^.*application/.*$
+#clamd_ip 192.168.1.5
+#clamd_port 3310
+#
+maxsize 5000000
+maxredir 30
+timeout 60
+#trust_cache 1
+#
+# Do not scan standard HTTP images
+abort ^.*.(ico|gif|png|jpg)$
+abortcontent ^image/.*$
+#
+# Do not scan text and javascript files
+abort ^.*.(css|xml|xsl|js|html|jsp)$
+abortcontent ^text/.*$
+abortcontent ^application/x-javascript$
+#
+# Do not scan streaming videos
+abortcontent ^video/mp4$
+abortcontent ^video/x-flv$
+#
+# Do not scan pdf and flash
+#abort ^.*.(pdf|swf)$
+#
+# Do not scan sequence of framed Microsoft Media Server (MMS) data packets
+abortcontent ^.*application/x-mms-framed.*$
+#
+# White list some sites
+whitelist .*.clamav.net
\ No newline at end of file
diff --git a/lfs/faad b/lfs/faad
new file mode 100644
index 0000000..bd258f7
--- /dev/null
+++ b/lfs/faad
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  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        = 2.7
+
+THISAPP    = faad2-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = faad2
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ee1b4d67ea2d76ee52c5621bc6dbf61e
+
+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 --enable-shared 
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/faad2 b/lfs/faad2
new file mode 100644
index 0000000..bd258f7
--- /dev/null
+++ b/lfs/faad2
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  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        = 2.7
+
+THISAPP    = faad2-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = faad2
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ee1b4d67ea2d76ee52c5621bc6dbf61e
+
+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 --enable-shared 
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 113b7e9..0ee9c3e 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -31,7 +31,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
@@ -79,8 +79,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    ln -s $(THISAPP) /usr/src/ffmpeg
    cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
                                      --enable-shared \
-				     --enable-postproc \
-				     --enable-gpl
+									 --enable-postproc \
+									 --enable-pthreads \
+									 --enable-gpl
    cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
    cd $(DIR_SRC)/ffmpeg && make install
    cd $(DIR_SRC)/ffmpeg && make install-libs
diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs
index 6965ee1..d12b45b 100644
--- a/lfs/ffmpeg-libs
+++ b/lfs/ffmpeg-libs
@@ -27,7 +27,7 @@ include Config
 VER        = 2008-04-13
 THISAPP    = ffmpeg-export-$(VER)
 PROG       = ffmpeg-libs
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       = ""
diff --git a/lfs/squidclamav b/lfs/squidclamav
index 80e99f8..110a43b 100644
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -24,7 +24,7 @@
include Config
-VER        = 4.1
+VER        = 5.0
THISAPP    = squidclamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       = "clamav"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5e79064fce4dacc1af34ba21fd4f0880
+$(DL_FILE)_MD5 = fe6456c25294653cb5f19ff7afdb5f90
install : $(TARGET)
diff --git a/lfs/videolan b/lfs/videolan
index b9a78a4..17a9f7a 100644
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 4
+PAK_VER    = 5
-DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"
+DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2"
###############################################################################
 # Top-level Rules
@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    							--with-v4l=/usr/src/v4l-dvb \
    							--enable-libdvbpsi --enable-faac --enable-mkv \
    							--enable-x264 --enable-release --enable-sout \
-								--disable-nls \
+								--disable-nls --enable-faad \
    							--enable-directfb --with-directfb=/usr/src/directfb
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/make.sh b/make.sh
index 84e6cfd..94f3f5b 100755
--- a/make.sh
+++ b/make.sh
@@ -569,6 +569,7 @@ buildipfire() {
   ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
+  ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh
index 89c40d0..3387a89 100644
--- a/src/paks/squidclamav/update.sh
+++ b/src/paks/squidclamav/update.sh
@@ -17,10 +17,13 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team info@ipfire.org.                        #
+# Copyright (C) 2010 IPFire-Team info@ipfire.org.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
-./install.sh
+extract_files
+# Restoring the backup  has to be excluded because config file changed
+# restore_backup ${NAME}
+/etc/init.d/squid restart
hooks/post-receive
--
IPFire 2.x development tree

    