rpms/koji/FC-6 .cvsignore, 1.2, 1.3 fedora-packager-setup.sh, 1.2, 1.3 koji.spec, 1.3, 1.4 sources, 1.3, 1.4
Jesse Keating (jkeating)
fedora-extras-commits at redhat.com
Wed May 16 14:18:39 UTC 2007
Author: jkeating
Update of /cvs/pkgs/rpms/koji/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14887/FC-6
Modified Files:
.cvsignore fedora-packager-setup.sh koji.spec sources
Log Message:
Lots of bugfixes and updates, better fedora-packager-setup.sh
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koji/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 2 Apr 2007 17:22:41 -0000 1.2
+++ .cvsignore 16 May 2007 14:18:05 -0000 1.3
@@ -1 +1 @@
-koji-1.0.tar.bz2
+koji-1.2.0.tar.bz2
Index: fedora-packager-setup.sh
===================================================================
RCS file: /cvs/pkgs/rpms/koji/FC-6/fedora-packager-setup.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-packager-setup.sh 3 May 2007 22:20:40 -0000 1.2
+++ fedora-packager-setup.sh 16 May 2007 14:18:05 -0000 1.3
@@ -1,33 +1,40 @@
#!/bin/bash
-echo Creating User Koji environment
-if [ ! -d ~/.koji ]; then
-mkdir ~/.koji
-fi
+set -e
-if [ ! -f ~/.koji/client.crt ]; then
- if [ -f ~/.fedora.cert ]; then
- cp ~/.fedora.cert ~/.koji/client.crt
- else
- echo "you need a client cert please download one from https://admin.fedoraproject.org/accounts/gen-cert.cgi"
- echo "Save it to ~/.koji/client.crt"
- echo "Then run this script again"
- exit
+function check_wget() {
+ if [ ! -f /usr/bin/wget ]; then
+ echo "You must have wget installed to download the required CA certificates"
+ echo "Please run \"yum install wget\" as root, and re-run this script"
+ exit 1
fi
+}
+
+echo "Setting up Koji client..."
+
+if [ ! -f ~/.fedora.cert ]; then
+ echo "You need a client certificate from the Fedora Account System"
+ echo "Please download one from https://admin.fedoraproject.org/accounts/gen-cert.cgi"
+ echo "Save it to ~/.fedora.cert and re-run this script"
+ exit 1
fi
-if [ -f ~/.fedora-upload-ca.cert ]; then
- cp ~/.fedora-upload-ca.cert ~/.koji/clientca.crt
-else
- wget "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-upload-ca.cert" -O ~/.koji/clientca.crt
+if [ ! -f ~/.fedora-upload-ca.cert ]; then
+ check_wget
+ /usr/bin/wget -q "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-upload-ca.cert" -O ~/.fedora-upload-ca.cert
fi
-if [ -f ~/.fedora-server-ca.cert ]; then
- cp ~/.fedora-server-ca.cert ~/.koji/serverca.crt
-else
- wget "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-server-ca.cert" -O ~/.koji/serverca.crt
+if [ ! -f ~/.fedora-server-ca.cert ]; then
+ check_wget
+ /usr/bin/wget -q "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-server-ca.cert" -O ~/.fedora-server-ca.cert
+fi
+
+if [ ! -d ~/.koji ]; then
+ mkdir ~/.koji
fi
+# remove existing contents of ~/.koji to avoid confusion
+rm -f ~/.koji/*
cat > ~/.koji/config <<EOF
[koji]
@@ -46,29 +53,42 @@
;configuration for SSL athentication
;client certificate
-cert = ~/.koji/client.crt
+cert = ~/.fedora.cert
;certificate of the CA that issued the client certificate
-ca = ~/.koji/clientca.crt
+ca = ~/.fedora-upload-ca.cert
;certificate of the CA that issued the HTTP server certificate
-serverca = ~/.koji/serverca.crt
+serverca = ~/.fedora-server-ca.cert
EOF
-echo "Creating an SSL Certificate to import into your browser to allow user authentication on at http://koji.fedoraproject.org/koji.
-Choose your own passphrase, you will be prompted for this when using the certificate.
+cat <<EOF
+Creating an SSL certificate to import into your browser, to enable
+user authentication at http://koji.fedoraproject.org/koji/
+Choose your own passphrase, you will be prompted for this when importing the certificate.
-- To import the Certificate into Firefox:
+EOF
+
+if [ -f ~/fedora-browser-cert.p12 ]; then
+ rm ~/fedora-browser-cert.p12
+fi
+
+/usr/bin/openssl pkcs12 -export -in ~/.fedora.cert -CAfile ~/.fedora-upload-ca.cert -out ~/fedora-browser-cert.p12
+
+cat <<EOF
+
+Browser certificate exported to ~/fedora-browser-cert.p12
+To import the certificate into Firefox:
Edit -> Preferences -> Advanced
Click "View Certificates"
On "Your Certificates" tab, click "Import"
-Select fedora-client-cert.p12 (from the directory you ran this script in)
-Type the export passphrase (if you specified one)
+Select ~/fedora-browser-cert.p12
+Type the export passphrase you chose earlier
-Once imported, you should see a certificate named "Fedora Project"
+Once imported, you should see a certificate named "Fedora Project".
Your username should appear underneath this.
-- You should now be able to click the "login" link at http://koji.fedoraproject.org/koji successfully"
-openssl pkcs12 -export -in ~/.koji/client.crt -CAfile ~/.koji/clientca.crt -out fedora-client-cert.p12
+You should now be able to click the "login" link at http://koji.fedoraproject.org/koji/ successfully.
+EOF
Index: koji.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koji/FC-6/koji.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- koji.spec 3 May 2007 22:20:40 -0000 1.3
+++ koji.spec 16 May 2007 14:18:05 -0000 1.4
@@ -1,6 +1,6 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define baserelease 2
+%define baserelease 3
#build with --define 'testbuild 1' to have a timestamp appended to release
%if x%{?testbuild} == x1
%define release %{baserelease}.%(date +%%Y%%m%%d.%%H%%M.%%S)
@@ -8,7 +8,7 @@
%define release %{baserelease}
%endif
Name: koji
-Version: 1.1
+Version: 1.2.0
Release: %{release}%{?dist}
License: LGPL
Summary: Build system tools
@@ -51,7 +51,7 @@
Requires: cvs
Requires: rpm-build
Requires: redhat-rpm-config
-Requires: createrepo >= 0.4.4
+Requires: createrepo >= 0.4.8-2
%description builder
koji-builder is the daemon that runs on build machines and executes
@@ -62,8 +62,6 @@
Group: Applications/Internet
Requires: postgresql-python
Requires: %{name} = %{version}-%{release}
-Requires: rpm-build
-Requires: createrepo >= 0.4.4
%description utils
Utilities for the Koji system
@@ -153,9 +151,36 @@
fi
%changelog
+* Tue May 15 2007 Jesse Keating <jkeating at redhat.com> - 1.2.0-3
+- More fixes to fedora-packager-setup.sh from mbonnet
+
+* Tue May 15 2007 Jesse Keating <jkeating at redhat.com> - 1.2.0-2
+- overwrite and hardlink ssl cert for fedora packagers (dgilmore)
+
+* Tue May 15 2007 Mike Bonnet <mikeb at redhat.com> - 1.2.0-1
+- change version numbering to a 3-token scheme
+- install the koji favicon
+
+* Mon May 14 2007 Mike Bonnet <mikeb at redhat.com> - 1.1-5
+- cleanup koji-utils Requires
+- fix encoding and formatting in email notifications
+- expand archlist based on ExclusiveArch/BuildArchs
+- allow import of rpms without srpms
+- commit before linking in prepRepo to release db locks
+- remove exec bit from kojid logs and uploaded files (patch by Enrico Scholz)
+
* Thu May 03 2007 Jesse Keating <jkeating at redhat.com> 1.1-2
- Clean up some of the text in fedora-packager-setup.sh
+* Tue May 1 2007 Mike Bonnet <mikeb at redhat.com> - 1.1-4
+- remove spurious Requires: from the koji-utils package
+
+* Tue May 1 2007 Mike Bonnet <mikeb at redhat.com> - 1.1-3
+- fix typo in BuildNotificationTask (patch provided by Michael Schwendt)
+- add the --changelog param to the buildinfo command
+- always send email notifications to the package builder and package owner
+- improvements to the web UI
+
* Mon Apr 09 2007 Jesse Keating <jkeating at redhat.com> 1.1-1
- make the output listPackages() consistent regardless of with_dups
- prevent large batches of repo deletes from holding up regens
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koji/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Apr 2007 17:38:41 -0000 1.3
+++ sources 16 May 2007 14:18:05 -0000 1.4
@@ -1 +1 @@
-9af35f955b1e806515e6e09c9f632eba koji-1.1.tar.bz2
+07e9596d3645834a1386120cab0cb7e2 koji-1.2.0.tar.bz2
More information about the fedora-extras-commits
mailing list