Core Update 165: Ship vpnmain.cgi

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

diff --git a/lfs/pakfire b/lfs/pakfire
index cc9eac82937cb69453240017293b9d7cc235a8d2..c60d17a4dc78f44570b930d2e2279b4b69c3be20 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,17 +30,19 @@ THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+PAKFIRE_VERSION = $(VERSION)-$(BUILD_ARCH)
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 install : $(TARGET)
 
-check : 
+check :
 
-download : 
+download :
 
-md5 : 
+md5 :
 
 ###############################################################################
 # Installation Details
@@ -48,17 +50,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
-       
-       -cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
-       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