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

GnuPG in der "Vollversion" drin.

Browse Source 
Pakfire ein kleines wenig erweitert. Download-Funktionen angelegt, sodass ein naechster Mirror benutzt wird wenn der erste einen Fehler erzeugt.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@631 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-06-14 22:38:01 +00:00
parent c85ec3b463
commit 4d504812cb
5 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/rootfiles/common/gnupg
View File

@@ -1,17 +1,14 @@
#root/.gnupg
root/.gnupg/gpg.conf
root/.gnupg/pubring.gpg
root/.gnupg/pubring.gpg~
root/.gnupg/secring.gpg
root/.gnupg/trustdb.gpg
usr/bin/gpg
#usr/bin/gpg-zip
#usr/bin/gpgsplit
#usr/bin/gpgv
#usr/info/gpg.info
#usr/info/gpgv.info
#usr/libexec
#usr/libexec/gnupg
#usr/lib/gnupg
usr/lib/gnupg/gpgkeys_curl
usr/lib/gnupg/gpgkeys_finger
usr/lib/gnupg/gpgkeys_hkp
usr/lib/gnupg/gpgkeys_ldap
#usr/man/man1/gpg.1
#usr/man/man1/gpg.ru.1
#usr/man/man1/gpgv.1

9
config/rootfiles/common/mISDN
View File

@@ -9,6 +9,7 @@ usr/bin/testlayer3
usr/bin/testlib
usr/bin/tstlib
usr/bin/voipisdn
#usr/include/mISDNuser
#usr/include/mISDNuser/asn1.h
#usr/include/mISDNuser/asn1_diversion.h
#usr/include/mISDNuser/bchannel.h
@@ -35,3 +36,11 @@ usr/lib/libmISDN.so
#usr/lib/libsuppserv.a
usr/lib/libsuppserv.so
#usr/lib/libsuppserv_pic.a
#usr/lib/mISDN
usr/lib/mISDN/mISDN.conf.bnx.xsl
usr/lib/mISDN/mISDN.conf.hfcmulti.xsl
usr/lib/mISDN/mISDN.conf.inc.xsl
usr/lib/mISDN/mISDN.conf.l1oip.xsl
usr/lib/mISDN/mISDN.conf.mISDN_dsp.xsl
usr/lib/mISDN/mISDN.conf.singlepci.xsl
usr/lib/mISDN/mISDN.conf.xsl

2
doc/packages-list.txt
View File

@@ -1,4 +1,4 @@
== List of softwares used to build IPFire Version: 2.0a3 ==
== List of softwares used to build IPFire Version: 2.0t4 ==
* 3c5x9setup-1.00
* Archive-Tar-1.29
* Archive-Zip-1.16

8
lfs/gnupg
View File

@@ -73,11 +73,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
rm -rf /home/nobody/.gnupg /root/.gnupg
cd $(DIR_APP) && ./configure --prefix=/usr --enable-minimal --disable-nls \
--disable-dns-srv --disable-dns-pka --disable-dns-cert
cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
gpg --import $(DIR_SRC)/config/cfgroot/ipfire.gpg
gpg --import $(DIR_SRC)/config/cfgroot/cacert.asc
chmod -v 4755 /usr/bin/gpg
#gpg --import $(DIR_SRC)/config/cfgroot/ipfire.gpg
#gpg --import $(DIR_SRC)/config/cfgroot/cacert.asc
@rm -rf $(DIR_APP)
@$(POSTBUILD)

96
src/pakfire/lib/functions.pl
View File

@@ -5,6 +5,7 @@ require "/opt/pakfire/etc/pakfire.conf";
use File::Basename;
use File::Copy;
use LWP::UserAgent;
use HTTP::Response;
use Net::Ping;
package Pakfire;
@@ -35,64 +36,54 @@ sub pinghost {
}
sub fetchfile {
my $file = shift;
my $host = shift;
my (@server, $proto);
my $getfile = shift;
my $gethost = shift;
my (@server, $host, $proto, $file, $allok, $i);
use File::Basename;
if ("$host" eq "") {
@server = selectmirror();
$proto = $server[0];
$host = $server[1];
$file = "$server[2]/$file";
}
logger("Trying to get $file from $host ($proto).");
$bfile = basename("$getfile");
$bfile = basename("$file");
my $ua = LWP::UserAgent->new;
$ua->agent("Pakfire/$Conf::version");
#$ua->timeout(5);
#$ua->env_proxy;
my $response = $ua->get("http://$host/$file");
if ($response->is_success) {
if (open(FILE, ">$Conf::cachedir/$bfile")) {
print FILE $response->content;
close(FILE);
$i = 0;
while (($allok == 0) && $i < 5) {
$i++;
if ("$gethost" eq "") {
@server = selectmirror();
$proto = $server[0];
$host = $server[1];
$file = "$server[2]/$getfile";
} else {
message("Could not open $Conf::cachedir/$bfile for writing.");
$host = $gethost;
}
logger("$host sends file: $file.");
return 1;
}
else {
my $log = $response->status_line;
logger("$log");
return 0;
}
}
$proto = "HTTP" unless $proto;
logger("Trying to get $file from $host ($proto).");
sub testhost {
my $host = shift;
my $ua = LWP::UserAgent->new;
$ua->agent('Pakfire/2.1');
$ua->timeout(5);
# $ua->env_proxy;
my $response = $ua->get("http://$host/dummy");
if ($response->is_success) {
logger("$host answers my request.");
return 1;
}
else {
my $log = $response->status_line;
logger("Server does not work properly: $log");
return 0;
my $ua = LWP::UserAgent->new;
$ua->agent("Pakfire/$Conf::version");
#$ua->timeout(5);
#$ua->env_proxy;
my $response = $ua->get("http://$host/$file");
if ($response->is_success) {
logger("$host sends file: $file.");
if (open(FILE, ">$Conf::cachedir/$bfile")) {
print FILE $response->content;
close(FILE);
$allok = 1;
return 0;
} else {
logger("Could not open $Conf::cachedir/$bfile for writing.");
}
} else {
my $log = $response->status_line;
logger("Download $file failed from $host ($proto): $log");
}
}
message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nMay be you should run \"pakfire update\" to get some new servers.");
return 1;
}
sub getmirrors {
@@ -149,7 +140,7 @@ sub selectmirror {
}
}
}
}
}
}
sub dbgetlist {
@@ -386,6 +377,7 @@ sub setuppak {
if ($return == 0) {
move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
cleanup("tmp");
copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/");
message("Setup completed. Congratulations!");
} else {
message("Setup returned: $return. Sorry. Please search our forum to find a solution for this problem.");