[packages/poldek] up to 0.40.0
mis
mis at pld-linux.org
Mon Dec 30 14:41:41 CET 2019
commit d7961a02e8cf9753c6fd7b08b4e023d99deec669
Author: mis <mis at pld-linux.org>
Date: Mon Dec 30 14:41:34 2019 +0100
up to 0.40.0
WTERMSIG.patch | 11 --
openssl.patch | 266 -------------------------------------------
poldek-ext-down-enable.patch | 25 ----
poldek-multiproto.patch | 12 --
poldek-notzdata.patch | 12 --
poldek-size-type.patch | 26 -----
poldek.spec | 30 ++---
python-fix.patch | 66 -----------
8 files changed, 10 insertions(+), 438 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index e4189a1..a2ae865 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -34,18 +34,18 @@
%define ver_rpm 5.4.10
%endif
-%define rel 14
+%define rel 1
Summary: RPM packages management helper tool
Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz
Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM
Name: poldek
-Version: 0.32.2
+Version: 0.40.0
Release: %{rel}%{?with_snap:.%{SNAP}}
License: GPL v2
Group: Applications/System
#Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
-Source0: https://launchpad.net/poldek/0.32/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: 60b964723880569531f88f084cd3ae65
+Source0: https://launchpad.net/poldek/master/head/+download/%{name}-%{version}.tar.xz
+# Source0-md5: c88f3ada99799d0e1af78aeda428d041
Source1: %{name}.conf
Source2: %{name}-multilib.conf
Source3: %{name}-config.sh
@@ -60,16 +60,10 @@ Source11: %{name}-archive.conf
Source100: %{name}-snap.conf
Source101: %{name}-multilib-snap.conf
Source102: %{name}-debuginfo-snap.conf
-Patch0: %{name}-size-type.patch
-Patch1: %{name}-config.patch
-Patch2: pm-hooks.patch
-Patch3: WTERMSIG.patch
-Patch4: %{name}-multiproto.patch
-Patch5: python-fix.patch
-Patch6: poldek-ext-down-enable.patch
-Patch7: multiple-options.patch
-Patch8: openssl.patch
-Patch9: poldek-notzdata.patch
+Patch0: %{name}-config.patch
+Patch1: pm-hooks.patch
+Patch2: poldek-ext-down-enable.patch
+Patch3: multiple-options.patch
URL: http://poldek.pld-linux.org/
BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
BuildRequires: autoconf
@@ -93,6 +87,7 @@ BuildRequires: tar >= 1:1.22
BuildRequires: xmlto
BuildRequires: xz
BuildRequires: zlib-devel
+BuildRequires: zstd-devel
%if %{with static}
BuildRequires: %{db_pkg}-static >= %{ver_db}-%{ver_db_rel}
BuildRequires: bzip2-static
@@ -105,6 +100,7 @@ BuildRequires: popt-static
BuildRequires: readline-static
BuildRequires: rpm-static
BuildRequires: zlib-static
+BuildRequires: zstd-static
%endif
Requires(triggerpostun): awk
Requires(triggerpostun): sed >= 4.0
@@ -234,12 +230,6 @@ Moduły języka Python dla poldka.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%{__rm} m4/libtool.m4 m4/lt*.m4
diff --git a/WTERMSIG.patch b/WTERMSIG.patch
deleted file mode 100644
index 5249c17..0000000
--- a/WTERMSIG.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- poldek-0.32.2/vfile/vopen3.c~ 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/vfile/vopen3.c 2016-10-18 08:14:09.638596140 +0200
-@@ -347,7 +347,7 @@
- } else if (WIFSIGNALED(status)) {
- #ifdef HAVE_STRSIGNAL
- st_seterr(st, _("%s terminated by signal %d (%s)"),
-- st->cmd, WTERMSIG(status), strsignal(WTERMSIG(st)));
-+ st->cmd, WTERMSIG(status), strsignal(WTERMSIG(status)));
- #else
- st_seterr(st, _("%s terminated by signal %d"),
- st->cmd, WTERMSIG(status));
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index 559704d..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,266 +0,0 @@
---- poldek-0.32.2/tndb/read.c~ 2016-01-30 17:59:59.000000000 +0100
-+++ poldek-0.32.2/tndb/read.c 2018-09-14 18:35:56.516594794 +0200
-@@ -53,20 +53,22 @@ static
- int md5(FILE *stream, unsigned char *md, unsigned *md_size)
- {
- unsigned char buf[8*1024];
-- EVP_MD_CTX ctx;
-+ EVP_MD_CTX *ctx;
- unsigned n, nn = 0;
-
-
- n_assert(md_size && *md_size);
-
-- EVP_DigestInit(&ctx, EVP_md5());
-+ ctx = EVP_MD_CTX_create();
-+ if (!EVP_DigestInit(ctx, EVP_md5()))
-+ return 0;
-
- while ((n = fread(buf, 1, sizeof(buf), stream)) > 0) {
-- EVP_DigestUpdate(&ctx, buf, n);
-+ EVP_DigestUpdate(ctx, buf, n);
- nn += n;
- }
-
-- EVP_DigestFinal(&ctx, buf, &n);
-+ EVP_DigestFinal(ctx, buf, &n);
-
- if (n > *md_size) {
- *md = '\0';
-@@ -75,7 +77,9 @@ int md5(FILE *stream, unsigned char *md,
- memcpy(md, buf, n);
- *md_size = n;
- }
--
-+
-+ EVP_MD_CTX_destroy(ctx);
-+
- return *md_size;
- }
-
---- poldek-0.32.2/tndb/tndb.c~ 2016-01-30 17:59:59.000000000 +0100
-+++ poldek-0.32.2/tndb/tndb.c 2018-09-14 18:40:57.805504132 +0200
-@@ -85,13 +85,13 @@ char *tndb_bin2hex_s(const unsigned char
- //static
- void tndb_sign_init(struct tndb_sign *sign)
- {
-- EVP_MD_CTX ctx;
-+ EVP_MD_CTX *ctx;
-
- memset(sign, 0, sizeof(*sign));
-
-- EVP_DigestInit(&ctx, EVP_sha1());
-- sign->ctx = n_malloc(sizeof(ctx));
-- memcpy(sign->ctx, &ctx, sizeof(ctx));
-+ ctx = EVP_MD_CTX_create();
-+ EVP_DigestInit(ctx, EVP_sha1());
-+ sign->ctx = ctx;
- //printf("%p %p >> INIT\n", sign, sign->ctx);
- }
-
-@@ -122,8 +122,8 @@ void tndb_sign_final(struct tndb_sign *s
- *sign->md = '\0';
- else
- memcpy(sign->md, buf, n);
--
-- free(sign->ctx);
-+
-+ EVP_MD_CTX_destroy((EVP_MD_CTX *)sign->ctx);
- sign->ctx = NULL;
-
- }
---- poldek-0.32.2/pkgdir/pdir/digest.c~ 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/pkgdir/pdir/digest.c 2018-09-14 18:52:42.783229333 +0200
-@@ -195,12 +195,13 @@ int hdr_digest(tn_stream *st, unsigned c
- int nread, len, endvhdr_found = 0;
- unsigned char buf[256];
- char line[4096];
-- EVP_MD_CTX ctx;
-+ EVP_MD_CTX *ctx;
- unsigned n;
-
-
- n_assert(md_size && *md_size);
-- EVP_DigestInit(&ctx, EVP_sha1());
-+ ctx = EVP_MD_CTX_create();
-+ EVP_DigestInit(ctx, EVP_sha1());
-
- len = strlen(pdir_tag_endvarhdr);
- n = 0;
-@@ -208,7 +209,7 @@ int hdr_digest(tn_stream *st, unsigned c
- while ((nread = n_stream_gets(st, line, sizeof(line))) > 0) {
- char *p = line;
-
-- EVP_DigestUpdate(&ctx, line, nread);
-+ EVP_DigestUpdate(ctx, line, nread);
- if (_ctx)
- EVP_DigestUpdate(_ctx, line, nread);
- n++;
-@@ -228,7 +229,8 @@ int hdr_digest(tn_stream *st, unsigned c
- break;
- }
-
-- EVP_DigestFinal(&ctx, buf, &n);
-+ EVP_DigestFinal(ctx, buf, &n);
-+ EVP_MD_CTX_destroy(ctx);
-
- if (!endvhdr_found) {
- logn(LOGERR, _("broken index"));
-@@ -251,22 +253,24 @@ static
- int digest(tn_stream *st, unsigned char *md, int *md_size, EVP_MD_CTX *_ctx)
- {
- unsigned char buf[16*1024];
-- EVP_MD_CTX ctx;
-+ EVP_MD_CTX *ctx;
- int n, nn = 0;
-
-
- n_assert(md_size && *md_size);
-
-- EVP_DigestInit(&ctx, EVP_sha1());
-+ ctx = EVP_MD_CTX_create();
-+ EVP_DigestInit(ctx, EVP_sha1());
-
- while ((n = n_stream_read(st, buf, sizeof(buf))) > 0) {
-- EVP_DigestUpdate(&ctx, buf, n);
-+ EVP_DigestUpdate(ctx, buf, n);
- if (_ctx)
- EVP_DigestUpdate(_ctx, buf, n);
- nn += n;
- }
-
-- EVP_DigestFinal(&ctx, buf, &n);
-+ EVP_DigestFinal(ctx, buf, &n);
-+ EVP_MD_CTX_destroy(ctx);
-
- if (n > *md_size) {
- *md = '\0';
-@@ -288,7 +292,7 @@ int pdir_digest_calc(struct pdir_digest
- unsigned char mdh[64], mdd[64], md[64], mdhex[64];
- int mdh_size = sizeof(mdh), mdd_size = sizeof(mdd),
- md_size = sizeof(md);
-- EVP_MD_CTX ctx, *ctxp;
-+ EVP_MD_CTX *ctx, *ctxp;
- int is_err = 0, n;
-
-
-@@ -300,27 +304,34 @@ int pdir_digest_calc(struct pdir_digest
-
- ctxp = NULL;
- if (flags & CALC_MD) {
-- EVP_DigestInit(&ctx, EVP_sha1());
-- ctxp = &ctx;
-+ ctx = EVP_MD_CTX_create();
-+ EVP_DigestInit(ctx, EVP_sha1());
-+ ctxp = ctx;
- }
-
- if ((flags & CALC_MDD) == 0) { /* no separate header && body digests */
- if (!digest(st, mdd, &mdd_size, ctxp)) {
-- if (ctxp)
-- EVP_DigestFinal(&ctx, md, &md_size);
-+ if (ctxp) {
-+ EVP_DigestFinal(ctx, md, &md_size);
-+ EVP_MD_CTX_destroy(ctx);
-+ }
- return 0;
- }
-
- } else {
- if (!hdr_digest(st, mdh, &mdh_size, ctxp)) {
-- if (ctxp)
-- EVP_DigestFinal(&ctx, md, &md_size);
-+ if (ctxp) {
-+ EVP_DigestFinal(ctx, md, &md_size);
-+ EVP_MD_CTX_destroy(ctx);
-+ }
- return 0;
- }
-
- if (!digest(st, mdd, &mdd_size, ctxp)) {
-- if (ctxp)
-- EVP_DigestFinal(&ctx, md, &md_size);
-+ if (ctxp) {
-+ EVP_DigestFinal(ctx, md, &md_size);
-+ EVP_MD_CTX_destroy(ctx);
-+ }
- return 0;
- }
- }
-@@ -336,7 +347,8 @@ int pdir_digest_calc(struct pdir_digest
- }
-
- if (ctxp) {
-- EVP_DigestFinal(&ctx, md, &md_size);
-+ EVP_DigestFinal(ctx, md, &md_size);
-+ EVP_MD_CTX_destroy(ctx);
- n = bin2hex(mdhex, sizeof(mdhex), md, md_size);
- if (n != PDIR_DIGEST_SIZE)
- is_err = 1;
---- poldek-0.32.2/pkgdir/pndir/digest.c~ 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/pkgdir/pndir/digest.c 2018-09-14 18:53:40.521640846 +0200
-@@ -241,12 +241,13 @@ int pndir_digest_calc_pkgs(struct pndir_
- int pndir_digest_calc(struct pndir_digest *pdg, tn_array *keys)
- {
- unsigned char md[256];
-- EVP_MD_CTX ctx;
-+ EVP_MD_CTX *ctx;
- int i, n, nn = 0;
-
-
-- EVP_DigestInit(&ctx, EVP_sha1());
-- EVP_DigestUpdate(&ctx, "md", strlen("md"));
-+ ctx = EVP_MD_CTX_create();
-+ EVP_DigestInit(ctx, EVP_sha1());
-+ EVP_DigestUpdate(ctx, "md", strlen("md"));
-
- if (keys && n_array_size(keys)) {
- n_array_sort(keys);
-@@ -254,11 +255,12 @@ int pndir_digest_calc(struct pndir_diges
- for (i=0; i < n_array_size(keys); i++) {
- char *key = n_array_nth(keys, i);
- DBGF("key = %s\n", key);
-- EVP_DigestUpdate(&ctx, key, strlen(key));
-+ EVP_DigestUpdate(ctx, key, strlen(key));
- }
- }
-
-- EVP_DigestFinal(&ctx, md, &n);
-+ EVP_DigestFinal(ctx, md, &n);
-+ EVP_MD_CTX_destroy(ctx);
-
- if (n > (int)sizeof(pdg->md))
- return 0;
---- poldek-0.32.2/misc.c~ 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/misc.c 2018-09-14 18:55:01.440752874 +0200
-@@ -80,23 +80,25 @@ static
- int mdigest(FILE *stream, unsigned char *md, unsigned *md_size, int digest_type)
- {
- unsigned char buf[8*1024];
-- EVP_MD_CTX ctx;
-+ EVP_MD_CTX *ctx;
- unsigned n, nn = 0;
-
-
- n_assert(md_size && *md_size);
-
-+ ctx = EVP_MD_CTX_create();
- if (digest_type == DIGEST_MD5)
-- EVP_DigestInit(&ctx, EVP_md5());
-+ EVP_DigestInit(ctx, EVP_md5());
- else
-- EVP_DigestInit(&ctx, EVP_sha1());
-+ EVP_DigestInit(ctx, EVP_sha1());
-
- while ((n = fread(buf, 1, sizeof(buf), stream)) > 0) {
-- EVP_DigestUpdate(&ctx, buf, n);
-+ EVP_DigestUpdate(ctx, buf, n);
- nn += n;
- }
-
-- EVP_DigestFinal(&ctx, buf, &n);
-+ EVP_DigestFinal(ctx, buf, &n);
-+ EVP_MD_CTX_destroy(ctx);
-
- if (n > *md_size) {
- *md = '\0';
diff --git a/poldek-ext-down-enable.patch b/poldek-ext-down-enable.patch
index e65b79a..002e991 100644
--- a/poldek-ext-down-enable.patch
+++ b/poldek-ext-down-enable.patch
@@ -10,28 +10,3 @@ diff -urN poldek-0.32.2.org/conf/poldek.conf poldek-0.32.2/conf/poldek.conf
[global]
-diff -urN poldek-0.32.2.org/vfile/fetch.c poldek-0.32.2/vfile/fetch.c
---- poldek-0.32.2.org/vfile/fetch.c 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/vfile/fetch.c 2017-11-23 09:38:01.044442691 +0100
-@@ -163,7 +163,9 @@
- if (vf_find_external_command(p, PATH_MAX, path, NULL))
- path = p;
- else {
-- vf_logerr("%s: command not found\n", path);
-+ if (*vfile_verbose > 1) {
-+ vf_logerr("%s: command not found\n", path);
-+ }
- return NULL;
- }
- }
-@@ -494,7 +496,9 @@
- }
-
- if ((ftch = ffetcher_new(name, protocols, cmd)) == NULL) {
-- vf_logerr("External downloader '%s': registration failed\n", cmd);
-+ if (*vfile_verbose > 1) {
-+ vf_logerr("External downloader '%s': registration failed\n", cmd);
-+ }
-
- } else {
- if (ffetchers == NULL) {
diff --git a/poldek-multiproto.patch b/poldek-multiproto.patch
deleted file mode 100644
index 3565009..0000000
--- a/poldek-multiproto.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur -x .svn -x .git -x .bzr -x CVS -ruNp poldek-0.32.2.orig/conf_sections.c poldek-0.32.2/conf_sections.c
---- poldek-0.32.2.orig/conf_sections.c 2016-01-30 18:21:06.000000000 +0100
-+++ poldek-0.32.2/conf_sections.c 2017-03-31 20:34:21.955834004 +0200
-@@ -362,7 +362,7 @@ static struct poldek_conf_tag fetcher_ta
- 0, { 0 } },
-
- { "proto",
-- CONF_TYPE_STRING | CONF_TYPE_F_REQUIRED,
-+ CONF_TYPE_STRING | CONF_TYPE_F_REQUIRED | CONF_TYPE_F_LIST,
- NULL,
- 0, { 0 } },
-
diff --git a/poldek-notzdata.patch b/poldek-notzdata.patch
deleted file mode 100644
index 24ac681..0000000
--- a/poldek-notzdata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- poldek-0.32.2/vfile/vfff/ftp.c~ 2016-01-30 14:05:57.000000000 +0000
-+++ poldek-0.32.2/vfile/vfff/ftp.c 2019-10-02 08:50:20.832444438 +0000
-@@ -654,6 +654,9 @@
- tm.tm_year -= 1900;
- tm.tm_mon -= 1;
- ts = mktime(&tm);
-+ /* We can't do much if time can't be represented */
-+ if (ts < 0)
-+ return 0;
- }
- return ts;
- }
diff --git a/poldek-size-type.patch b/poldek-size-type.patch
deleted file mode 100644
index 78440af..0000000
--- a/poldek-size-type.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- poldek-0.30-cvs20080820.23/trurlib/include/trurl/narray.h~ 2007-07-12 12:56:59.000000000 +0200
-+++ poldek-0.30-cvs20080820.23/trurlib/include/trurl/narray.h 2009-01-30 13:21:51.685019394 +0100
-@@ -97,10 +97,10 @@
- ...
- */
-
--int n_array_size(const tn_array *arr);
-+size_t n_array_size(const tn_array *arr);
- #ifndef SWIG
- #define n_array_size(arr) n_array_size_inl(arr)
--static inline int n_array_size_inl(const tn_array *arr)
-+static inline size_t n_array_size_inl(const tn_array *arr)
- {
- return arr->items;
- }
---- poldek-0.30-cvs20080820.23/trurlib/n_array_nth.c~ 2004-02-23 00:00:34.000000000 +0100
-+++ poldek-0.30-cvs20080820.23/trurlib/n_array_nth.c 2009-01-30 13:25:53.541072782 +0100
-@@ -20,7 +20,7 @@
- }
-
- #undef n_array_size
--int n_array_size(const tn_array *arr)
-+size_t n_array_size(const tn_array *arr)
- {
- return arr->items;
- }
diff --git a/python-fix.patch b/python-fix.patch
deleted file mode 100644
index f5b4c3f..0000000
--- a/python-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-In file included from /usr/include/stdint.h:27:0,
- from /usr/lib64/gcc/x86_64-pld-linux/6.3.0/include/stdint.h:9,
- from local_stdint.c:2,
- from wrap_poldekmod.c:3066:
-/usr/include/bits/types.h:143:34: error: conflicting types for ‘__fsid_t’
- __STD_TYPE __FSID_T_TYPE __fsid_t; /* Type of file system IDs. */
- ^~~~~~~~
-In file included from /usr/include/stdio.h:36:0,
- from /usr/include/python2.7/Python.h:33,
- from wrap_poldekmod.c:149:
-/usr/include/bits/types.h:143:26: note: previous declaration of ‘__fsid_t’ was here
- __STD_TYPE __FSID_T_TYPE __fsid_t; /* Type of file system IDs. */
- ^~~~~~~~
-make: *** [Makefile:487: wrap_poldekmod.lo] Error 1
-
---- poldek-0.32.2/python/Makefile.am~ 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/python/Makefile.am 2017-04-16 14:28:51.269840377 +0200
-@@ -3,8 +3,8 @@
- py_prefix = $(shell python -c "import sys; print sys.prefix")
- py_incdir = $(py_prefix)/include/python$(py_ver)
-
--EXTRA_DIST = poldekmod.i local_stdint.c pyldek.py run.sh
--CLEANFILES = wrap_* poldekmod.py local_stdint.h
-+EXTRA_DIST = poldekmod.i pyldek.py run.sh
-+CLEANFILES = wrap_* poldekmod.py
-
- AM_CPPFLAGS = @TRURL_INCLUDE@ @TNDB_INCLUDE@ -I$(top_srcdir) -I$(py_incdir) -I.
-
-@@ -21,16 +21,12 @@
- CFLAGS=
- CPPFLAGS += -DSWIG -DPOCLIDEK_ITSELF
-
--poldekmod.i: local_stdint.h
--
--#install-exec-hook:
--# $(mkinstalldirs) "$(DESTDIR)$(py_sitedir)"
-+install-exec-hook:
-+ $(mkinstalldirs) "$(DESTDIR)$(py_sitedir)"
-+ $(install_sh) .libs/_poldekmod.so "$(DESTDIR)$(py_sitedir)"
-
- poldekmod.py: wrap_poldekmod.c
-
--local_stdint.h: local_stdint.c
-- $(CPP) $< > $@
--
- #wrap_poldekmod.c: poldekmod.i
- # $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I/usr/include -o $@ $<
-
---- poldek-0.32.2/python/poldekmod.i~ 2016-01-30 15:05:57.000000000 +0100
-+++ poldek-0.32.2/python/poldekmod.i 2017-04-16 14:27:50.169060494 +0200
-@@ -1,7 +1,6 @@
- %module poldekmod
-
- %{
--#include "local_stdint.h"
- #include "poldek.h"
- #include "trurl/narray.h"
- #include "trurl/nhash.h"
-@@ -32,7 +32,6 @@
- %}
-
- %include exception.i
--%include "local_stdint.h"
- %include "trurl/narray.h"
- %include "capreq.h"
- %include "pkg.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/d7961a02e8cf9753c6fd7b08b4e023d99deec669
More information about the pld-cvs-commit
mailing list