From 00856e2304888b18c66c93f6f10bf62c55262665 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 30 Nov 2013 08:07:42 +0100 Subject: [PATCH] xbps: merge patch from git to fix a xbps-rindex(8) --sign issue. --- ...25-sign-unnecessarily-regenerates-ar.patch | 35 +++++++++++++++++++ srcpkgs/xbps/template | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch diff --git a/srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch b/srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch new file mode 100644 index 00000000000..76ee8caf3e3 --- /dev/null +++ b/srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch @@ -0,0 +1,35 @@ +From e86f9def03b4330363ac0604e660ff4f0a980a39 Mon Sep 17 00:00:00 2001 +From: Juan RP +Date: Sat, 30 Nov 2013 08:04:37 +0100 +Subject: [PATCH] xbps-rindex: fix #25 (--sign unnecessarily regenerates + -repodata). + +--- + NEWS | 2 ++ + bin/xbps-rindex/sign.c | 9 +++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/bin/xbps-rindex/sign.c b/bin/xbps-rindex/sign.c +index 1f791e1..510b326 100644 +--- bin/xbps-rindex/sign.c ++++ bin/xbps-rindex/sign.c +@@ -188,7 +188,16 @@ sign_repo(struct xbps_handle *xhp, const char *repodir, + meta = xbps_dictionary_create(); + xbps_dictionary_set_cstring_nocopy(meta, "signature-by", signedby); + xbps_dictionary_set_cstring_nocopy(meta, "signature-type", "rsa"); ++ /* ++ * If the signature in repo has not changed do not generate the ++ * repodata file again. ++ */ + data = xbps_data_create_data_nocopy(sig, siglen); ++ if (xbps_data_equals_data(data, sig, siglen)) { ++ fprintf(stderr, "Not signing again, matched signature found.\n"); ++ rv = 0; ++ goto out; ++ } + xbps_dictionary_set(meta, "signature", data); + + buf = pubkey_from_privkey(rsa); +-- +1.8.4.1 + diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 16ab7cc9a2d..abec502235f 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.27 -revision=2 +revision=3 bootstrap=yes build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug"