webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	lfs/libevent2
	lfs/transmission
	src/paks/transmission/install.sh
	src/paks/transmission/uninstall.sh
This commit is contained in:
Arne Fitzenreiter
2011-10-02 21:27:09 +02:00
parent 84aed1ea54 546f69c87d
commit e137ec4ecf
12 changed files with 140 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/rootfiles/core/53/filelists/kvm-kmod Normal file
View File

@@ -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

2
config/rootfiles/core/53/update.sh
View File

@@ -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

9
config/rootfiles/core/54/exclude Normal file
View File

@@ -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

2
config/rootfiles/core/54/filelists/files Normal file
View File

@@ -0,0 +1,2 @@
etc/system-release
etc/issue

1
config/rootfiles/core/54/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

60
config/rootfiles/core/54/update.sh Normal file
View File

@@ -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

45
config/rootfiles/packages/libevent2 Normal file
View File

@@ -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

9
lfs/libevent2
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# 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 #
@@ -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
###############################################################################

2
lfs/transmission
View File

@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 1
DEPS = ""
DEPS = "libevent2"
###############################################################################
# Top-level Rules

2
make.sh
View File

@@ -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

8
src/paks/transmission/install.sh
View File

@@ -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

2
src/paks/transmission/uninstall.sh
View File

@@ -22,6 +22,8 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
make_backup ${NAME}
remove_files
# Remove all start links.