pakfire3: New package.

diff --git a/config/backup/includes/pakfire3 b/config/backup/includes/pakfire3
new file mode 100644 (file)
index 0000000..404e92c
--- /dev/null
+++ b/config/backup/includes/pakfire3
@@ -0,0 +1 @@
+/etc/pakfire

diff --git a/config/rootfiles/packages/pakfire3 b/config/rootfiles/packages/pakfire3
new file mode 100644 (file)
index 0000000..effabc8
--- /dev/null
+++ b/config/rootfiles/packages/pakfire3
@@ -0,0 +1,118 @@
+#etc/pakfire
+etc/pakfire/builder.conf
+etc/pakfire/client.conf
+etc/pakfire/daemon.conf
+etc/pakfire/distros
+etc/pakfire/distros/ipfire3.conf
+etc/pakfire/general.conf
+etc/pakfire/repos
+usr/bin/pakfire-builder
+usr/bin/pakfire-client
+usr/bin/pakfire-daemon
+usr/bin/pakfire-key
+usr/bin/pakfire-server
+usr/lib/libpakfire_preload.so
+usr/lib/pakfire
+usr/lib/pakfire/builder
+usr/lib/pakfire/chroot-shell
+usr/lib/pakfire/cleanup
+usr/lib/pakfire/compress-man-pages
+usr/lib/pakfire/extract-debuginfo
+usr/lib/pakfire/find-common
+usr/lib/pakfire/find-prerequires
+usr/lib/pakfire/find-provides
+usr/lib/pakfire/find-requires
+usr/lib/pakfire/functions-common
+usr/lib/pakfire/functions-constants
+usr/lib/pakfire/functions-directories
+usr/lib/pakfire/functions-files
+usr/lib/pakfire/functions-lists
+usr/lib/pakfire/functions-logging
+usr/lib/pakfire/macros
+usr/lib/pakfire/macros/arch.macro
+usr/lib/pakfire/macros/build.macro
+usr/lib/pakfire/macros/cflags.macro
+usr/lib/pakfire/macros/constants.macro
+usr/lib/pakfire/macros/package-default.macro
+usr/lib/pakfire/macros/quality-agent.macro
+usr/lib/pakfire/macros/systemd.macro
+usr/lib/pakfire/macros/templates.macro
+usr/lib/pakfire/pakfire-multicall.py
+usr/lib/pakfire/patch
+usr/lib/pakfire/perl.prov
+usr/lib/pakfire/perl.req
+usr/lib/pakfire/py-compile
+usr/lib/pakfire/quality-agent
+usr/lib/pakfire/remove-static-libs
+usr/lib/python2.7/site-packages/pakfire
+usr/lib/python2.7/site-packages/pakfire/__init__.py
+usr/lib/python2.7/site-packages/pakfire/__version__.py
+usr/lib/python2.7/site-packages/pakfire/_lzma.so
+usr/lib/python2.7/site-packages/pakfire/_pakfire.so
+usr/lib/python2.7/site-packages/pakfire/actions.py
+usr/lib/python2.7/site-packages/pakfire/api.py
+usr/lib/python2.7/site-packages/pakfire/base.py
+usr/lib/python2.7/site-packages/pakfire/builder.py
+usr/lib/python2.7/site-packages/pakfire/cgroup.py
+usr/lib/python2.7/site-packages/pakfire/chroot.py
+usr/lib/python2.7/site-packages/pakfire/cli.py
+usr/lib/python2.7/site-packages/pakfire/client
+usr/lib/python2.7/site-packages/pakfire/client/__init__.py
+usr/lib/python2.7/site-packages/pakfire/client/base.py
+usr/lib/python2.7/site-packages/pakfire/client/builder.py
+usr/lib/python2.7/site-packages/pakfire/client/test.py
+usr/lib/python2.7/site-packages/pakfire/client/transport.py
+usr/lib/python2.7/site-packages/pakfire/compress.py
+usr/lib/python2.7/site-packages/pakfire/config.py
+usr/lib/python2.7/site-packages/pakfire/constants.py
+usr/lib/python2.7/site-packages/pakfire/distro.py
+usr/lib/python2.7/site-packages/pakfire/downloader.py
+usr/lib/python2.7/site-packages/pakfire/errors.py
+usr/lib/python2.7/site-packages/pakfire/filelist.py
+usr/lib/python2.7/site-packages/pakfire/i18n.py
+usr/lib/python2.7/site-packages/pakfire/keyring.py
+usr/lib/python2.7/site-packages/pakfire/logger.py
+usr/lib/python2.7/site-packages/pakfire/lzma.py
+usr/lib/python2.7/site-packages/pakfire/packages
+usr/lib/python2.7/site-packages/pakfire/packages/__init__.py
+usr/lib/python2.7/site-packages/pakfire/packages/base.py
+usr/lib/python2.7/site-packages/pakfire/packages/file.py
+usr/lib/python2.7/site-packages/pakfire/packages/installed.py
+usr/lib/python2.7/site-packages/pakfire/packages/lexer.py
+usr/lib/python2.7/site-packages/pakfire/packages/make.py
+usr/lib/python2.7/site-packages/pakfire/packages/packager.py
+usr/lib/python2.7/site-packages/pakfire/packages/solv.py
+usr/lib/python2.7/site-packages/pakfire/repository
+usr/lib/python2.7/site-packages/pakfire/repository/__init__.py
+usr/lib/python2.7/site-packages/pakfire/repository/base.py
+usr/lib/python2.7/site-packages/pakfire/repository/cache.py
+usr/lib/python2.7/site-packages/pakfire/repository/database.py
+usr/lib/python2.7/site-packages/pakfire/repository/index.py
+usr/lib/python2.7/site-packages/pakfire/repository/local.py
+usr/lib/python2.7/site-packages/pakfire/repository/metadata.py
+usr/lib/python2.7/site-packages/pakfire/repository/remote.py
+usr/lib/python2.7/site-packages/pakfire/repository/system.py
+usr/lib/python2.7/site-packages/pakfire/satsolver.py
+usr/lib/python2.7/site-packages/pakfire/server.py
+usr/lib/python2.7/site-packages/pakfire/system.py
+usr/lib/python2.7/site-packages/pakfire/transaction.py
+usr/lib/python2.7/site-packages/pakfire/util.py
+usr/lib/quality-agent
+usr/lib/quality-agent/001-include-files
+usr/lib/quality-agent/001-remove-info-files
+usr/lib/quality-agent/001-unsafe-files
+usr/lib/quality-agent/002-bad-symlinks
+usr/lib/quality-agent/003-libs-location
+usr/lib/quality-agent/050-canary
+usr/lib/quality-agent/050-execstacks
+usr/lib/quality-agent/050-invalid-interpreters
+usr/lib/quality-agent/050-libs-needed
+usr/lib/quality-agent/050-libs-soname
+usr/lib/quality-agent/050-libs-x86_64
+usr/lib/quality-agent/050-nx
+usr/lib/quality-agent/050-relro
+usr/lib/quality-agent/050-rpaths
+usr/lib/quality-agent/090-python-hardlinks
+usr/lib/quality-agent/095-directory-layout
+usr/lib/quality-agent/qa-include
+var/ipfire/backup/addons/includes/pakfire3

diff --git a/lfs/pakfire3-deps b/lfs/pakfire3
similarity index 59%
rename from lfs/pakfire3-deps
rename to lfs/pakfire3
index 1403a8101821f6b775ea024e8c8eb412653fdc1c..0dd8c53533c08144224941009633534b257c2426 100644 (file)
--- a/lfs/pakfire3-deps
+++ b/lfs/pakfire3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2010  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        #
@@ -24,26 +24,53 @@
 
 include Config
 
-VER       = 0
+VER        = 0.9.23
 
-THISAPP    = pakfire3-deps
+THISAPP    = pakfire-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://source.ipfire.org/releases/pakfire/
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG      = pakfire3-deps
-PAK_VER    = 2
-DEPS       = "intltool git make libsatsolver pycurl python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
+PROG      = pakfire3
+PAK_VER    = 1
+DEPS       = \
+       libsatsolver \
+       pycurl \
+       python-progressbar \
+       python-xattr \
+       sqlite \
+       urlgrabber
 
 ###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 10e6dd51c917faa8bd2e7435495de211
 
 install : $(TARGET)
 
-check :
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-download :
+md5 : $(subst %,%_MD5,$(objects))
 
-md5 :
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
 
-dist: 
-       @$(PAK)
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
 
 ###############################################################################
 # Installation Details
@@ -51,6 +78,13 @@ dist:
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       #Create a file for the package. Because empty rootfile will break.
-       echo "# Pakfire 3 deps is installed" > /var/ipfire/pakfire3-deps
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire3-changes-for-ipfire2.diff
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       rm -vf /usr/bin/pakfire3
+
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/pakfire3 \
+               /var/ipfire/backup/addons/includes/pakfire3
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index d8de79263a0656c86da3f0697805e3355bc92ee9..b4e22f3b4080d2dbc4a95c3cb9b7bad589e3212e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -749,7 +749,6 @@ buildipfire() {
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
-  ipfiremake pakfire3-deps
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
@@ -763,6 +762,7 @@ buildipfire() {
   ipfiremake libassuan
   ipfiremake gpgme
   ipfiremake pygpgme
+  ipfiremake pakfire3
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild

diff --git a/src/patches/pakfire3-changes-for-ipfire2.diff b/src/patches/pakfire3-changes-for-ipfire2.diff
new file mode 100644 (file)
index 0000000..e0f476a
--- /dev/null
+++ b/src/patches/pakfire3-changes-for-ipfire2.diff
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index 0361af6..0bcb1bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ 
+ include Makeconfig
+ 
+-SUBDIRS = po python tools tools/fake-environ
++SUBDIRS = python tools tools/fake-environ
+ 
+ all: build
+ 
+diff --git a/tools/Makefile b/tools/Makefile
+index d7cbf70..499beb4 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -12,7 +12,7 @@ LIBS_POPT = -lpopt
+ 
+ SCRIPTS = $(SCRIPTS_BIN) $(SCRIPTS_SHELL)
+ SCRIPTS_BIN   = \
+-      debugedit
++      #debugedit
+ 
+ SCRIPTS_SHELL = \
+       chroot-shell \
+@@ -50,7 +50,7 @@ install: $(SCRIPTS)
+ 
+       # Create script aliases.
+       -mkdir -pv $(DESTDIR)/usr/bin
+-      ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire
++      ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire3
+       ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire-builder
+       ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire-client
+       ln -svf ../..$(SCRIPT_DIR)/pakfire-multicall.py $(DESTDIR)/usr/bin/pakfire-daemon