GnuPG in der "Vollversion" drin.

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

diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg
index a8a2160a09defedb04e577db6b2e0190cb1d80cf..616ed05c0bf3ad37604b78ed80a817862d9fe4eb 100644 (file)
--- a/config/rootfiles/common/gnupg
+++ b/config/rootfiles/common/gnupg
@@ -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

diff --git a/config/rootfiles/common/mISDN b/config/rootfiles/common/mISDN
index 17b12d5f882a977b295171981af0d91d6f83faf6..b60d5f791229ce19b2a8beec0932b12aa358f70e 100644 (file)
--- a/config/rootfiles/common/mISDN
+++ b/config/rootfiles/common/mISDN
@@ -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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 385d280b44b1d7bc3566279e3fcbcd3e13ae252c..bade1d4b8da442ac9b063dfaa5a0f83ce3f2205b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -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

diff --git a/lfs/gnupg b/lfs/gnupg
index 70df62f2c976ecac0bfd1b42cc5439932f5b37d3..4df5e4ef1ec241e93a1b61d210ef8942f820cf83 100644 (file)
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -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)

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index caf10c0bd43e8ae55f17a8b36a0fe4c5b48a0053..48c34e91050dff03add509166e91129f54d54c19 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -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;
+               }
+               
+               $proto = "HTTP" unless $proto;
+               
+               logger("Trying to get $file from $host ($proto).");
+
+               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");
                }
-               logger("$host sends file: $file.");
-               return 1;
-       }
-       else {
-               my $log = $response->status_line;
-               logger("$log");
-               return 0;
-       }
-}
-
-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;
        }
+       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.");