rpms/createrepo_c
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import createrepo_c-0.17.7-4.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-03-29 10:20:05 -04:00 committed by Stepan Oksanichenko
parent b67d5cbad5
commit 5113c2b946
6 changed files with 513 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.createrepo_c.metadata
View File

@ -1 +1 @@
9feb9bf8e6a9812a08ef8156c3ccc1c4dac90b7a SOURCES/createrepo_c-0.17.2.tar.gz 5f3e45a79255654c7315c8667197fd562fd2ff5c SOURCES/createrepo_c-0.17.7.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/createrepo_c-0.17.2.tar.gz SOURCES/createrepo_c-0.17.7.tar.gz

25
SOURCES/0001-Fix-cr_compress_file_with_stat-Memory-leak.patch
View File

@ -1,25 +0,0 @@
From 1ec1e767e4a48bc2c1d09b52da9e749352f8d925 Mon Sep 17 00:00:00 2001
From: Jaroslav Rohel <jrohel@redhat.com>
Date: Thu, 6 May 2021 19:09:19 +0200
Subject: [PATCH] Fix: cr_compress_file_with_stat: Memory leak
---
src/misc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/misc.c b/src/misc.c
index e5350ac..59c04e6 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -503,6 +503,8 @@ cr_compress_file_with_stat(const char *src,
if (!orig) {
ret = tmp_err->code;
g_propagate_prefixed_error(err, tmp_err, "Cannot open %s: ", src);
+ if (dst != in_dst)
+ g_free(dst);
return ret;
}
--
libgit2 1.0.1

384
SOURCES/0001-Preserve-changed-API-for-cr_compress_file_with_stat-RhBug1973588.patch Normal file
View File

@ -0,0 +1,384 @@
From 6bcfaac228236ac3c609d014cbd23c3bd645bf18 Mon Sep 17 00:00:00 2001
From: Aleš Matěj <amatej@redhat.com>
Date: Thu, 9 Sep 2021 08:31:03 +0200
Subject: [PATCH] Preserve changed API for cr_compress_file_with_stat (RhBug:1973588)
In order to be compatible in rhel8 we want to preserve the old API and
behavior.
Keep the fixed version as cr_compress_file_with_stat_v2 only for rhel8
https://bugzilla.redhat.com/show_bug.cgi?id=1973588
With fixed memory leak of `tmp_err`, reported here:
https://bugzilla.redhat.com/show_bug.cgi?id=2005781
---
src/misc.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
src/misc.h | 42 ++++++++++++++++++++++++++++++++++++++++--
src/modifyrepo_shared.c | 4 ++--
src/python/misc-py.c | 2 +-
src/threads.c | 14 +++++++-------
tests/test_misc.c | 34 +++++++++++++++++-----------------
6 files changed, 205 insertions(+), 30 deletions(-)
diff --git a/src/misc.c b/src/misc.c
index 4bd9f4c..c4b2cb3 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -446,7 +446,7 @@ cr_copy_file(const char *src, const char *in_dst, GError **err)
int
cr_compress_file_with_stat(const char *src,
- const char *in_dst,
+ char **in_dst,
cr_CompressionType compression,
cr_ContentStat *stat,
const char *zck_dict_dir,
@@ -458,6 +458,143 @@ cr_compress_file_with_stat(const char *src,
char buf[BUFFER_SIZE];
CR_FILE *orig = NULL;
CR_FILE *new = NULL;
+ gchar *dst = (gchar *) *in_dst;
+ GError *tmp_err = NULL;
+
+ assert(src);
+ assert(!err || *err == NULL);
+
+ const char *c_suffix = cr_compression_suffix(compression);
+
+ // Src must be a file NOT a directory
+ if (!g_file_test(src, G_FILE_TEST_IS_REGULAR)) {
+ g_debug("%s: Source (%s) must be a regular file!", __func__, src);
+ g_set_error(err, ERR_DOMAIN, CRE_NOFILE,
+ "Not a regular file: %s", src);
+ return CRE_NOFILE;
+ }
+
+ if (!dst) {
+ // If destination is NULL, use src + compression suffix
+ *in_dst = g_strconcat(src,
+ c_suffix,
+ NULL);
+ } else if (g_str_has_suffix(dst, "/")) {
+ // If destination is dir use filename from src + compression suffix
+ *in_dst = g_strconcat(dst,
+ cr_get_filename(src),
+ c_suffix,
+ NULL);
+ } else if (c_suffix && !g_str_has_suffix(dst, c_suffix)) {
+ cr_CompressionType old_type = cr_detect_compression(src, &tmp_err);
+ if (tmp_err) {
+ g_debug("%s: Unable to detect compression type of %s", __func__, src);
+ g_clear_error(&tmp_err);
+ } else if (old_type != CR_CW_NO_COMPRESSION) {
+ _cleanup_free_ gchar *tmp_file = g_strndup(dst, strlen(dst) - strlen(cr_compression_suffix(old_type)));
+ *in_dst = g_strconcat(tmp_file,
+ c_suffix,
+ NULL);
+ }
+ }
+ if (dst != *in_dst && dst)
+ g_free(dst);
+ dst = (gchar *) *in_dst;
+
+ int mode = CR_CW_AUTO_DETECT_COMPRESSION;
+
+ orig = cr_open(src,
+ CR_CW_MODE_READ,
+ mode,
+ &tmp_err);
+ if (!orig) {
+ ret = tmp_err->code;
+ g_propagate_prefixed_error(err, tmp_err, "Cannot open %s: ", src);
+ return ret;
+ }
+
+ _cleanup_free_ gchar *dict = NULL;
+ size_t dict_size = 0;
+ if (compression == CR_CW_ZCK_COMPRESSION && zck_dict_dir) {
+ /* Find zdict */
+ _cleanup_free_ gchar *file_basename = NULL;
+ if (dst) {
+ _cleanup_free_ gchar *dict_base = NULL;
+ if (g_str_has_suffix(dst, ".zck"))
+ dict_base = g_strndup(dst, strlen(dst)-4);
+ else
+ dict_base = g_strdup(dst);
+ file_basename = g_path_get_basename(dict_base);
+ } else {
+ file_basename = g_path_get_basename(src);
+ }
+ _cleanup_free_ gchar *dict_file = cr_get_dict_file(zck_dict_dir, file_basename);
+
+ /* Read dictionary from file */
+ if (dict_file && !g_file_get_contents(dict_file, &dict,
+ &dict_size, &tmp_err)) {
+ g_set_error(err, ERR_DOMAIN, CRE_IO,
+ "Error reading zchunk dict %s: %s",
+ dict_file, tmp_err->message);
+ g_clear_error(&tmp_err);
+ ret = CRE_IO;
+ goto compress_file_cleanup;
+ }
+ }
+
+ new = cr_sopen(dst, CR_CW_MODE_WRITE, compression, stat, &tmp_err);
+ if (tmp_err) {
+ g_debug("%s: Cannot open destination file %s", __func__, dst);
+ g_propagate_prefixed_error(err, tmp_err, "Cannot open %s: ", dst);
+ ret = CRE_IO;
+ goto compress_file_cleanup;
+ }
+ if (compression == CR_CW_ZCK_COMPRESSION) {
+ if (dict && cr_set_dict(new, dict, dict_size, &tmp_err) != CRE_OK) {
+ ret = tmp_err->code;
+ g_propagate_prefixed_error(err, tmp_err, "Unable to set zdict for %s: ", dst);
+ goto compress_file_cleanup;
+ }
+ if (zck_auto_chunk && cr_set_autochunk(new, TRUE, &tmp_err) != CRE_OK) {
+ ret = tmp_err->code;
+ g_propagate_prefixed_error(err, tmp_err, "Unable to set auto-chunking for %s: ", dst);
+ goto compress_file_cleanup;
+ }
+ }
+ while ((readed = cr_read(orig, buf, BUFFER_SIZE, &tmp_err)) > 0) {
+ cr_write(new, buf, readed, &tmp_err);
+ if (tmp_err) {
+ ret = tmp_err->code;
+ g_propagate_prefixed_error(err, tmp_err, "Unable to write to %s: ", dst);
+ goto compress_file_cleanup;
+ }
+ }
+
+compress_file_cleanup:
+
+ if (orig)
+ cr_close(orig, NULL);
+
+ if (new)
+ cr_close(new, NULL);
+
+ return ret;
+}
+
+int
+cr_compress_file_with_stat_v2(const char *src,
+ const char *in_dst,
+ cr_CompressionType compression,
+ cr_ContentStat *stat,
+ const char *zck_dict_dir,
+ gboolean zck_auto_chunk,
+ GError **err)
+{
+ int ret = CRE_OK;
+ int readed;
+ char buf[BUFFER_SIZE];
+ CR_FILE *orig = NULL;
+ CR_FILE *new = NULL;
gchar *dst = (gchar *) in_dst;
GError *tmp_err = NULL;
diff --git a/src/misc.h b/src/misc.h
index 60f1a0f..528ccc3 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -184,9 +184,24 @@ gboolean cr_copy_file(const char *src,
cr_compress_file_with_stat(SRC, DST, COMTYPE, NULL, ZCK_DICT_DIR, \
ZCK_AUTO_CHUNK, ERR)
+/** Compress file. This function is temporary and present
+ * only in rhel 8, it will be removed in future versions.
+ * @param SRC source filename
+ * @param DST destination (If dst is dir, filename of src +
+ * compression suffix is used.
+ * If dst is NULL, src + compression suffix is used)
+ * @param COMTYPE type of compression
+ * @param ZCK_DICT_DIR Location of zchunk zdicts (if zchunk is enabled)
+ * @param ZCK_AUTO_CHUNK Whether zchunk file should be auto-chunked
+ * @param ERR GError **
+ * @return cr_Error return code
+ */
+#define cr_compress_file_v2(SRC, DST, COMTYPE, ZCK_DICT_DIR, ZCK_AUTO_CHUNK, ERR) \
+ cr_compress_file_with_stat_v2(SRC, DST, COMTYPE, NULL, ZCK_DICT_DIR, \
+ ZCK_AUTO_CHUNK, ERR)
/** Compress file.
* @param src source filename
- * @param dst destination (If dst is dir, filename of src +
+ * @param dst pointer to destination (If dst is dir, filename of src +
* compression suffix is used.
* If dst is NULL, src + compression suffix is used)
* @param comtype type of compression
@@ -197,13 +212,36 @@ gboolean cr_copy_file(const char *src,
* @return cr_Error return code
*/
int cr_compress_file_with_stat(const char *src,
- const char *dst,
+ char **dst,
cr_CompressionType comtype,
cr_ContentStat *stat,
const char *zck_dict_dir,
gboolean zck_auto_chunk,
GError **err);
+/** Compress file with stat versions 2. This function is temporary and present
+ * only in rhel 8, it will be removed in future versions.
+ * It is a compatibility function that preserves the API and behavior of
+ * cr_compress_file_with_stat from createrepo_c-0.12.0.
+ * @param src source filename
+ * @param dst destination (If dst is dir, filename of src +
+ * compression suffix is used.
+ * If dst is NULL, src + compression suffix is used)
+ * @param comtype type of compression
+ * @param stat pointer to cr_ContentStat or NULL
+ * @param zck_dict_dir Location of zchunk zdicts (if zchunk is enabled)
+ * @param zck_auto_chunk Whether zchunk file should be auto-chunked
+ * @param err GError **
+ * @return cr_Error return code
+ */
+int cr_compress_file_with_stat_v2(const char *src,
+ const char *dst,
+ cr_CompressionType comtype,
+ cr_ContentStat *stat,
+ const char *zck_dict_dir,
+ gboolean zck_auto_chunk,
+ GError **err);
+
/** Decompress file.
* @param SRC source filename
* @param DST destination (If dst is dir, filename of src without
diff --git a/src/modifyrepo_shared.c b/src/modifyrepo_shared.c
index 4e59660..8cf246d 100644
--- a/src/modifyrepo_shared.c
+++ b/src/modifyrepo_shared.c
@@ -120,8 +120,8 @@ cr_write_file(gchar *repopath, cr_ModifyRepoTask *task,
g_debug("%s: Copy & compress operation %s -> %s",
__func__, src_fn, dst_fn);
- if (cr_compress_file(src_fn, dst_fn, compress_type,
- task->zck_dict_dir, TRUE, err) != CRE_OK) {
+ if (cr_compress_file_v2(src_fn, dst_fn, compress_type,
+ task->zck_dict_dir, TRUE, err) != CRE_OK) {
g_debug("%s: Copy & compress operation failed", __func__);
return NULL;
}
diff --git a/src/python/misc-py.c b/src/python/misc-py.c
index 6a7871e..cc28448 100644
--- a/src/python/misc-py.c
+++ b/src/python/misc-py.c
@@ -49,7 +49,7 @@ py_compress_file_with_stat(G_GNUC_UNUSED PyObject *self, PyObject *args)
return NULL;
}
- cr_compress_file_with_stat(src, dst, type, contentstat, NULL, FALSE, &tmp_err);
+ cr_compress_file_with_stat_v2(src, dst, type, contentstat, NULL, FALSE, &tmp_err);
if (tmp_err) {
nice_exception(&tmp_err, NULL);
return NULL;
diff --git a/src/threads.c b/src/threads.c
index f0c3f93..b529d55 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -101,13 +101,13 @@ cr_compressing_thread(gpointer data, G_GNUC_UNUSED gpointer user_data)
cr_compression_suffix(task->type),
NULL);
- cr_compress_file_with_stat(task->src,
- task->dst,
- task->type,
- task->stat,
- task->zck_dict_dir,
- task->zck_auto_chunk,
- &tmp_err);
+ cr_compress_file_with_stat_v2(task->src,
+ task->dst,
+ task->type,
+ task->stat,
+ task->zck_dict_dir,
+ task->zck_auto_chunk,
+ &tmp_err);
if (tmp_err) {
// Error encountered
diff --git a/tests/test_misc.c b/tests/test_misc.c
index 6614809..1acccb7 100644
--- a/tests/test_misc.c
+++ b/tests/test_misc.c
@@ -548,8 +548,8 @@ compressfile_test_text_file(Copyfiletest *copyfiletest,
GError *tmp_err = NULL;
g_assert(!g_file_test(copyfiletest->dst_file, G_FILE_TEST_EXISTS));
- ret = cr_compress_file(TEST_TEXT_FILE, copyfiletest->dst_file,
- CR_CW_GZ_COMPRESSION, NULL, FALSE, &tmp_err);
+ ret = cr_compress_file_v2(TEST_TEXT_FILE, copyfiletest->dst_file,
+ CR_CW_GZ_COMPRESSION, NULL, FALSE, &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
@@ -574,9 +574,9 @@ compressfile_with_stat_test_text_file(Copyfiletest *copyfiletest,
g_assert(!tmp_err);
g_assert(!g_file_test(copyfiletest->dst_file, G_FILE_TEST_EXISTS));
- ret = cr_compress_file_with_stat(TEST_TEXT_FILE, copyfiletest->dst_file,
- CR_CW_GZ_COMPRESSION, stat, NULL, FALSE,
- &tmp_err);
+ ret = cr_compress_file_with_stat_v2(TEST_TEXT_FILE, copyfiletest->dst_file,
+ CR_CW_GZ_COMPRESSION, stat, NULL, FALSE,
+ &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
@@ -603,9 +603,9 @@ compressfile_with_stat_test_gz_file_gz_output(Copyfiletest *copyfiletest,
char * dst_full_name = g_strconcat(copyfiletest->dst_file, ".gz", NULL);
g_assert(!g_file_test(dst_full_name, G_FILE_TEST_EXISTS));
- ret = cr_compress_file_with_stat(TEST_TEXT_FILE_GZ, dst_full_name,
- CR_CW_GZ_COMPRESSION, stat, NULL, FALSE,
- &tmp_err);
+ ret = cr_compress_file_with_stat_v2(TEST_TEXT_FILE_GZ, dst_full_name,
+ CR_CW_GZ_COMPRESSION, stat, NULL, FALSE,
+ &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(dst_full_name, G_FILE_TEST_IS_REGULAR));
@@ -633,9 +633,9 @@ compressfile_test_gz_file_xz_output(Copyfiletest *copyfiletest,
char * dst_full_name = g_strconcat(copyfiletest->dst_file, ".xz", NULL);
g_assert(!g_file_test(dst_full_name, G_FILE_TEST_EXISTS));
- ret = cr_compress_file(TEST_TEXT_FILE_GZ, dst_full_name,
- CR_CW_XZ_COMPRESSION, NULL, FALSE,
- &tmp_err);
+ ret = cr_compress_file_v2(TEST_TEXT_FILE_GZ, dst_full_name,
+ CR_CW_XZ_COMPRESSION, NULL, FALSE,
+ &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(dst_full_name, G_FILE_TEST_IS_REGULAR));
@@ -660,9 +660,9 @@ compressfile_test_xz_file_gz_output(Copyfiletest *copyfiletest,
char * dst_full_name = g_strconcat(copyfiletest->dst_file, ".gz", NULL);
g_assert(!g_file_test(dst_full_name, G_FILE_TEST_EXISTS));
- ret = cr_compress_file(TEST_TEXT_FILE_XZ, dst_full_name,
- CR_CW_GZ_COMPRESSION, NULL, FALSE,
- &tmp_err);
+ ret = cr_compress_file_v2(TEST_TEXT_FILE_XZ, dst_full_name,
+ CR_CW_GZ_COMPRESSION, NULL, FALSE,
+ &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(dst_full_name, G_FILE_TEST_IS_REGULAR));
@@ -687,9 +687,9 @@ compressfile_test_sqlite_file_gz_output(Copyfiletest *copyfiletest,
char * dst_full_name = g_strconcat(copyfiletest->dst_file, ".gz", NULL);
g_assert(!g_file_test(dst_full_name, G_FILE_TEST_EXISTS));
- ret = cr_compress_file(TEST_SQLITE_FILE, dst_full_name,
- CR_CW_GZ_COMPRESSION, NULL, FALSE,
- &tmp_err);
+ ret = cr_compress_file_v2(TEST_SQLITE_FILE, dst_full_name,
+ CR_CW_GZ_COMPRESSION, NULL, FALSE,
+ &tmp_err);
g_assert(!tmp_err);
g_assert_cmpint(ret, ==, CRE_OK);
g_assert(g_file_test(dst_full_name, G_FILE_TEST_EXISTS));
--
libgit2 1.1.0

94
SOURCES/0002-Default---keep-all-metadata-to-TRUE-and-add---discard-additional-metadata.patch Normal file
View File

@ -0,0 +1,94 @@
From b5f425fec738c1de344f4f917d3614e9efb98e2b Mon Sep 17 00:00:00 2001
From: Aleš Matěj <amatej@redhat.com>
Date: Thu, 23 Sep 2021 08:30:47 +0200
Subject: [PATCH] Default --keep-all-metadata to TRUE and add --discard-additional-metadata
= changelog =
msg: Switch default of --keep-all-metadata to TRUE and add --discard-additional-metadata
type: enhancement
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1992209
---
doc/createrepo_c.8 | 7 +++++--
src/cmd_parser.c | 15 ++++++++++++---
src/cmd_parser.h | 1 +
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/doc/createrepo_c.8 b/doc/createrepo_c.8
index c9017c5..1a3e101 100644
--- a/doc/createrepo_c.8
+++ b/doc/createrepo_c.8
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH CREATEREPO_C 8 "2020-07-02" "" ""
+.TH CREATEREPO_C 8 "2021-09-23" "" ""
.SH NAME
createrepo_c \- Create rpm-md format (xml-rpm-metadata) repository
.
@@ -173,7 +173,10 @@ Generate zchunk files as well as the standard repodata.
Directory containing compression dictionaries for use by zchunk
.SS \-\-keep\-all\-metadata
.sp
-Keep all additional metadata (not primary, filelists and other xml or sqlite files, nor their compressed variants) from source repository during update.
+Keep all additional metadata (not primary, filelists and other xml or sqlite files, nor their compressed variants) from source repository during update (default).
+.SS \-\-discard\-additional\-metadata
+.sp
+Discard all additional metadata (not primary, filelists and other xml or sqlite files, nor their compressed variants) from source repository during update.
.SS \-\-compatibility
.sp
Enforce maximal compatibility with classical createrepo (Affects only: \-\-retain\-old\-md).
diff --git a/src/cmd_parser.c b/src/cmd_parser.c
index bbefa08..639d7e9 100644
--- a/src/cmd_parser.c
+++ b/src/cmd_parser.c
@@ -65,6 +65,8 @@ struct CmdOptions _cmd_options = {
.zck_compression = FALSE,
.zck_dict_dir = NULL,
.recycle_pkglist = FALSE,
+
+ .keep_all_metadata = TRUE,
};
@@ -168,6 +170,9 @@ static GOptionEntry cmd_entries[] =
#endif
{ "keep-all-metadata", 0, 0, G_OPTION_ARG_NONE, &(_cmd_options.keep_all_metadata),
"Keep all additional metadata (not primary, filelists and other xml or sqlite files, "
+ "nor their compressed variants) from source repository during update (default).", NULL },
+ { "discard-additional-metadata", 0, 0, G_OPTION_ARG_NONE, &(_cmd_options.discard_additional_metadata),
+ "Discard all additional metadata (not primary, filelists and other xml or sqlite files, "
"nor their compressed variants) from source repository during update.", NULL },
{ "compatibility", 0, 0, G_OPTION_ARG_NONE, &(_cmd_options.compatibility),
"Enforce maximal compatibility with classical createrepo (Affects only: --retain-old-md).", NULL },
@@ -510,9 +515,13 @@ check_arguments(struct CmdOptions *options,
x++;
}
- // Check keep-all-metadata
- if (options->keep_all_metadata && !options->update) {
- g_warning("--keep-all-metadata has no effect (--update is not used)");
+ if (options->discard_additional_metadata) {
+ options->keep_all_metadata = FALSE;
+ }
+
+ // Check discard-additional-metadata
+ if (options->discard_additional_metadata && !options->update) {
+ g_warning("--discard-additional-metadata has no effect (--update is not used)");
}
// Process --distro tags
diff --git a/src/cmd_parser.h b/src/cmd_parser.h
index 32bcf99..03cfcf0 100644
--- a/src/cmd_parser.h
+++ b/src/cmd_parser.h
@@ -77,6 +77,7 @@ struct CmdOptions {
char *zck_dict_dir; /*!< directory with zchunk dictionaries */
gboolean keep_all_metadata; /*!< keep groupfile and updateinfo from source
repo during update */
+ gboolean discard_additional_metadata; /*!< Inverse option to keep_all_metadata */
gboolean ignore_lock; /*!< Ignore existing .repodata/ - remove it,
create the new one (empty) to serve as
a lock and use a .repodata.date.pid for
--
libgit2 1.1.0

38
SPECS/createrepo_c.spec
View File

@ -10,26 +10,33 @@
%bcond_without drpm %bcond_without drpm
%endif %endif
%if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 29) %if 0%{?rhel}
%bcond_with zchunk %bcond_with zchunk
%else %else
%bcond_without zchunk %bcond_without zchunk
%endif %endif
%if (0%{?rhel} && 0%{?rhel} < 8) || (0%{?fedora} && 0%{?fedora} < 29) %if 0%{?rhel} && 0%{?rhel} < 8
%bcond_with libmodulemd %bcond_with libmodulemd
%else %else
%bcond_without libmodulemd %bcond_without libmodulemd
%endif %endif
%if 0%{?rhel} && 0%{?rhel} <= 8
%bcond_without legacy_hashes
%else
%bcond_with legacy_hashes
%endif
Summary: Creates a common metadata repository Summary: Creates a common metadata repository
Name: createrepo_c Name: createrepo_c
Version: 0.17.2 Version: 0.17.7
Release: 2%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://github.com/rpm-software-management/createrepo_c URL: https://github.com/rpm-software-management/createrepo_c
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch1: 0001-Fix-cr_compress_file_with_stat-Memory-leak.patch Patch1: 0001-Preserve-changed-API-for-cr_compress_file_with_stat-RhBug1973588.patch
Patch2: 0002-Default---keep-all-metadata-to-TRUE-and-add---discard-additional-metadata.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
@ -108,6 +115,7 @@ pushd build-py3
%cmake .. \ %cmake .. \
-DWITH_ZCHUNK=%{?with_zchunk:ON}%{!?with_zchunk:OFF} \ -DWITH_ZCHUNK=%{?with_zchunk:ON}%{!?with_zchunk:OFF} \
-DWITH_LIBMODULEMD=%{?with_libmodulemd:ON}%{!?with_libmodulemd:OFF} \ -DWITH_LIBMODULEMD=%{?with_libmodulemd:ON}%{!?with_libmodulemd:OFF} \
-DWITH_LEGACY_HASHES=%{?with_legacy_hashes:ON}%{!?with_legacy_hashes:OFF} \
-DENABLE_DRPM=%{?with_drpm:ON}%{!?with_drpm:OFF} -DENABLE_DRPM=%{?with_drpm:ON}%{!?with_drpm:OFF}
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
# Build C documentation # Build C documentation
@ -176,6 +184,26 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
%changelog %changelog
* Wed Feb 16 2022 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-4
- Switch default of --keep-all-metadata to TRUE and add --discard-additional-metadata (RhBug:1992209)
* Mon Nov 29 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-3
- Fix memory leak of `tmp_err` (RhBug:2005781)
* Mon Nov 15 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-2
- Build with legacy hashes (RhBug:2022271)
* Tue Nov 09 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-1
- Update to 0.17.7
- Remove insecure hashes SHA-1 and MD5 from the default build (RhBug:1935486)
- Fix error when updating repo with removed modules metadata
- Exit with status code 1 when loading of repo's metadata fails
- Fix memory leaks (RhBug:1998426)
- Fix valgrind warnings caused by subprocess calls
* Wed Sep 15 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-3
- Preserve changed API for cr_compress_file_with_stat (RhBug:1973588)
* Tue Jul 27 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-2 * Tue Jul 27 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-2
- Fix: cr_compress_file_with_stat: Memory leak - Fix: cr_compress_file_with_stat: Memory leak