null+****@clear*****
null+****@clear*****
2012年 4月 25日 (水) 11:28:46 JST
Kouhei Sutou 2012-04-25 11:28:46 +0900 (Wed, 25 Apr 2012)
New Revision: ab3f8b8c422facde7f70d4dba25901cd3045847e
Log:
yum: set GPG UID in configure
Added files:
gpg_uid
Removed files:
packages/yum/gpg-uid.sh
Modified files:
configure.ac
packages/yum/Makefile.am
packages/yum/gpg-public-key.sh
packages/yum/sign-rpm.sh
Modified: configure.ac (+9 -1)
===================================================================
--- configure.ac 2012-04-24 19:02:08 +0900 (a39101d)
+++ configure.ac 2012-04-25 11:28:46 +0900 (7279edc)
@@ -1111,7 +1111,7 @@ AC_ARG_WITH(groonga-github-com-path,
[GROONGA_GITHUB_COM_PATH=""])
AC_SUBST(GROONGA_GITHUB_COM_PATH)
-# For Debian package release
+# For package
AC_ARG_WITH(rsync-path,
[AS_HELP_STRING([--with-rsync-path=PATH],
[specify rsync path to upload groonga packages.])],
@@ -1119,6 +1119,9 @@ AC_ARG_WITH(rsync-path,
[RSYNC_PATH=""])
AC_SUBST(RSYNC_PATH)
+GPG_UID=m4_include(gpg_uid)
+AC_SUBST(GPG_UID)
+
pkgsysconfdir="\$(sysconfdir)/$PACKAGE_NAME"
AC_SUBST(pkgsysconfdir)
@@ -1190,4 +1193,9 @@ echo " Ruby: ${RUBY}"
echo " Cutter: ${CUTTER}"
echo
+echo "For packages:"
+echo " rsync path: ${RSYNC_PATH}"
+echo " GPG UID: ${GPG_UID}"
+echo
+
echo "Now type 'make' to build $PACKAGE_NAME $PACKAGE_VERSION!"
Added: gpg_uid (+1 -0) 100644
===================================================================
--- /dev/null
+++ gpg_uid 2012-04-25 11:28:46 +0900 (e24b4ae)
@@ -0,0 +1 @@
+F10399C0
Modified: packages/yum/Makefile.am (+3 -3)
===================================================================
--- packages/yum/Makefile.am 2012-04-24 19:02:08 +0900 (64a4d7d)
+++ packages/yum/Makefile.am 2012-04-25 11:28:46 +0900 (33a8cba)
@@ -16,7 +16,7 @@ ensure-rsync-path:
fi
sign:
- ./sign-rpm.sh '$(DISTRIBUTIONS)'
+ ./sign-rpm.sh '$(GPG_UID)' '$(DISTRIBUTIONS)'
update:
./update-repository.sh $(PACKAGE) '$(DISTRIBUTIONS)'
@@ -56,8 +56,8 @@ build-repository-rpm: RPM-GPG-KEY-$(PACKAGE)
'$(DISTRIBUTIONS)' \
$(HAVE_DEVELOPMENT_BRANCH)
-RPM-GPG-KEY-$(PACKAGE):
- ./gpg-public-key.sh > $@
+RPM-GPG-KEY-$(PACKAGE): $(top_srcdir)/gpg_uid
+ ./gpg-public-key.sh '$(GPG_UID)' > $@
source: ../$(PACKAGE)-$(VERSION).tar.gz
Modified: packages/yum/gpg-public-key.sh (+9 -1)
===================================================================
--- packages/yum/gpg-public-key.sh 2012-04-24 19:02:08 +0900 (f21020f)
+++ packages/yum/gpg-public-key.sh 2012-04-25 11:28:46 +0900 (d3d3fe0)
@@ -2,4 +2,12 @@
script_base_dir=`dirname $0`
-gpg -a --export `$script_base_dir/gpg-uid.sh`
+if [ $# != 1 ]; then
+ echo "Usage: $0 GPG_UID"
+ echo " e.g.: $0 'F10399C0'"
+ exit 1
+fi
+
+GPG_UID=$1
+
+gpg -a --export "${GPG_UID}"
Deleted: packages/yum/gpg-uid.sh (+0 -4) 100755
===================================================================
--- packages/yum/gpg-uid.sh 2012-04-24 19:02:08 +0900 (d62ec09)
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# gpg --list-secret-keys | grep uid | sed -e 's/^uid *//' | tail -1
-echo 1c837f31
Modified: packages/yum/sign-rpm.sh (+6 -5)
===================================================================
--- packages/yum/sign-rpm.sh 2012-04-24 19:02:08 +0900 (9fa180b)
+++ packages/yum/sign-rpm.sh 2012-04-25 11:28:46 +0900 (63ee2dd)
@@ -2,13 +2,14 @@
script_base_dir=`dirname $0`
-if [ $# != 1 ]; then
- echo "Usage: $0 DISTRIBUTIONS"
- echo " e.g.: $0 'fedora centos'"
+if [ $# != 2 ]; then
+ echo "Usage: $0 GPG_UID DISTRIBUTIONS"
+ echo " e.g.: $0 'F10399C0' 'fedora centos'"
exit 1
fi
-DISTRIBUTIONS=$1
+GPG_UID=$1
+DISTRIBUTIONS=$2
run()
{
@@ -20,6 +21,6 @@ run()
}
for distribution in ${DISTRIBUTIONS}; do
- run rpm -D "_gpg_name `$script_base_dir/gpg-uid.sh`" \
+ run rpm -D "_gpg_name ${GPG_UID}" \
--resign $script_base_dir/${distribution}/*/*/*/*.rpm
done