[Groonga-commit] groonga/groonga at 321aac7 [master] packages yum: update groonga-release which bundles new signing key

Back to archive index

Kentaro Hayashi null+****@clear*****
Tue Jan 30 09:55:44 JST 2018


Kentaro Hayashi	2018-01-30 09:55:44 +0900 (Tue, 30 Jan 2018)

  New Revision: 321aac71d16a384a562851d1d4f2beb3268def62
  https://github.com/groonga/groonga/commit/321aac71d16a384a562851d1d4f2beb3268def62

  Message:
    packages yum: update groonga-release which bundles new signing key

  Modified files:
    packages/yum/Makefile.am
    packages/yum/build-release-rpm.sh
    packages/yum/groonga-release.spec

  Modified: packages/yum/Makefile.am (+4 -1)
===================================================================
--- packages/yum/Makefile.am    2018-01-30 09:55:07 +0900 (189333537)
+++ packages/yum/Makefile.am    2018-01-30 09:55:44 +0900 (df0469495)
@@ -54,7 +54,7 @@ build-in-vm: source specs env.sh
 	  done;							\
 	done
 
-build-release-rpm: RPM-GPG-KEY-$(PACKAGE)
+build-release-rpm: RPM-GPG-KEY-$(PACKAGE) RPM-GPG-KEY-$(PACKAGE)-RSA4096
 	./build-release-rpm.sh			\
 	  $(PACKAGE)				\
 	  '$(PACKAGE_LABEL)'			\
@@ -70,6 +70,9 @@ ensure-public-key:
 RPM-GPG-KEY-$(PACKAGE): ensure-public-key
 	gpg --armor --export '$(GPG_UID)' > $@
 
+RPM-GPG-KEY-$(PACKAGE)-RSA4096: ensure-public-key
+	gpg --armor --export '$(GPG_UID_RSA4096)' > $@
+
 source: tmp/$(PACKAGE)-$(VERSION).tar.gz
 
 tmp/$(PACKAGE)-$(VERSION).tar.gz: $(abs_top_builddir)/$(PACKAGE)-$(VERSION).tar.gz

  Modified: packages/yum/build-release-rpm.sh (+2 -1)
===================================================================
--- packages/yum/build-release-rpm.sh    2018-01-30 09:55:07 +0900 (23a1914ee)
+++ packages/yum/build-release-rpm.sh    2018-01-30 09:55:44 +0900 (19b036fe1)
@@ -74,10 +74,11 @@ baseurl=$BASE_URL_PREFIX/$distribution/\$releasever/\$basearch/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-$PACKAGE
+       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-$PACKAGE-RSA4096
 EOR
     fi
     run tar cfz $rpm_base_dir/SOURCES/${PACKAGE}-release.tar.gz \
-	-C ${script_base_dir} ${repo} RPM-GPG-KEY-${PACKAGE}
+	-C ${script_base_dir} ${repo} RPM-GPG-KEY-${PACKAGE} RPM-GPG-KEY-${PACKAGE}-RSA4096
     run cp ${script_base_dir}/${PACKAGE}-release.spec $rpm_base_dir/SPECS/
 
     run rpmbuild -ba $rpm_base_dir/SPECS/${PACKAGE}-release.spec

  Modified: packages/yum/groonga-release.spec (+7 -1)
===================================================================
--- packages/yum/groonga-release.spec    2018-01-30 09:55:07 +0900 (a6c0eb7b1)
+++ packages/yum/groonga-release.spec    2018-01-30 09:55:44 +0900 (17b533105)
@@ -1,6 +1,6 @@
 Summary: Groonga release files
 Name: groonga-release
-Version: 1.3.0
+Version: 1.4.0
 Release: 1
 License: LGPLv2
 URL: https://packages.groonga.org/
@@ -23,6 +23,7 @@ Groonga release files
 %{__rm} -rf %{buildroot}
 
 %{__install} -Dp -m0644 RPM-GPG-KEY-groonga %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-groonga
+%{__install} -Dp -m0644 RPM-GPG-KEY-groonga-RSA4096 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-groonga-RSA4096
 
 %{__install} -Dp -m0644 groonga.repo %{buildroot}%{_sysconfdir}/yum.repos.d/groonga.repo
 
@@ -33,12 +34,17 @@ Groonga release files
 %defattr(-, root, root, 0755)
 %doc *
 %pubkey RPM-GPG-KEY-groonga
+%pubkey RPM-GPG-KEY-groonga-RSA4096
 %dir %{_sysconfdir}/yum.repos.d/
 %config(noreplace) %{_sysconfdir}/yum.repos.d/groonga.repo
 %dir %{_sysconfdir}/pki/rpm-gpg/
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-groonga
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-groonga-RSA4096
 
 %changelog
+* Mon Jan 29 2018 Kentaro Hayashi <hayashi �� clear-code.com> - 1.4.0-1
+- Add new signing key for transition from weak key (1024bit)
+
 * Sat Mar 25 2017 Kentaro Hayashi <hayashi �� clear-code.com> - 1.3.0-1
 - Use https instead of http in groonga.repo.
 
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180130/852d5dfc/attachment-0001.htm 



More information about the Groonga-commit mailing list
Back to archive index