.createrepo_c.metadata

@@ -1 +1 @@
-3e76ff79089aebf9a503bdb82d59dc148c218d0f SOURCES/createrepo_c-0.20.1.tar.gz
+5f3e45a79255654c7315c8667197fd562fd2ff5c SOURCES/createrepo_c-0.17.7.tar.gz

.gitignore

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

SOURCES/0001-Preserve-changed-API-for-cr_compress_file_with_stat-RhBug1973588.patch

@@ -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
+

SOURCES/0001-Test_compare_contents_instead_of_checksum-cleanup.patch

@@ -1,110 +0,0 @@
-From 3b69916685cd1dc1a64a59d9e1b90921de91e2d0 Mon Sep 17 00:00:00 2001
-From: Daniel Alley <dalley@redhat.com>
-Date: Fri, 13 Jan 2023 00:06:12 -0500
-Subject: [PATCH] Change test to compare contents instead of checksum
-
-Different implementations of the DEFLATE algorithm can produce different
-(but equally valid) gzip files. This can cause test failure if a
-different implementation (e.g. hardware acceleration) is used.
----
- tests/test_misc.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_misc.c b/tests/test_misc.c
-index 6614809..f8025cb 100644
---- a/tests/test_misc.c
-+++ b/tests/test_misc.c
-@@ -544,19 +544,20 @@ compressfile_test_text_file(Copyfiletest *copyfiletest,
-                             G_GNUC_UNUSED gconstpointer test_data)
- {
-     int ret;
--    char *checksum;
-     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);
-     g_assert(!tmp_err);
-     g_assert_cmpint(ret, ==, CRE_OK);
-     g_assert(g_file_test(copyfiletest->dst_file, G_FILE_TEST_IS_REGULAR));
--    checksum = cr_checksum_file(copyfiletest->dst_file, CR_CHECKSUM_SHA256, NULL);
--    g_assert_cmpstr(checksum, ==, "8909fde88a5747d800fd2562b0f22945f014aa7df64"
--                                  "cf1c15c7933ae54b72ab6");
--    g_free(checksum);
-+
-+    // assert content is readable after compression and decompression
-+    char buf[30];
-+    read_file(copyfiletest->dst_file, CR_CW_GZ_COMPRESSION, buf, 30);
-+    g_assert(g_strrstr(buf, "Lorem ipsum dolor sit amet"));
- }
- 
- 
--- 
-2.40.1
-
-
-From 7844b63d932f36084a927b3cc8900cc0971436f3 Mon Sep 17 00:00:00 2001
-From: Daniel Alley <dalley@redhat.com>
-Date: Fri, 13 Jan 2023 12:52:42 -0500
-Subject: [PATCH] Remove 11 year old polyfill
-
----
- src/compression_wrapper.c | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
-index 15e9e38..b23c345 100644
---- a/src/compression_wrapper.c
-+++ b/src/compression_wrapper.c
-@@ -86,11 +86,6 @@ LZMA_CHECK_SHA256
- #define XZ_DECODER_FLAGS        0
- #define XZ_BUFFER_SIZE          (1024*32)
- 
--#if ZLIB_VERNUM < 0x1240
--// XXX: Zlib has gzbuffer since 1.2.4
--#define gzbuffer(a,b) 0
--#endif
--
- cr_ContentStat *
- cr_contentstat_new(cr_ChecksumType type, GError **err)
- {
-@@ -1549,7 +1544,7 @@ cr_printf(GError **err, CR_FILE *cr_file, const char *format, ...)
-     return ret;
- }
- 
--ssize_t 
-+ssize_t
- cr_get_zchunk_with_index(CR_FILE *cr_file, ssize_t zchunk_index, char **copy_buf, GError **err)
- {
-     assert(cr_file);
--- 
-2.40.1
-
-
-From ad34359fbcaefb6fd5053a56b0472572ea2270b5 Mon Sep 17 00:00:00 2001
-From: Daniel Alley <dalley@redhat.com>
-Date: Fri, 13 Jan 2023 13:05:16 -0500
-Subject: [PATCH] Fix compile warning, off by one
-
-closes #337
----
- src/checksum.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/checksum.c b/src/checksum.c
-index ef420a1..1ae2a54 100644
---- a/src/checksum.c
-+++ b/src/checksum.c
-@@ -49,7 +49,7 @@ cr_checksum_type(const char *name)
-     if (len > MAX_CHECKSUM_NAME_LEN)
-         return CR_CHECKSUM_UNKNOWN;
- 
--    for (size_t x = 0; x <= len; x++)
-+    for (size_t x = 0; x < len; x++)
-         name_lower[x] = tolower(name[x]);
- 
-     if (!strncmp(name_lower, "sha", 3)) {
--- 
-2.40.1
-

SOURCES/0002-Default---keep-all-metadata-to-TRUE-and-add---discard-additional-metadata.patch

@@ -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
+

SPECS/createrepo_c.spec

@@ -1,5 +1,5 @@
 %global libmodulemd_version 2.3.0
-
+%{!?_licensedir:%global license %%doc}
 %define __cmake_in_source_build 1
 
 %global bash_completion %{_datadir}/bash-completion/completions/*
@@ -22,14 +22,22 @@
 %bcond_without libmodulemd
 %endif
 
+%if 0%{?rhel} && 0%{?rhel} <= 8
+%bcond_without legacy_hashes
+%else
+%bcond_with legacy_hashes
+%endif
+
 Summary:        Creates a common metadata repository
 Name:           createrepo_c
-Version:        0.20.1
+Version:        0.17.7
-Release:        2%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/createrepo_c
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch1:         0001-Test_compare_contents_instead_of_checksum-cleanup.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
+Patch3:         0003-Revert-added-API-for-parsing-main-metadata-together-RhBug2062299.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -108,6 +116,7 @@ pushd build-py3
   %cmake .. \
       -DWITH_ZCHUNK=%{?with_zchunk:ON}%{!?with_zchunk: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}
   make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
   # Build C documentation
@@ -176,39 +185,19 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
 %{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
 
 %changelog
-* Mon Jun 26 2023 Jaroslav Rohel <jrohel@redhat.com> - 0.20.1-2
+* Wed May 11 2022 Lukas Hrazky <lhrazky@redhat.com> - 0.17.7-6
-- Change test to compare contents instead of checksum, cleanup (RhBug:2130179)
+- Revert addition of new API for parsing main metadata together (RhBug:2062767)
 
-* Thu Sep 22 2022 Lukas Hrazky <lhrazky@redhat.com> - 0.20.1-1
+* Wed Feb 16 2022 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-4
-- Update to 0.20.1
+- Switch default of --keep-all-metadata to TRUE and add --discard-additional-metadata (RhBug:1992209)
-- createrepo_c shouldn't silently produce duplicate-NEVRA repos
-- Fix bad performance with task queue management
-- Update errno usage to fix incorrect GError messages
-- Install header for createrepo_shared module
-- Remove C API for cr_xml_parse_main_metadata_together
-- Remove python bindings for xml_parse_main_metadata_together
-- Fix '&' encoding in attributes when parsing repodata
-- Add a streaming parsing API that is user-controllable.
-- Fix a memory leak of primary pkg when parsing interrupted
-- Fix a memory leak when removing the first link in a list
-- Remove `allow_out_of_order` option for `xml_parse_main_metadata_together`
-- Make parse warnings visible through cr.Repomd(), cr.UpdateInfo()
-- Use --error-exit-val option by default
-- If new and old repomd matches during --update don't update
-- Add `cr_repomd_compare` for comparing two repomds
-- Store parsed repomd in `cr_MetadataLocation`
-- Set database version only for the database records, not everything
-- Use copy+delete fallback when moving of a dir fails
-- Fix memory leaks
-- [spec] Option for legacy hashes, enable on RHEL <= 8 (RhBug:2022271)
 
-* Mon Jun 6 2022 Lukas Hrazky <lhrazky@redhat.com> - 0.17.7-4
+* Mon Nov 29 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-3
-- Revert addition of new API for parsing main metadata together (RhBug:2063141)
+- Fix memory leak of `tmp_err` (RhBug:2005781)
 
-* Wed Feb 16 2022 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-2
+* Mon Nov 15 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-2
-- Switch default of --keep-all-metadata to TRUE and add --discard-additional-metadata (RhBug:2055032)
+- Build with legacy hashes (RhBug:2022271)
 
-* Mon Oct 25 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.7-1
+* 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
@@ -216,151 +205,76 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
 - Fix memory leaks (RhBug:1998426)
 - Fix valgrind warnings caused by subprocess calls
 
-* Mon Aug 16 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-5
+* Wed Sep 15 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-3
-- Fix issues detected by static analyzers
+- Preserve changed API for cr_compress_file_with_stat (RhBug:1973588)
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.17.2-4
+* Tue Jul 27 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix: cr_compress_file_with_stat: Memory leak
-  Related: rhbz#1991688
 
-* Tue Jul 27 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-3
+* Wed Apr 28 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-1
-- Fix spec conditional to enable libmodulemd in RHEL >= 8 (RhBug:1816753) 
-
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.17.2-2
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Mon Apr 26 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 0.17.2-1
 - Update to 0.17.2
 - Fix Python deprecation (PY_SSIZE_T_CLEAN) (RhBug:1891785)
 - Revert back to old c API for destination file of cr_compress_file_with_stat and cr_compress_file to prevent a memory leak
-- Never leave behind .repodata lock on exit (RhBug:1906831)
 - Disable drpm for RHEL >= 9 (RhBug:1914828)
 - Setting updated/issued_date to None doesn't produce garbage values (RhBug:1921715)
 - Allow taking __repr__ (__str__) of closed xmlfile and sqlite (RhBug:1913465)
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.16.2-3
+* Fri Jan 29 2021 Nicola Sella <nsella@redhat.com> - 0.16.2-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Never leave behind .repodata lock on exit (RhBug:1906831)
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.2-2
+* Mon Nov 09 2020 Nicola Sella <nsella@redhat.com> - 0.16.2-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Update to 0.16.2
-
-* Mon Nov 23 2020 Nicola Sella <nsella@redhat.com> - 0.16.2-1
-- Fix various memory leaks
-- Add a new function to replace PyObject_ToStrOrNull()
-
-* Tue Oct 06 2020 Nicola Sella <nsella@redhat.com> - 0.16.1
-- Update to 0.16.1
-- Add the section number to the manual pages
-- Parse xml snippet in smaller parts (RhBug:1859689)
 - Add module metadata support to createrepo_c (RhBug:1795936)
+- Fix various memory leaks
 
-* Fri Aug 07 2020 Nicola Sella <nsella@redhat.com> - 0.15.11-4
+* Thu Jul 30 2020 Ales Matej <amatej@redhat.com> - 0.15.11-2
-- spec: Fix building with new cmake macros
+- Parse xml snippet in smaller parts (RhBug:1859689)
 
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.11-3
+* Wed Apr 29 2020 Ales Matej <amatej@redhat.com> - 0.15.11-1
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 02 2020 Ales Matej <amatej@redhat.com> - 0.15.11-1
 - Update to 0.15.11
-- Switch updateinfo to explicitly include bool values (RhBug:1772466)
+- Add --arch-expand option
+- Fix various memory leaks
+
+* Wed Apr 29 2020 Ales Matej <amatej@redhat.com> - 0.15.10-1
+- Update to 0.15.10
+- New option --recycle-pkglist for --update mode
+- Add restart_suggested field to updatecollectionpackage in updateinfo.xml
+- Add relogin_suggested field to updatecollectionpackage in updateinfo.xml (Rhbug:1779751)
+- Export all changelog entries to other.xml in compatibility mode
 - Enhance error handling when locating repositories (RhBug:1762697)
-- Make documentation for --update-md-path more specific
 - Clean up temporary .repodata on sigint
-- Add relogin_suggested to updatecollectionpackage (Rhbug:1779751)
+- Support issued date in epoch format set by Python API (RhBug:1779751)
-- Support issued date in epoch format in Python API (RhBug:1779751)
+- Allow parsing of xml repodata from string via new API functions (RhBug:1804308)
-- Allow parsing of xml repodata from string (RhBug: 1804308)
+- Fix a bug when setting updateCollectionModule (RhBug:1821781)
-- Remove expat xml library in favor of libxml2
-- Copy updateCollectionModule on assignment to prevent bogus data (RhBug:1821781)
-- Add --arch-expand option to mergerepo_c
 
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.15.5-3
+* Tue Mar 24 2020 Stephen Gallagher <sgallagh@redhat.com> - 0.15.1-3
-- Rebuilt for Python 3.9
+- Fix incorrect conditional causing libmodulemd support to be disabled (RhBug:1816753)
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.5-2
+* Mon Jan 13 2020 Ales Matej <amatej@redhat.com> - 0.15.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- Add reboot_suggested to UpdateRecord (RhBug:1772466)
+- Explicitly output boolean values for updateinfo.xml (RhBug:1772466)
+- Fix modifyrepo_c with modules.yaml as a symbolic link (RhBug:1776399)
 
-* Wed Jan 08 2020 Pavel Raiskup <praiskup@redhat.com> - 0.15.5-1
+* Tue Oct 22 2019 Ales Matej <amatej@redhat.com> - 0.15.1-1
-- update to upstream 0.15.5 release, per
-  https://github.com/rpm-software-management/createrepo_c/compare/0.15.4...0.15.5
-- new option --recycle-pkglist for --update mode
-- a bit more optimal --update caching
-
-* Wed Dec 11 2019 Mohan Boddu <mboddu@bhujji.com> - 0.15.4-1
-- Update to upstream 0.15.4 release
-
-* Tue Sep 17 2019 Ales Matej <amatej@redhat.com> - 0.15.1-1
 - Update to 0.15.1
 - Allow pip to see installation of python3-createrepo_c
 - Imporove documentation
-- Switch off timestamping of documentation to avoid file conflics for createrepo_c-devel i686/x86_64 parallel installation
 - Remove dependency on deltarpm in favour of drpm
-
-* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 0.14.2-3
-- Rebuilt for Python 3.8
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.14.2-1
-- Update to 0.14.2
 - Obsolete createrepo on all Fedoras again (RhBug:1702771)
 - Fix issue with createrepo_c hanging at the end (RhBug:1714666)
 - Don't include packages with forbidden control chars in repodata
-
-* Mon Jun 10 22:13:18 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.14.1-4
-- Rebuild for RPM 4.15
-
-* Mon Jun 10 15:42:00 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.14.1-3
-- Rebuild for RPM 4.15
-
-* Tue May 28 2019 Stephen Gallagher <sgallagh@redhat.com> - 0.14.1-2
 - Depend on the appropriate minimum version of libmodulemd
-
-* Fri May 24 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.14.1-1
-- Update to 0.14.1
 - Add --pkgorigins mode for Koji
-- Correct pkg count in headers if there were invalid pkgs (RhBug:1596211)
 - Prevent exiting with 0 if errors occur while finalizing repodata.
-
-* Mon May 20 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.13.2-2
-- Backport patch to fix crash when dumping updateinfo and module is ommited (RhBug:1707981)
-
-* Tue May 07 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.13.2-1
-- Update to 0.13.2
 - Add support for reading and merging module metadata
-- Add support for modular errata (RhBug:1656584)
 - Update --keep-all-metadata to keep all additional metadata, not just updateinfo and groupfile (RhBug:1639287)
 - mergerepo_c: Add support for --koji simple mode
 - Fix generating corrupted sqlite files (RhBug: 1696808)
-- modifyrepo_c: Prevent doubling of compression suffix (test.gz.gz)
 - Do not obsolete createrepo on Fedora < 31
-
-* Mon Mar 11 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.12.2-1
-- Update to 0.12.2
 - mergerepo_c: check if nevra is NULL and warn user about src.rpm naming
-- Consistently produce valid URLs by prepending protocol. (RhBug:1632121)
-
-* Wed Feb 13 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.12.1-1
-- Update to 0.12.1-1
 - Include file timestamp in repomd.xml to allow reproducing exact metadata as produced in the past
 - Enhance support of zchunk
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Dec 12 2018 Jaroslav Mracek <jmracek@redhat.com> - 0.12.0-1
-- Update to 0.12.0
 - Support of zchunk
-
-* Mon Nov 26 2018 Miro Hrončok <mhroncok@redhat.com> - 0.11.1-2
-- Drop Python 2 subpackage on Fedora 30 (#1651182)
-
-* Tue Jul 31 2018 Daniel Mach <dmach@redhat.com> - 0.11.1-1
 - [spec] Fix ldconfig for rhel <= 7
 - Fix "CR_DELTA_RPM_SUPPORT" redefined warnings
 - Set to build against Python 3 by default
@@ -368,14 +282,15 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
 - Add mergerepo_c --repo-prefix-search and --repo-prefix-replace.
 - Fix missing packages in mergerepo_c in case multiple VR exists for single pkg in repo.
 
-* Wed Jul 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.11.0-4
+* Thu Aug 08 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.11.0-3
-- Backport patch for multiple packages with same name for mergerepo_c
+- Backport patch to switch off timestamps on documentation in order to remove
+  file conflicts (RhBug:1738788)
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-3
+* Mon Jul 22 2019 Pavla Kratochvilova <pkratoch@redhat.com> - 0.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Consistently produce valid URLs by prepending protocol. (RhBug:1632121)
-
+- modifyrepo_c: Prevent doubling of compression (test.gz.gz) (RhBug:1639287)
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.11.0-2
+- Correct pkg count in headers if there were invalid pkgs (RhBug:1596211)
-- Rebuilt for Python 3.7
+- Add support for modular errata (RhBug:1656584)
 
 * Wed Jun 27 2018 Marek Blaha <mblaha@redhat.com> - 0.11.0-1
 - Update to 0.11.0