This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 748aa8f286a351a1c6c241dc52dbeeac8263934d (commit) via 3ef520b247756c03ec430c997a047e94f0101bcf (commit) via 2f905cc44d4ce656060af982eed5582753d15d5e (commit) via 83d3e0798e6aefc0ab6530a77db3166b7d19bb8a (commit) via c87aca414987fb4bfd703bb97f02f83859a0f7c3 (commit) via 282f072bad6cd15097ed3c7b2f2d37a77403734c (commit) via 84def3fd2b0677f305cc9b61f47ddee3d484a7db (commit) via 5283b400ef21b782e59b6b7493571fcb7c5f6e44 (commit) from 8dee77e017be1bd5f8afb5a3052306354492b1f3 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 748aa8f286a351a1c6c241dc52dbeeac8263934d Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 7 16:07:32 2021 +0200
gperf: Update to 3.1
- Update from 3.0.4 to 3.1 - Update of rootfile not required - Update of gperf to 3.1 required libcap to be at version 2.49 libcap-2.25 failed to build with gperf-3.1 - Changelog is too long to include here Full details can be found in the ChangeLog file in the source tarball
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3ef520b247756c03ec430c997a047e94f0101bcf Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 14:06:14 2021 +0000
Drop python-lzma
This comes with the default distribution for quite some time
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2f905cc44d4ce656060af982eed5582753d15d5e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 14:02:22 2021 +0000
Drop python-progressbar
This was a dependency of Pakfire 3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 83d3e0798e6aefc0ab6530a77db3166b7d19bb8a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 14:00:38 2021 +0000
Drop pycurl
This was used by urlgrabber
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c87aca414987fb4bfd703bb97f02f83859a0f7c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 14:00:06 2021 +0000
Drop urlgrabber
This was only used by Pakfire 3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 282f072bad6cd15097ed3c7b2f2d37a77403734c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 13:56:47 2021 +0000
Drop gpgme
This was only used by Pakfire 3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 84def3fd2b0677f305cc9b61f47ddee3d484a7db Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 13:55:45 2021 +0000
Drop pygpgme
This was only used as a dependency for pakfire 3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5283b400ef21b782e59b6b7493571fcb7c5f6e44 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 7 13:53:36 2021 +0000
Drop pakfire3
This version is outdated and not usable on IPFire 2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/pakfire3 | 1 - config/rootfiles/packages/gpgme | 18 ---- config/rootfiles/packages/pakfire3 | 116 --------------------- config/rootfiles/packages/pycurl | 53 ---------- config/rootfiles/packages/pygpgme | 7 -- config/rootfiles/packages/python-lzma | 5 - config/rootfiles/packages/python-progressbar | 3 - config/rootfiles/packages/urlgrabber | 18 ---- lfs/gperf | 4 +- lfs/gpgme | 85 --------------- lfs/pakfire3 | 89 ---------------- lfs/pycurl | 86 --------------- lfs/pygpgme | 82 --------------- lfs/python-lzma | 87 ---------------- lfs/python-progressbar | 82 --------------- lfs/urlgrabber | 82 --------------- make.sh | 7 -- ...d-inst_size-column-when-creating-new-data.patch | 24 ----- src/patches/pakfire3-changes-for-ipfire2.diff | 35 ------- .../python-pycurl-fix-do_curl_reset-refcount.patch | 24 ----- 20 files changed, 2 insertions(+), 906 deletions(-) delete mode 100644 config/backup/includes/pakfire3 delete mode 100644 config/rootfiles/packages/gpgme delete mode 100644 config/rootfiles/packages/pakfire3 delete mode 100644 config/rootfiles/packages/pycurl delete mode 100644 config/rootfiles/packages/pygpgme delete mode 100644 config/rootfiles/packages/python-lzma delete mode 100644 config/rootfiles/packages/python-progressbar delete mode 100644 config/rootfiles/packages/urlgrabber delete mode 100644 lfs/gpgme delete mode 100644 lfs/pakfire3 delete mode 100644 lfs/pycurl delete mode 100644 lfs/pygpgme delete mode 100644 lfs/python-lzma delete mode 100644 lfs/python-progressbar delete mode 100644 lfs/urlgrabber delete mode 100644 src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch delete mode 100644 src/patches/pakfire3-changes-for-ipfire2.diff delete mode 100644 src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
Difference in files: diff --git a/config/backup/includes/pakfire3 b/config/backup/includes/pakfire3 deleted file mode 100644 index 404e92c74..000000000 --- a/config/backup/includes/pakfire3 +++ /dev/null @@ -1 +0,0 @@ -/etc/pakfire diff --git a/config/rootfiles/packages/gpgme b/config/rootfiles/packages/gpgme deleted file mode 100644 index 2a035231d..000000000 --- a/config/rootfiles/packages/gpgme +++ /dev/null @@ -1,18 +0,0 @@ -usr/bin/gpgme-config -#usr/include/gpgme.h -#usr/lib/libgpgme-pthread.la -usr/lib/libgpgme-pthread.so -usr/lib/libgpgme-pthread.so.11 -usr/lib/libgpgme-pthread.so.11.8.1 -#usr/lib/libgpgme.la -usr/lib/libgpgme.so -usr/lib/libgpgme.so.11 -usr/lib/libgpgme.so.11.8.1 -#usr/share/aclocal/gpgme.m4 -usr/share/common-lisp/source/gpgme -usr/share/common-lisp/source/gpgme/gpgme-package.lisp -usr/share/common-lisp/source/gpgme/gpgme.asd -usr/share/common-lisp/source/gpgme/gpgme.lisp -#usr/share/info/gpgme.info -#usr/share/info/gpgme.info-1 -#usr/share/info/gpgme.info-2 diff --git a/config/rootfiles/packages/pakfire3 b/config/rootfiles/packages/pakfire3 deleted file mode 100644 index da902d5c0..000000000 --- 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/config/rootfiles/packages/pycurl b/config/rootfiles/packages/pycurl deleted file mode 100644 index ddbe58511..000000000 --- a/config/rootfiles/packages/pycurl +++ /dev/null @@ -1,53 +0,0 @@ -usr/lib/python2.7/site-packages/curl -usr/lib/python2.7/site-packages/curl/__init__.py -usr/lib/python2.7/site-packages/curl/__init__.pyc -#usr/lib/python2.7/site-packages/pycurl-7.19.0-py2.7.egg-info -usr/lib/python2.7/site-packages/pycurl.so -#usr/share/doc/pycurl -#usr/share/doc/pycurl/COPYING -#usr/share/doc/pycurl/COPYING2 -#usr/share/doc/pycurl/ChangeLog -#usr/share/doc/pycurl/INSTALL -#usr/share/doc/pycurl/README -#usr/share/doc/pycurl/TODO -#usr/share/doc/pycurl/examples -#usr/share/doc/pycurl/examples/basicfirst.py -#usr/share/doc/pycurl/examples/file_upload.py -#usr/share/doc/pycurl/examples/linksys.py -#usr/share/doc/pycurl/examples/retriever-multi.py -#usr/share/doc/pycurl/examples/retriever.py -#usr/share/doc/pycurl/examples/sfquery.py -#usr/share/doc/pycurl/examples/xmlrpc_curl.py -#usr/share/doc/pycurl/html -#usr/share/doc/pycurl/html/callbacks.html -#usr/share/doc/pycurl/html/curlmultiobject.html -#usr/share/doc/pycurl/html/curlobject.html -#usr/share/doc/pycurl/html/curlshareobject.html -#usr/share/doc/pycurl/html/pycurl.html -#usr/share/doc/pycurl/tests -#usr/share/doc/pycurl/tests/test.py -#usr/share/doc/pycurl/tests/test_cb.py -#usr/share/doc/pycurl/tests/test_debug.py -#usr/share/doc/pycurl/tests/test_ftp.py -#usr/share/doc/pycurl/tests/test_getinfo.py -#usr/share/doc/pycurl/tests/test_gtk.py -#usr/share/doc/pycurl/tests/test_internals.py -#usr/share/doc/pycurl/tests/test_memleak.py -#usr/share/doc/pycurl/tests/test_multi.py -#usr/share/doc/pycurl/tests/test_multi2.py -#usr/share/doc/pycurl/tests/test_multi3.py -#usr/share/doc/pycurl/tests/test_multi4.py -#usr/share/doc/pycurl/tests/test_multi5.py -#usr/share/doc/pycurl/tests/test_multi6.py -#usr/share/doc/pycurl/tests/test_multi_socket.py -#usr/share/doc/pycurl/tests/test_multi_socket_select.py -#usr/share/doc/pycurl/tests/test_multi_timer.py -#usr/share/doc/pycurl/tests/test_multi_vs_thread.py -#usr/share/doc/pycurl/tests/test_post.py -#usr/share/doc/pycurl/tests/test_post2.py -#usr/share/doc/pycurl/tests/test_post3.py -#usr/share/doc/pycurl/tests/test_share.py -#usr/share/doc/pycurl/tests/test_socketopen.py -#usr/share/doc/pycurl/tests/test_stringio.py -#usr/share/doc/pycurl/tests/test_xmlrpc.py -#usr/share/doc/pycurl/tests/util.py diff --git a/config/rootfiles/packages/pygpgme b/config/rootfiles/packages/pygpgme deleted file mode 100644 index 83ffaf839..000000000 --- a/config/rootfiles/packages/pygpgme +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python2.7/site-packages/gpgme -usr/lib/python2.7/site-packages/gpgme/__init__.py -usr/lib/python2.7/site-packages/gpgme/__init__.pyc -usr/lib/python2.7/site-packages/gpgme/_gpgme.so -usr/lib/python2.7/site-packages/gpgme/editutil.py -usr/lib/python2.7/site-packages/gpgme/editutil.pyc -#usr/lib/python2.7/site-packages/pygpgme-0.3-py2.7.egg-info diff --git a/config/rootfiles/packages/python-lzma b/config/rootfiles/packages/python-lzma deleted file mode 100644 index 21f647e54..000000000 --- a/config/rootfiles/packages/python-lzma +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/python2.7/site-packages/liblzma.py -usr/lib/python2.7/site-packages/liblzma.pyc -usr/lib/python2.7/site-packages/lzma.py -usr/lib/python2.7/site-packages/lzma.pyc -usr/lib/python2.7/site-packages/lzma.so diff --git a/config/rootfiles/packages/python-progressbar b/config/rootfiles/packages/python-progressbar deleted file mode 100644 index 453f51db7..000000000 --- a/config/rootfiles/packages/python-progressbar +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/python2.7/site-packages/progressbar-2.2-py2.7.egg-info -usr/lib/python2.7/site-packages/progressbar.py -usr/lib/python2.7/site-packages/progressbar.pyc diff --git a/config/rootfiles/packages/urlgrabber b/config/rootfiles/packages/urlgrabber deleted file mode 100644 index a98c7b14f..000000000 --- a/config/rootfiles/packages/urlgrabber +++ /dev/null @@ -1,18 +0,0 @@ -usr/bin/urlgrabber -usr/lib/python2.7/site-packages/urlgrabber -#usr/lib/python2.7/site-packages/urlgrabber-3.9.1-py2.7.egg-info -usr/lib/python2.7/site-packages/urlgrabber/__init__.py -usr/lib/python2.7/site-packages/urlgrabber/__init__.pyc -usr/lib/python2.7/site-packages/urlgrabber/byterange.py -usr/lib/python2.7/site-packages/urlgrabber/byterange.pyc -usr/lib/python2.7/site-packages/urlgrabber/grabber.py -usr/lib/python2.7/site-packages/urlgrabber/grabber.pyc -usr/lib/python2.7/site-packages/urlgrabber/mirror.py -usr/lib/python2.7/site-packages/urlgrabber/mirror.pyc -usr/lib/python2.7/site-packages/urlgrabber/progress.py -usr/lib/python2.7/site-packages/urlgrabber/progress.pyc -#usr/share/doc/urlgrabber-3.9.1 -#usr/share/doc/urlgrabber-3.9.1/ChangeLog -#usr/share/doc/urlgrabber-3.9.1/LICENSE -#usr/share/doc/urlgrabber-3.9.1/README -#usr/share/doc/urlgrabber-3.9.1/TODO diff --git a/lfs/gperf b/lfs/gperf index 6a8cd38ee..ef2156ae3 100644 --- a/lfs/gperf +++ b/lfs/gperf @@ -24,7 +24,7 @@
include Config
-VER = 3.0.4 +VER = 3.1
THISAPP = gperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -39,7 +39,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c1f1db32fb6598d6a93e6e88796a8632 +$(DL_FILE)_MD5 = 9e251c0a618ad0824b51117d5d9db87e
install : $(TARGET)
diff --git a/lfs/gpgme b/lfs/gpgme deleted file mode 100644 index a6056fc8e..000000000 --- a/lfs/gpgme +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.3.2 - -THISAPP = gpgme-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = gpgme -PAK_VER = 2 - -DEPS = libassuan - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 326fe97077141713f0930aa87949a287 - -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 jxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/pakfire3 b/lfs/pakfire3 deleted file mode 100644 index 2380be3fa..000000000 --- a/lfs/pakfire3 +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# 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/lfs/pycurl b/lfs/pycurl deleted file mode 100644 index 4733c4cd5..000000000 --- a/lfs/pycurl +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 7.19.0 - -THISAPP = pycurl-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = pycurl -PAK_VER = 2 - -DEPS = - -CFLAGS += -DHAVE_CURL_OPENSSL - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 919d58fe37e69fe87ce4534d8b6a1c7b - -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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/python-pycurl-no-static-libs.patch - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/pygpgme b/lfs/pygpgme deleted file mode 100644 index 6700735eb..000000000 --- a/lfs/pygpgme +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.3 - -THISAPP = pygpgme-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = pygpgme -PAK_VER = 1 - -DEPS = gpgme - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = d38355af73f0352cde3d410b25f34fd0 - -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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python-lzma b/lfs/python-lzma deleted file mode 100644 index 7ac21d89d..000000000 --- a/lfs/python-lzma +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.5.3 - -THISAPP = pyliblzma-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-lzma -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 500f61116ee1ab4063b49c121786863a - -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 jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - # unzip the egg because it won't work without - cd /usr/lib/python2.7/site-packages && \ - unzip pyliblzma-$(VER)-py2.7-linux-*.egg - rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-*.egg - rm -rf /usr/lib/python2.7/site-packages/EGG-INFO - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python-progressbar b/lfs/python-progressbar deleted file mode 100644 index b40d8e466..000000000 --- a/lfs/python-progressbar +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.2 - -THISAPP = progressbar-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-progressbar -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 8ea4e2c17a8ec9e7d153767c5f2a7b28 - -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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/urlgrabber b/lfs/urlgrabber deleted file mode 100644 index ab0a0b68c..000000000 --- a/lfs/urlgrabber +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# 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 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 3.9.1 - -THISAPP = urlgrabber-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -PROG = urlgrabber -PAK_VER = 1 -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 00c8359bf71062d0946bacea521f80b4 - -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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && /usr/bin/python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0c124ac81..997caa92c 100755 --- a/make.sh +++ b/make.sh @@ -1510,8 +1510,6 @@ buildipfire() { lfsmake2 iw lfsmake2 wpa_supplicant lfsmake2 hostapd - lfsmake2 pycurl - lfsmake2 urlgrabber lfsmake2 syslinux lfsmake2 tftpd lfsmake2 cpufrequtils @@ -1559,8 +1557,6 @@ buildipfire() { lfsmake2 crda lfsmake2 libsolv lfsmake2 python-distutils-extra - lfsmake2 python-lzma - lfsmake2 python-progressbar lfsmake2 ddns lfsmake2 python3-setuptools-scm lfsmake2 python3-six @@ -1586,9 +1582,6 @@ buildipfire() { lfsmake2 fping lfsmake2 telnet 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 f366f216d..000000000 --- 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 michael.tremer@ipfire.org -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 e0f476a95..000000000 --- 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 diff --git a/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch deleted file mode 100644 index 7e20b15c2..000000000 --- a/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/pycurl.c -+++ a/src/pycurl.c -@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self) - } - } - -+ Py_INCREF(Py_None); - return Py_None; - } - ---- a/tests/test_internals.py -+++ a/tests/test_internals.py -@@ -245,6 +245,11 @@ if 1 and gc: - if opts.verbose >= 1: - print "Tracked objects:", len(gc.get_objects()) - -+if 1: -+ # Ensure that the refcounting error in "reset" is fixed: -+ for i in xrange(100000): -+ c = Curl() -+ c.reset() - - # /*********************************************************************** - # // done
hooks/post-receive -- IPFire 2.x development tree