From 5485de953c93e39e96d18f2351390086b8b92c82 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 1 Oct 2011 11:53:53 +0200 Subject: [PATCH 1/8] core53: add kvm modules to update. --- config/rootfiles/core/53/filelists/kvm-kmod | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 config/rootfiles/core/53/filelists/kvm-kmod diff --git a/config/rootfiles/core/53/filelists/kvm-kmod b/config/rootfiles/core/53/filelists/kvm-kmod new file mode 100644 index 000000000..ec75215fa --- /dev/null +++ b/config/rootfiles/core/53/filelists/kvm-kmod @@ -0,0 +1,6 @@ +lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko +lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko +lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko +lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko From 07590904f3f340434e057f1513d83e560bbf2db3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 1 Oct 2011 18:43:22 +0200 Subject: [PATCH 2/8] core53: fix pakfire cache cleanup. --- config/rootfiles/core/53/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh index fbf19954a..a9e3dcbe8 100644 --- a/config/rootfiles/core/53/update.sh +++ b/config/rootfiles/core/53/update.sh @@ -26,7 +26,7 @@ # # Remove old core updates from pakfire cache to save space... -core=52 +core=53 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire From 706371540dc4fa6b98a0b6f0236f1e5c1c6ff12e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 2 Oct 2011 17:35:03 +0200 Subject: [PATCH 3/8] start core54. --- config/rootfiles/core/54/exclude | 9 ++++ config/rootfiles/core/54/filelists/files | 2 + config/rootfiles/core/54/meta | 1 + config/rootfiles/core/54/update.sh | 60 ++++++++++++++++++++++++ make.sh | 2 +- 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/54/exclude create mode 100644 config/rootfiles/core/54/filelists/files create mode 100644 config/rootfiles/core/54/meta create mode 100644 config/rootfiles/core/54/update.sh diff --git a/config/rootfiles/core/54/exclude b/config/rootfiles/core/54/exclude new file mode 100644 index 000000000..ca3adf5c0 --- /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 index 000000000..409e5fe8a --- /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 index 000000000..d547fa86f --- /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 index 000000000..38e157e41 --- /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 . # +# # +############################################################################ +# +. /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/make.sh b/make.sh index 67464d545..0f2d1dc47 100755 --- 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 From c72709443139371255ed8b4637fef8711aedaa5a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 18 Sep 2011 13:34:47 +0200 Subject: [PATCH 4/8] transmission: New package. --- config/rootfiles/common/initscripts | 1 + config/rootfiles/packages/transmission | 66 +++++++++++++++++++ config/transmission/settings.json | 62 ++++++++++++++++++ lfs/transmission | 89 ++++++++++++++++++++++++++ make.sh | 1 + src/initscripts/init.d/transmission | 45 +++++++++++++ src/paks/transmission/install.sh | 41 ++++++++++++ src/paks/transmission/uninstall.sh | 30 +++++++++ src/paks/transmission/update.sh | 27 ++++++++ 9 files changed, 362 insertions(+) create mode 100644 config/rootfiles/packages/transmission create mode 100644 config/transmission/settings.json create mode 100644 lfs/transmission create mode 100644 src/initscripts/init.d/transmission create mode 100644 src/paks/transmission/install.sh create mode 100644 src/paks/transmission/uninstall.sh create mode 100644 src/paks/transmission/update.sh diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 9393aec50..fe9cc319b 100644 --- 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/packages/transmission b/config/rootfiles/packages/transmission new file mode 100644 index 000000000..a7843418e --- /dev/null +++ b/config/rootfiles/packages/transmission @@ -0,0 +1,66 @@ +#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/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/graphics/transfer_arrows.png +#usr/share/transmission/web/images/graphics/wait20.gif +#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/formatter.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.min.js +#usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js +#usr/share/transmission/web/javascript/jquery/json.min.js +#usr/share/transmission/web/javascript/menu.js +#usr/share/transmission/web/javascript/torrent.js +#usr/share/transmission/web/javascript/transmission.js +#usr/share/transmission/web/javascript/transmission.remote.js +#usr/share/transmission/web/stylesheets +#usr/share/transmission/web/stylesheets/common.css +#usr/share/transmission/web/stylesheets/ie6.css +#usr/share/transmission/web/stylesheets/ie7.css +#usr/share/transmission/web/stylesheets/iphone.css diff --git a/config/transmission/settings.json b/config/transmission/settings.json new file mode 100644 index 000000000..a5dbdaf51 --- /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/transmission b/lfs/transmission new file mode 100644 index 000000000..7ce4b8392 --- /dev/null +++ b/lfs/transmission @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.33 + +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 = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 76df2b002e9e243f2e4607b40c019974 + +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 + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0f2d1dc47..58d481f0d 100755 --- a/make.sh +++ b/make.sh @@ -700,6 +700,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 index 000000000..2ad7d48bb --- /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 index 000000000..c5907d453 --- /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 . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files + +# 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 + +# Start the service. +/etc/init.d/transmission start + +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 + +exit 0 diff --git a/src/paks/transmission/uninstall.sh b/src/paks/transmission/uninstall.sh new file mode 100644 index 000000000..5a2e7087e --- /dev/null +++ b/src/paks/transmission/uninstall.sh @@ -0,0 +1,30 @@ +#!/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 . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +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 index 000000000..c6485bf0a --- /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 . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +./uninstall.sh +./install.sh From 4236ab005deb102af5ed35a6af6a7686c51a5f48 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 2 Oct 2011 14:08:43 +0200 Subject: [PATCH 5/8] transmission: add initskript and backup include to package. --- config/backup/includes/transmission | 1 + config/rootfiles/packages/transmission | 2 ++ lfs/transmission | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 config/backup/includes/transmission diff --git a/config/backup/includes/transmission b/config/backup/includes/transmission new file mode 100644 index 000000000..d2ec52cbd --- /dev/null +++ b/config/backup/includes/transmission @@ -0,0 +1 @@ +/etc/transmission/ diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission index a7843418e..6a0c22e23 100644 --- a/config/rootfiles/packages/transmission +++ b/config/rootfiles/packages/transmission @@ -1,3 +1,4 @@ +var/ipfire/backup/addons/includes/transmission #etc/transmission etc/transmission/settings.json usr/bin/transmission-cli @@ -64,3 +65,4 @@ usr/share/transmission #usr/share/transmission/web/stylesheets/ie6.css #usr/share/transmission/web/stylesheets/ie7.css #usr/share/transmission/web/stylesheets/iphone.css +etc/rc.d/init.d/transmission diff --git a/lfs/transmission b/lfs/transmission index 7ce4b8392..b4ba4c44b 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -85,5 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -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) From b05f4b20d6cde15485bba7b491d28b82c36c2537 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 2 Oct 2011 19:00:15 +0200 Subject: [PATCH 6/8] transmission: backup/restore settings at install/uninstall. --- src/paks/transmission/install.sh | 8 ++++---- src/paks/transmission/uninstall.sh | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/paks/transmission/install.sh b/src/paks/transmission/install.sh index c5907d453..6efa67e34 100644 --- a/src/paks/transmission/install.sh +++ b/src/paks/transmission/install.sh @@ -24,18 +24,18 @@ . /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 -# Start the service. -/etc/init.d/transmission start - +# 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 index 5a2e7087e..85d7565cc 100644 --- a/src/paks/transmission/uninstall.sh +++ b/src/paks/transmission/uninstall.sh @@ -22,6 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} remove_files # Remove all start links. From 80756cd34478312d43c44dcb76df2532136dec3b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 18 Sep 2011 13:32:30 +0200 Subject: [PATCH 7/8] libevent2: New package. Needs to be added to core update 54. --- config/rootfiles/common/libevent2 | 45 ++++++++++++++++++ lfs/libevent2 | 77 +++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 123 insertions(+) create mode 100644 config/rootfiles/common/libevent2 create mode 100644 lfs/libevent2 diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2 new file mode 100644 index 000000000..fb3d8bd82 --- /dev/null +++ b/config/rootfiles/common/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/lfs/libevent2 b/lfs/libevent2 new file mode 100644 index 000000000..1fbc7db09 --- /dev/null +++ b/lfs/libevent2 @@ -0,0 +1,77 @@ +############################################################################### +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# 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) + +############################################################################### +# 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) + +############################################################################### +# 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/make.sh b/make.sh index 58d481f0d..b1e9b6853 100755 --- a/make.sh +++ b/make.sh @@ -585,6 +585,7 @@ buildipfire() { ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent + ipfiremake libevent2 ipfiremake portmap ipfiremake nfs ipfiremake nmap From 546f69c87df84eece09b55197a6968640a991f66 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 2 Oct 2011 21:14:35 +0200 Subject: [PATCH 8/8] libevent2: change to package. add it to transmission deps. --- config/rootfiles/{common => packages}/libevent2 | 0 lfs/libevent2 | 10 ++++++++-- lfs/transmission | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) rename config/rootfiles/{common => packages}/libevent2 (100%) diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/packages/libevent2 similarity index 100% rename from config/rootfiles/common/libevent2 rename to config/rootfiles/packages/libevent2 diff --git a/lfs/libevent2 b/lfs/libevent2 index 1fbc7db09..401ccbeaa 100644 --- a/lfs/libevent2 +++ b/lfs/libevent2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -32,6 +32,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libevent2 +PAK_VER = 1 + +DEPS = "" + ############################################################################### # Top-level Rules ############################################################################### @@ -62,7 +67,8 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) - +dist: + @$(PAK) ############################################################################### # Installation Details ############################################################################### diff --git a/lfs/transmission b/lfs/transmission index b4ba4c44b..d15631f51 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission PAK_VER = 1 -DEPS = "" +DEPS = "libevent2" ############################################################################### # Top-level Rules