update Tor to 0.3.5.8

[people/pmueller/ipfire-2.x.git] / lfs / pakfire

diff --git a/lfs/pakfire b/lfs/pakfire
index b55c89f285df7f14d3e1ad46db4815ab3e5a01a9..48e84145cdc0d9111482514c63b74984f5b84c9a 100644 (file)
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -30,6 +30,12 @@ THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(BUILD_ARCH)" "i586"
+       PAKFIRE_VERSION = $(VERSION)
+else
+       PAKFIRE_VERSION = $(VERSION)-$(BUILD_ARCH)
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,16 +54,14 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP)
        -mkdir -p /opt/pakfire/{db/{meta,lists,rootfiles,installed,core},etc,lib,tmp} \
                /var/log/pakfire /var/cache/pakfire
        cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
-       mv -vf $(DIR_APP)/pakfire.conf $(DIR_APP)/etc/
+       sed -e "s/@VERSION@/$(PAKFIRE_VERSION)/g" \
+               < $(DIR_APP)/pakfire.conf \
+               > $(DIR_APP)/etc/pakfire.conf
        chown root.root $(DIR_APP) -R
        chmod 755 $(DIR_APP)/pakfire
-       
-       ln -sf ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update
-       
        touch /var/log/pakfire.log
        chown root.nobody /var/log/pakfire.log
        chmod 664 /var/log/pakfire.log