From 992e462559a2e15a781f0dfa5284147ce4a37384 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Nov 28 2016 18:36:22 +0000 Subject: [PATCH 1/2] Move to the new sources file format This is a pre-requisite to moving away from MD5 sum, as fedpkg will need to know which hashtype was used for a give line in the sources file. Upstream pyrpkg has supported this for long enough now (it was part of rpkg-1.32 which is in all Fedora and EPEL branches) that we can make the move in fedpkg. Signed-off-by: Mathieu Bridon --- diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py index 4768805..fd2f03b 100644 --- a/fedpkg/__init__.py +++ b/fedpkg/__init__.py @@ -46,6 +46,8 @@ class Commands(pyrpkg.Commands): # Store this for later self._orig_kojiconfig = kojiconfig + self.source_entry_type = 'bsd' + # Add new properties @property def kojiconfig(self): From ef6e1477ebfa80239de3013a721a8556de007279 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Nov 28 2016 18:36:45 +0000 Subject: [PATCH 2/2] lookaside: We now use sha512 to upload the sources Of course, downloads continue using the hash declared in the 'sources' file. But when we start uploading with sha512, these 'sources' file will start containing sha512 hashes, and so these downloads will start using sha512 as well. https://fedorahosted.org/rel-eng/ticket/5846 Signed-off-by: Mathieu Bridon --- diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf index 167b93b..e2d985c 100644 --- a/conf/etc/rpkg/fedpkg.conf +++ b/conf/etc/rpkg/fedpkg.conf @@ -1,6 +1,6 @@ [fedpkg] lookaside = http://pkgs.fedoraproject.org/repo/pkgs -lookasidehash = md5 +lookasidehash = sha512 lookaside_cgi = https://pkgs.fedoraproject.org/repo/pkgs/upload.cgi gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(module)s anongiturl = git://pkgs.fedoraproject.org/%(module)s