From 68113a8fc05675a961c0a9bc3f2c0d53af242317 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 6 Jan 2020 14:44:22 +0100
Subject: [PATCH] Revert "Sign index-meta"

This reverts commit 381b7b76005d96a8ba2fc782252ec7348fbc45f9.
---
 bin/xbps-rindex/repoflush.c | 26 ++++----------------------
 include/xbps.h.in           | 15 +++++++--------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/bin/xbps-rindex/repoflush.c b/bin/xbps-rindex/repoflush.c
index c1ce25ae..b2338880 100644
--- a/bin/xbps-rindex/repoflush.c
+++ b/bin/xbps-rindex/repoflush.c
@@ -93,7 +93,8 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir,
 	buf = xbps_dictionary_externalize(idx);
 	if (buf == NULL)
 		return false;
-	rv = xbps_archive_append_buf(ar, buf, strlen(buf),
+	buflen = strlen(buf);
+	rv = xbps_archive_append_buf(ar, buf, buflen,
 	    XBPS_REPOIDX, 0644, "root", "root");
 	free(buf);
 	if (rv != 0)
@@ -108,31 +109,12 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir,
 	} else {
 		buf = xbps_dictionary_externalize(meta);
 	}
-	buflen = strlen(buf);
-	rv = xbps_archive_append_buf(ar, buf, buflen,
+	rv = xbps_archive_append_buf(ar, buf, strlen(buf),
 	    XBPS_REPOIDX_META, 0644, "root", "root");
+	free(buf);
 	if (rv != 0)
 		return false;
 
-	if (xbps_dictionary_get_cstring_nocopy(meta, "signature-type", &signature_type)) {
-		rv = sign_buffer(buf, buflen, privkey, &sig, &siglen);
-		free(buf);
-		if (rv != 0) {
-			free(sig);
-			return false;
-		}
-		assert(sig);
-		rv = xbps_archive_append_buf(ar, sig, siglen,
-		    XBPS_REPOIDXMETA_SIG, 0644, "root", "root");
-		if (rv != 0) {
-			free(sig);
-			return false;
-		}
-		free(sig);
-	} else {
-		free(buf);
-	}
-
 	/* Write data to tempfile and rename */
 	if (archive_write_close(ar) != ARCHIVE_OK)
 		return false;
diff --git a/include/xbps.h.in b/include/xbps.h.in
index 9157f5a9..d4590cdf 100644
--- a/include/xbps.h.in
+++ b/include/xbps.h.in
@@ -116,19 +116,18 @@
  */
 #define XBPS_REPOIDX		"index.plist"
 
+/** 
+ * @def XBPS_REPOIDX_SIG
+ * Filename for the signature of repository index property list.
+ */
+#define XBPS_REPOIDX_SIG	"index.plist.sig"
+
 /**
  * @def XBPS_REPOIDX_META
  * Filename for the repository index metadata property list.
  */
 #define XBPS_REPOIDX_META 	"index-meta.plist"
 
-/**
- * @def XBPS_REPOIDXMETA_SIG
- * Filename for the signature of repository index metadata
- * property list.
- */
-#define XBPS_REPOIDXMETA_SIG	"index-meta.plist.sig"
-
 /**
  * @def XBPS_FLAG_VERBOSE
  * Verbose flag that can be used in the function callbacks to alter
@@ -1369,7 +1368,7 @@ struct xbps_repo {
 	xbps_dictionary_t idxmeta;
 	/**
 	 * @var uri
-	 *
+	 * 
 	 * URI string associated with repository.
 	 */
 	const char *uri;