Merge branch 'core53'

diff --git a/config/backup/includes/transmission b/config/backup/includes/transmission
new file mode 100644 (file)
index 0000000..d2ec52c
--- /dev/null
+++ b/config/backup/includes/transmission
@@ -0,0 +1 @@
+/etc/transmission/

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 9393aec50d9c66c3b66cd570bdb88ead536b1edb..fe9cc319b2c9aa1fbeaf1711238f010cfa478b40 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -118,6 +118,7 @@ etc/rc.d/init.d/teamspeak
 etc/rc.d/init.d/template
 #etc/rc.d/init.d/tftpd
 etc/rc.d/init.d/tmpfs
+#etc/rc.d/init.d/transmission
 etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/init.d/upnpd

diff --git a/config/rootfiles/core/54/exclude b/config/rootfiles/core/54/exclude
new file mode 100644 (file)
index 0000000..ca3adf5
--- /dev/null
+++ b/config/rootfiles/core/54/exclude
@@ -0,0 +1,9 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn

diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue

diff --git a/config/rootfiles/core/54/meta b/config/rootfiles/core/54/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/54/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh
new file mode 100644 (file)
index 0000000..38e157e
--- /dev/null
+++ b/config/rootfiles/core/54/update.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=54
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.45-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti
index 123d1f6aa922069aeb26cf496e9fb6c48c745c26..2807f77c38a41e7e9a517048bb3ee54452a98e23 100644 (file)
--- a/config/rootfiles/packages/cacti
+++ b/config/rootfiles/packages/cacti
@@ -16,8 +16,10 @@ usr/share/cacti/cli/add_graph_template.php
 usr/share/cacti/cli/add_graphs.php
 usr/share/cacti/cli/add_perms.php
 usr/share/cacti/cli/add_tree.php
+usr/share/cacti/cli/analyze_database.php
 usr/share/cacti/cli/convert_innodb.php
 usr/share/cacti/cli/copy_user.php
+usr/share/cacti/cli/data_template_associate_rra.php
 usr/share/cacti/cli/host_update_template.php
 usr/share/cacti/cli/import_template.php
 usr/share/cacti/cli/poller_data_sources_reapply_names.php
@@ -315,6 +317,7 @@ usr/share/cacti/install/0_8_7c_to_0_8_7d.php
 usr/share/cacti/install/0_8_7d_to_0_8_7e.php
 usr/share/cacti/install/0_8_7e_to_0_8_7f.php
 usr/share/cacti/install/0_8_7f_to_0_8_7g.php
+usr/share/cacti/install/0_8_7g_to_0_8_7h.php
 usr/share/cacti/install/0_8_to_0_8_1.php
 usr/share/cacti/install/index.php
 usr/share/cacti/install/install_finish.gif

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 96d00940b8470d0fdd288473847510586216527a..7244dbbb698d052ae77ea899984106e9845adfee 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.11
+usr/lib/libclamav.so.6.1.12
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.11
+usr/lib/libclamunrar.so.6.1.12
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.11
+usr/lib/libclamunrar_iface.so.6.1.12
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/config/rootfiles/packages/libevent2 b/config/rootfiles/packages/libevent2
new file mode 100644 (file)
index 0000000..fb3d8bd
--- /dev/null
+++ b/config/rootfiles/packages/libevent2
@@ -0,0 +1,45 @@
+#usr/include/event2
+#usr/include/event2/buffer.h
+#usr/include/event2/buffer_compat.h
+#usr/include/event2/bufferevent.h
+#usr/include/event2/bufferevent_compat.h
+#usr/include/event2/bufferevent_ssl.h
+#usr/include/event2/bufferevent_struct.h
+#usr/include/event2/dns.h
+#usr/include/event2/dns_compat.h
+#usr/include/event2/dns_struct.h
+#usr/include/event2/event-config.h
+#usr/include/event2/event.h
+#usr/include/event2/event_compat.h
+#usr/include/event2/event_struct.h
+#usr/include/event2/http.h
+#usr/include/event2/http_compat.h
+#usr/include/event2/http_struct.h
+#usr/include/event2/keyvalq_struct.h
+#usr/include/event2/listener.h
+#usr/include/event2/rpc.h
+#usr/include/event2/rpc_compat.h
+#usr/include/event2/rpc_struct.h
+#usr/include/event2/tag.h
+#usr/include/event2/tag_compat.h
+#usr/include/event2/thread.h
+#usr/include/event2/util.h
+usr/lib/libevent-2.0.so.5
+usr/lib/libevent-2.0.so.5.1.2
+usr/lib/libevent_core-2.0.so.5
+usr/lib/libevent_core-2.0.so.5.1.2
+usr/lib/libevent_extra-2.0.so.5
+usr/lib/libevent_extra-2.0.so.5.1.2
+usr/lib/libevent_openssl-2.0.so.5
+usr/lib/libevent_openssl-2.0.so.5.1.2
+#usr/lib/libevent_openssl.a
+#usr/lib/libevent_openssl.la
+#usr/lib/libevent_openssl.so
+usr/lib/libevent_pthreads-2.0.so.5
+usr/lib/libevent_pthreads-2.0.so.5.1.2
+#usr/lib/libevent_pthreads.a
+#usr/lib/libevent_pthreads.la
+#usr/lib/libevent_pthreads.so
+#usr/lib/pkgconfig/libevent.pc
+#usr/lib/pkgconfig/libevent_openssl.pc
+#usr/lib/pkgconfig/libevent_pthreads.pc

diff --git a/config/rootfiles/packages/mediatomb b/config/rootfiles/packages/mediatomb
index 5f08e9152c8216a54fcf240a43edb2a7d2bf868c..fd727523516e585f8342ed5f77ee1d0497493bd4 100644 (file)
--- a/config/rootfiles/packages/mediatomb
+++ b/config/rootfiles/packages/mediatomb
@@ -3,7 +3,6 @@ usr/bin/mediatomb
 #usr/share/mediatomb
 #usr/share/mediatomb/js
 usr/share/mediatomb/js/common.js
-usr/share/mediatomb/js/import-dvd.js
 usr/share/mediatomb/js/import.js
 usr/share/mediatomb/js/playlists.js
 usr/share/mediatomb/mappings.xml

diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission
new file mode 100644 (file)
index 0000000..af8a68a
--- /dev/null
+++ b/config/rootfiles/packages/transmission
@@ -0,0 +1,69 @@
+#etc/transmission
+etc/transmission/settings.json
+usr/bin/transmission-cli
+usr/bin/transmission-create
+usr/bin/transmission-daemon
+usr/bin/transmission-edit
+usr/bin/transmission-remote
+usr/bin/transmission-show
+#usr/share/man/man1/transmission-cli.1
+#usr/share/man/man1/transmission-create.1
+#usr/share/man/man1/transmission-daemon.1
+#usr/share/man/man1/transmission-edit.1
+#usr/share/man/man1/transmission-remote.1
+#usr/share/man/man1/transmission-show.1
+usr/share/transmission
+#usr/share/transmission/web
+#usr/share/transmission/web/LICENSE
+#usr/share/transmission/web/images
+#usr/share/transmission/web/images/buttons
+#usr/share/transmission/web/images/buttons/cancel.png
+#usr/share/transmission/web/images/buttons/file_priority_buttons.png
+#usr/share/transmission/web/images/buttons/file_wanted_buttons.png
+#usr/share/transmission/web/images/buttons/info_activity.png
+#usr/share/transmission/web/images/buttons/info_files.png
+#usr/share/transmission/web/images/buttons/info_general.png
+#usr/share/transmission/web/images/buttons/info_peers.png
+#usr/share/transmission/web/images/buttons/info_trackers.png
+#usr/share/transmission/web/images/buttons/tab_backgrounds.png
+#usr/share/transmission/web/images/buttons/tab_backgrounds_highlight.png
+#usr/share/transmission/web/images/buttons/toolbar_buttons.png
+#usr/share/transmission/web/images/buttons/torrent_buttons.png
+#usr/share/transmission/web/images/favicon.ico
+#usr/share/transmission/web/images/favicon.png
+#usr/share/transmission/web/images/graphics
+#usr/share/transmission/web/images/graphics/blue-turtle.png
+#usr/share/transmission/web/images/graphics/chrome.png
+#usr/share/transmission/web/images/graphics/filter_bar.png
+#usr/share/transmission/web/images/graphics/filter_icon.png
+#usr/share/transmission/web/images/graphics/iphone_chrome.png
+#usr/share/transmission/web/images/graphics/lock_icon.png
+#usr/share/transmission/web/images/graphics/logo.png
+#usr/share/transmission/web/images/progress
+#usr/share/transmission/web/images/progress/progress.png
+#usr/share/transmission/web/images/webclip-icon.png
+#usr/share/transmission/web/index.html
+#usr/share/transmission/web/javascript
+#usr/share/transmission/web/javascript/common.js
+#usr/share/transmission/web/javascript/dialog.js
+#usr/share/transmission/web/javascript/file-row.js
+#usr/share/transmission/web/javascript/formatter.js
+#usr/share/transmission/web/javascript/inspector.js
+#usr/share/transmission/web/javascript/jquery
+#usr/share/transmission/web/javascript/jquery/jquery.contextmenu.min.js
+#usr/share/transmission/web/javascript/jquery/jquery.form.js
+#usr/share/transmission/web/javascript/jquery/jquery.form.min.js
+#usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js
+#usr/share/transmission/web/javascript/jquery/json2.min.js
+#usr/share/transmission/web/javascript/prefs-dialog.js
+#usr/share/transmission/web/javascript/remote.js
+#usr/share/transmission/web/javascript/torrent-row.js
+#usr/share/transmission/web/javascript/torrent.js
+#usr/share/transmission/web/javascript/transmission.js
+#usr/share/transmission/web/stylesheets
+#usr/share/transmission/web/stylesheets/common.css
+#usr/share/transmission/web/stylesheets/ie7.css
+#usr/share/transmission/web/stylesheets/ieAll.css
+#usr/share/transmission/web/stylesheets/mobile.css
+var/ipfire/backup/addons/includes/transmission
+etc/rc.d/init.d/transmission

diff --git a/config/transmission/settings.json b/config/transmission/settings.json
new file mode 100644 (file)
index 0000000..a5dbdaf
--- /dev/null
+++ b/config/transmission/settings.json
@@ -0,0 +1,62 @@
+{
+    "alt-speed-down": 512, 
+    "alt-speed-enabled": true, 
+    "alt-speed-time-begin": 540, 
+    "alt-speed-time-day": 127, 
+    "alt-speed-time-enabled": false, 
+    "alt-speed-time-end": 1020, 
+    "alt-speed-up": 10, 
+    "bind-address-ipv4": "0.0.0.0", 
+    "bind-address-ipv6": "::", 
+    "blocklist-enabled": false, 
+    "cache-size-mb": 2, 
+    "dht-enabled": true, 
+    "download-dir": "/var/transmission/downloads", 
+    "encryption": 1, 
+    "idle-seeding-limit": 30, 
+    "idle-seeding-limit-enabled": false, 
+    "incomplete-dir": "/var/transmission/incomplete", 
+    "incomplete-dir-enabled": true, 
+    "lazy-bitfield-enabled": true, 
+    "lpd-enabled": false, 
+    "message-level": 2, 
+    "open-file-limit": 32, 
+    "peer-limit-global": 240, 
+    "peer-limit-per-torrent": 60, 
+    "peer-port": 6969, 
+    "peer-port-random-high": 65535, 
+    "peer-port-random-low": 49152, 
+    "peer-port-random-on-start": false, 
+    "peer-socket-tos": 0, 
+    "pex-enabled": true, 
+    "port-forwarding-enabled": true, 
+    "preallocation": 1, 
+    "proxy": "", 
+    "proxy-auth-enabled": false, 
+    "proxy-auth-password": "", 
+    "proxy-auth-username": "", 
+    "proxy-enabled": false, 
+    "proxy-port": 80, 
+    "proxy-type": 0, 
+    "ratio-limit": 2, 
+    "ratio-limit-enabled": false, 
+    "rename-partial-files": true, 
+    "rpc-authentication-required": false, 
+    "rpc-bind-address": "0.0.0.0", 
+    "rpc-enabled": true, 
+    "rpc-password": "{b518093d8e833b34c139cea744e335ab70d827dcQSnFbsNU", 
+    "rpc-port": 9091, 
+    "rpc-username": "", 
+    "rpc-whitelist": "127.0.0.1", 
+    "rpc-whitelist-enabled": false, 
+    "script-torrent-done-enabled": false, 
+    "script-torrent-done-filename": "", 
+    "speed-limit-down": 768, 
+    "speed-limit-down-enabled": true, 
+    "speed-limit-up": 20, 
+    "speed-limit-up-enabled": true, 
+    "start-added-torrents": true, 
+    "trash-original-torrent-files": false, 
+    "umask": 18, 
+    "upload-slots-per-torrent": 14
+}

diff --git a/lfs/cacti b/lfs/cacti
index ef06eade18f7fae423415cf43969bde9eb87ea91..8d7885975110d1ce35f424b252f0fe494f6d575d 100644 (file)
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.7g
+VER        = 0.8.7h
 
 THISAPP    = cacti-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cacti
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "netsnmpd mysql"
 
@@ -44,8 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 268421cb1a58d3444f7ecbddb4c4b016
-
+$(DL_FILE)_MD5 = 58c9371341f49a190ae11a85118e598d
 
 install : $(TARGET)
 

diff --git a/lfs/clamav b/lfs/clamav
index d30ae6344c75d9c680c85116d044475ba6fcfcbf..5b97cfe9eb60d444da4a96498e517f4fd68c2ab9 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.97.2
+VER        = 0.97.3
 
 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    = 17
+PAK_VER    = 18
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cb2d78b4790fdfca3b2390d7ce82f0b7
+$(DL_FILE)_MD5 = 5cf25ed7778fa0cb6b140ad8f009befb
 
 install : $(TARGET)
 

diff --git a/lfs/libevent2 b/lfs/libevent2
new file mode 100644 (file)
index 0000000..401ccbe
--- /dev/null
+++ b/lfs/libevent2
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.de>                      #
+#                                                                             #
+# 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.0.13-stable
+
+THISAPP    = libevent-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+PROG       = libevent2
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = af786b4b3f790c9d3279792edf7867fc
+
+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)
+dist: 
+       @$(PAK)
+###############################################################################
+# 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
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/mediatomb b/lfs/mediatomb
index b327d724058ecc1a489fb5231d7be04ecf1c9d1a..2bfde66ca5d62ccb19943d65ddc4c681acf2d3dd 100644 (file)
--- a/lfs/mediatomb
+++ b/lfs/mediatomb
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = svn2020
+VER        = 0.12.1
 
 THISAPP    = mediatomb-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mediatomb
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "sqlite taglib ffmpeg-libs"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7fb4ef41da88f82eb1d0acb160104874
+$(DL_FILE)_MD5 = e927dd5dc52d3cfcebd8ca1af6f0d3c2
 
 install : $(TARGET)
 
@@ -76,7 +76,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 axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install

diff --git a/lfs/mpd b/lfs/mpd
index f673c85b4e268876f42985a0cc322aecdada3225..ca82ad2e44ac6074ffad5f4d64f4e9722463c89b 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.16.3
+VER        = 0.16.5
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 13
+PAK_VER    = 14
 
-DEPS       = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
+DEPS       = "alsa faad2 ffmpeg-libs glib lame libmad libshout libogg libid3tag libvorbis"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6e708c02b0e8c288aec855eecf441a5a
+$(DL_FILE)_MD5 = f7564cff12035f6a1112cce770655df7
 
 install : $(TARGET)
 

diff --git a/lfs/squid b/lfs/squid
index a29109fc49662ed3cd5a070aa658f00f866970e3..6b71f0dae05ec994a61345860515e0c659477bb6 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.15
+VER        = 3.1.16
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92
+$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261
 
 install : $(TARGET)
 

diff --git a/lfs/transmission b/lfs/transmission
new file mode 100644 (file)
index 0000000..c4262d2
--- /dev/null
+++ b/lfs/transmission
@@ -0,0 +1,94 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-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        = 2.41
+
+THISAPP    = transmission-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = transmission
+PAK_VER    = 2
+
+DEPS       = "libevent2"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 0d0a061dfb92c0cb359dc531d5da0a94
+
+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 axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+
+       # Install configuration files.
+       -mkdir -pv /etc/transmission
+       cp -vf $(DIR_SRC)/config/transmission/* /etc/transmission/
+       chown -Rv nobody.nobody /etc/transmission
+
+       # Install backup include
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/transmission \
+                        /var/ipfire/backup/addons/includes/transmission
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 67464d5450f7328675436788143d6822fa3d696f..b1e9b68534523a620a91f400bff9fe96323d4e8d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
-CORE="53"                                                      # Core Level (Filename)
+CORE="54"                                                      # Core Level (Filename)
 PAKFIRE_CORE="53"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -585,6 +585,7 @@ buildipfire() {
   ipfiremake rsync
   ipfiremake tcpwrapper
   ipfiremake libevent
+  ipfiremake libevent2
   ipfiremake portmap
   ipfiremake nfs
   ipfiremake nmap
@@ -700,6 +701,7 @@ buildipfire() {
   ipfiremake python-xattr
   ipfiremake intltool
   ipfiremake pakfire3-deps
+  ipfiremake transmission
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/initscripts/init.d/transmission b/src/initscripts/init.d/transmission
new file mode 100644 (file)
index 0000000..2ad7d48
--- /dev/null
+++ b/src/initscripts/init.d/transmission
@@ -0,0 +1,45 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/
+#
+# Description :
+#
+# Authors     :
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg "Starting transmission daemon..."
+               transmission-daemon -g /etc/transmission
+               ;;
+
+       stop)
+               boot_mesg "Stopping transmission daemon..."
+               killall transmission-daemon
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc transmission-daemon
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/

diff --git a/src/paks/transmission/install.sh b/src/paks/transmission/install.sh
new file mode 100644 (file)
index 0000000..6efa67e
--- /dev/null
+++ b/src/paks/transmission/install.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 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>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+restore_backup ${NAME}
+# Create download directories if they do not yet exist.
+mkdir -p /var/transmission/{downloads,incomplete} 2>/dev/null
+
+# Adjust permissions.
+chown nobody.nobody /etc/transmission /var/transmission
+
+# create startlinks
+ln -sf ../init.d/transmission /etc/rc.d/rc0.d/K20transmission
+ln -sf ../init.d/transmission /etc/rc.d/rc3.d/S99transmission
+ln -sf ../init.d/transmission /etc/rc.d/rc6.d/K20transmission
+
+# Start the service.
+start_service --background ${NAME}
+exit 0

diff --git a/src/paks/transmission/uninstall.sh b/src/paks/transmission/uninstall.sh
new file mode 100644 (file)
index 0000000..85d7565
--- /dev/null
+++ b/src/paks/transmission/uninstall.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 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>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
+
+# Remove all start links.
+rm -rf /etc/rc.d/rc*.d/*transmission
+
+exit 0

diff --git a/src/paks/transmission/update.sh b/src/paks/transmission/update.sh
new file mode 100644 (file)
index 0000000..c6485bf
--- /dev/null
+++ b/src/paks/transmission/update.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 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>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+./uninstall.sh
+./install.sh