X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpakfire;h=48e84145cdc0d9111482514c63b74984f5b84c9a;hb=19465bc094bd7ede505b68f67e6e9919267efd60;hp=6ebd6e1b15ba279a74135227ab1bd35cc518ed3e;hpb=06209efc9d051484027a6fd17f31a7a7408737eb;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/pakfire b/lfs/pakfire
index 6ebd6e1b15..48e84145cd 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,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
 ###############################################################################
@@ -50,12 +54,17 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP)
-	-mkdir -p /opt/pakfire/{cache,db/{meta,lists,rootfiles,installed},etc,lib,logs,tmp}
+	-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
+	ln -sf ../../var/log/pakfire /opt/pakfire/logs
+	ln -sf ../../var/cache/pakfire /opt/pakfire/cache
 	@$(POSTBUILD)