mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-25 02:12:58 +02:00
OpenVPN gefixt.
ctorrent hinzugefuegt. UpdateBooster/SquidGuard gefixt. Pakfire-Archiv geaendert. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@647 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
1
config/rootfiles/packages/ctorrent
Normal file
1
config/rootfiles/packages/ctorrent
Normal file
@@ -0,0 +1 @@
|
||||
usr/bin/ctorrent
|
||||
@@ -57,6 +57,7 @@
|
||||
* clamav-0.90.3
|
||||
* coreutils-5.96
|
||||
* cpio-2.6
|
||||
* ctorrent-dnh3.1
|
||||
* cups-1.2.2
|
||||
* cyrus-imapd-2.2.12
|
||||
* cyrus-sasl-2.1.21
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
#
|
||||
# (c) 2006 marco.s
|
||||
#
|
||||
# $Id: updatexlrator.cgi,v 1.0.0 2006/09/12 00:00:00 marco.s Exp $
|
||||
#
|
||||
|
||||
use strict;
|
||||
|
||||
@@ -177,7 +175,7 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr save and restart'})
|
||||
|
||||
&savesettings;
|
||||
|
||||
system('/usr/local/bin/squidctrl restart');
|
||||
system('/usr/local/bin/squidctrl restart >/dev/null 2>&1');
|
||||
}
|
||||
|
||||
if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr remove file'})
|
||||
|
||||
@@ -369,7 +369,7 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
|
||||
|
||||
&setpermissions ($dbdir);
|
||||
|
||||
system('/usr/local/bin/restartsquid');
|
||||
system('/usr/local/bin/squidctrl restart >/dev/null 2>&1');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -503,7 +503,7 @@ if (($tcsettings{'MODE'} eq 'TIMECONSTRAINT') && ($tcsettings{'ACTION'} eq $Lang
|
||||
$errormessage = $Lang::tr{'urlfilter web proxy service required'};
|
||||
}
|
||||
|
||||
if (!$errormessage) { system('/usr/local/bin/restartsquid'); }
|
||||
if (!$errormessage) { system('/usr/local/bin/squidctrl restart >/dev/null 2>&1'); }
|
||||
$tcsettings{'TCMODE'}='on';
|
||||
}
|
||||
|
||||
@@ -706,7 +706,7 @@ if (($uqsettings{'MODE'} eq 'USERQUOTA') && ($uqsettings{'ACTION'} eq $Lang::tr{
|
||||
$errormessage = $Lang::tr{'urlfilter web proxy service required'};
|
||||
}
|
||||
|
||||
if (!$errormessage) { system('/usr/local/bin/restartsquid'); }
|
||||
if (!$errormessage) { system('/usr/local/bin/squidctrl restart >/dev/null 2>&1'); }
|
||||
$uqsettings{'UQMODE'}='on';
|
||||
}
|
||||
|
||||
@@ -960,7 +960,7 @@ if (($besettings{'ACTION'} eq $Lang::tr{'urlfilter install blacklist'}) && ($bes
|
||||
|
||||
&writeconfigfile;
|
||||
|
||||
system('/usr/local/bin/restartsquid') unless ($besettings{'NORESTART'} eq 'on');
|
||||
system('/usr/local/bin/squidctrl restart >/dev/null 2>&1') unless ($besettings{'NORESTART'} eq 'on');
|
||||
|
||||
if (-d $editdir) { system("rm -rf $editdir"); }
|
||||
} else {
|
||||
|
||||
@@ -163,8 +163,8 @@ define PAK
|
||||
/install/packages/package
|
||||
-grep -v "#" < /usr/src/config/rootfiles/packages/$(PROG) > /install/packages/package/ROOTFILES
|
||||
@chmod 755 /install/packages/package/{,un}install.sh
|
||||
@cd / && cpio -o < /install/packages/package/ROOTFILES > /install/packages/package/files
|
||||
cd /install/packages/package && cpio -o < /usr/src/src/paks/files > ../$(PROG)-$(VER)-$(PAK_VER).ipfire
|
||||
cd / && tar cvf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*'
|
||||
cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files
|
||||
rm -rf /install/packages/package
|
||||
sed -e s/NAME/$(PROG)/g \
|
||||
-e s/VER/$(VER)/g \
|
||||
|
||||
79
lfs/ctorrent
Normal file
79
lfs/ctorrent
Normal file
@@ -0,0 +1,79 @@
|
||||
###############################################################################
|
||||
# This file is part of the IPCop Firewall. #
|
||||
# #
|
||||
# IPCop 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. #
|
||||
# #
|
||||
# IPCop 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 IPCop; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Makefiles are based on LFSMake, which is #
|
||||
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = dnh3.1
|
||||
|
||||
THISAPP = ctorrent-$(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 = de313da3a9acbd63bc50f093ed08097f
|
||||
|
||||
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)
|
||||
1
make.sh
1
make.sh
@@ -505,6 +505,7 @@ buildipfire() {
|
||||
ipfiremake lame
|
||||
ipfiremake sox
|
||||
ipfiremake gnump3d
|
||||
ipfiremake ctorrent
|
||||
ipfiremake applejuice
|
||||
ipfiremake ocaml
|
||||
ipfiremake mldonkey
|
||||
|
||||
@@ -296,7 +296,8 @@ void stopDaemon(void) {
|
||||
executeCommand(command);
|
||||
snprintf(command, STRING_SIZE - 1, "/bin/rm -f /var/run/openvpn.pid");
|
||||
executeCommand(command);
|
||||
executeCommand("modprobe -r tun");
|
||||
snprintf(command, STRING_SIZE-1, "/sbin/modprobe -r tun");
|
||||
executeCommand(command);
|
||||
}
|
||||
|
||||
void startDaemon(void) {
|
||||
@@ -306,7 +307,8 @@ void startDaemon(void) {
|
||||
fprintf(stderr, "OpenVPN is not enabled on any interface\n");
|
||||
exit(1);
|
||||
} else {
|
||||
executeCommand("modprobe tun");
|
||||
snprintf(command, STRING_SIZE-1, "/sbin/modprobe tun");
|
||||
executeCommand(command);
|
||||
snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf");
|
||||
executeCommand(command);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
|
||||
extract_files() {
|
||||
echo "Extracting files..."
|
||||
cd / && cpio -i < /opt/pakfire/tmp/files
|
||||
|
||||
tar xvf /opt/pakfire/tmp/files -C /
|
||||
echo "...Finished."
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user