From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 6 May 2007 17:53:16 +0000 (+0000)
Subject: Pakfire Fixes.
X-Git-Tag: v2.3-beta1~723
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c3df33af1cb4f3701a0f2df56301dfa6626a9ddc;hp=9674ef0d418c7fbb6cff5b0981966b9206131569

Pakfire Fixes.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@536 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/config/rootfiles/ver_full/pakfire b/config/rootfiles/ver_full/pakfire
index b4657fb4aa..6c13fe6f82 100644
--- a/config/rootfiles/ver_full/pakfire
+++ b/config/rootfiles/ver_full/pakfire
@@ -11,5 +11,4 @@ opt/pakfire/lib/functions.pl
 opt/pakfire/logs
 #opt/pakfire/meta
 opt/pakfire/pakfire
-opt/pakfire/pakfire.conf
 opt/pakfire/tmp
diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi
index f5a0c7e912..4620063650 100644
--- a/html/cgi-bin/webaccess.cgi
+++ b/html/cgi-bin/webaccess.cgi
@@ -69,7 +69,7 @@ if (($cgiparams{'ACTION'} eq 'submit') && ($is_supervisor))
 		((defined($proxysettings{'SUPERVISOR_PASSWORD'})) && ($proxysettings{'SUPERVISOR_PASSWORD'} eq '')))
 	{
 		&write_acl;
-		system("/usr/local/bin/restartsquid");
+		system("/usr/local/bin/squidctrl restart >/dev/null 2>&1");
 	}
 }
 
diff --git a/lfs/configroot b/lfs/configroot
index 3d285580b0..c91fadeab0 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -55,7 +55,7 @@ $(TARGET) :
 	for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
 	    ethernet extrahd/bin fwlogs isdn key langs logging main mbmon menu.d modem net-traffic \
 			nfs optionsfw outgoing/bin patches pakfire portfw \
-	    ppp private proxy/advanced proxy/calamaris/bin qos/bin red remote snort time tripwire/report \
+	    ppp private proxy/advanced/cre proxy/calamaris/bin qos/bin red remote snort time tripwire/report \
 			updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
 	    wakeonlan wireless xtaccess ; do \
 	        mkdir -p $(CONFIG_ROOT)/$$i; \
@@ -68,7 +68,7 @@ $(TARGET) :
 	    extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings\
 	    isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
 	    portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
-	    ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+	    ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
 	    qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
 	    vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
 	        touch $(CONFIG_ROOT)/$$i; \
diff --git a/lfs/pakfire b/lfs/pakfire
index cfd4258d59..3dcde8b576 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -53,7 +53,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP)
 	-mkdir -p /opt/pakfire/{cache,db/{meta,lists,rootfiles},etc,lib,logs,tmp}
 	cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
-	cp -vf $(DIR_SRC)/src/pakfire/pakfire.conf $(DIR_APP)/etc/
+	mv -vf $(DIR_APP)/pakfire.conf $(DIR_APP)/etc/
 	chown root.root $(DIR_APP) -R
 	chmod 755 $(DIR_APP)/pakfire
 	-cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 8a00c7c5ed..75d7fd6ad2 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 	require "/opt/pakfire/lib/functions.pl";
 	
@@ -78,5 +78,6 @@
 	
 	
 	} elsif ("$ARGV[0]" eq "update") {
-	
+		&Pakfire::getmirrors();
+		&Pakfire::dbgetlist();
 	}
diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index e3f02869d7..973cbe92a7 100644
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -2,7 +2,7 @@
 
 package Conf;
 
-$version = "2.0b1";
+$version = "2.0alpha1";
 
 $mainserver = "pakfire.ipfire.org";