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 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 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/config/rootfiles/packages/libevent2 b/config/rootfiles/packages/libevent2 new file mode 100644 index 000000000..fb3d8bd82 --- /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/lfs/libevent2 b/lfs/libevent2 index 1fbc7db09..0756ab15c 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 ############################################################################### @@ -63,6 +68,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 diff --git a/make.sh b/make.sh index e39fe41f2..84597c2c4 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 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.