From: Michael Tremer Date: Wed, 7 Apr 2021 13:53:36 +0000 (+0000) Subject: Drop pakfire3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5283b400ef21b782e59b6b7493571fcb7c5f6e44;p=people%2Fstevee%2Fipfire-2.x.git Drop pakfire3 This version is outdated and not usable on IPFire 2 Signed-off-by: Michael Tremer --- diff --git a/config/backup/includes/pakfire3 b/config/backup/includes/pakfire3 deleted file mode 100644 index 404e92c74a..0000000000 --- a/config/backup/includes/pakfire3 +++ /dev/null @@ -1 +0,0 @@ -/etc/pakfire diff --git a/config/rootfiles/packages/pakfire3 b/config/rootfiles/packages/pakfire3 deleted file mode 100644 index da902d5c01..0000000000 --- a/config/rootfiles/packages/pakfire3 +++ /dev/null @@ -1,116 +0,0 @@ -#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/perl.macro -usr/lib/pakfire/macros/python.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/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/cli.py -usr/lib/python2.7/site-packages/pakfire/client.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/daemon.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/packages/tar.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/shell.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/transport.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/095-directory-layout -usr/lib/quality-agent/qa-include -var/ipfire/backup/addons/includes/pakfire3 diff --git a/lfs/pakfire3 b/lfs/pakfire3 deleted file mode 100644 index 2380be3fa4..0000000000 --- a/lfs/pakfire3 +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# 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 this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.9.25 - -THISAPP = pakfire-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = https://source.ipfire.org/releases/pakfire/ -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = pakfire3 -PAK_VER = 5 - -DEPS = libsolv pycurl pygpgme python-progressbar python-xattr urlgrabber - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 8932670f3ac7c7ab1892b719a078de31 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @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) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch - 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 0c124ac81a..4849ec097d 100755 --- a/make.sh +++ b/make.sh @@ -1588,7 +1588,6 @@ buildipfire() { lfsmake2 xinetd lfsmake2 gpgme lfsmake2 pygpgme - lfsmake2 pakfire3 lfsmake2 stress lfsmake2 libstatgrab lfsmake2 sarg diff --git a/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch b/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch deleted file mode 100644 index f366f216d4..0000000000 --- a/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0d6d6fd2b89c609a6f8daff225c6c98b54a041cc Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Mon, 4 Mar 2013 17:18:52 +0100 -Subject: [PATCH] database: Add inst_size column when creating new databases. - ---- - python/pakfire/repository/database.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/python/pakfire/repository/database.py b/python/pakfire/repository/database.py -index fc8a1a9..d8751e9 100644 ---- a/python/pakfire/repository/database.py -+++ b/python/pakfire/repository/database.py -@@ -190,6 +190,7 @@ class DatabaseLocal(Database): - groups TEXT, - filename TEXT, - size INTEGER, -+ inst_size INTEGER, - hash1 TEXT, - provides TEXT, - requires TEXT, --- -1.7.11.7 - diff --git a/src/patches/pakfire3-changes-for-ipfire2.diff b/src/patches/pakfire3-changes-for-ipfire2.diff deleted file mode 100644 index e0f476a951..0000000000 --- a/src/patches/pakfire3-changes-for-ipfire2.diff +++ /dev/null @@ -1,35 +0,0 @@ -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