diff options
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/fedora-getsvn | 22 | ||||
| -rwxr-xr-x | src/fedora-packager-setup.py | 10 | ||||
| -rwxr-xr-x | src/fedora-packager-setup.sh | 120 |
6 files changed, 49 insertions, 124 deletions
diff --git a/Makefile.am b/Makefile.am index 542b676..5356533 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,18 @@ fedora-packager-setup: $(srcdir)/src/fedora-packager-setup.py rm -f fedora-packager-setup cp -p $(srcdir)/src/fedora-packager-setup.py fedora-packager-setup chmod ugo+x fedora-packager-setup + +fedoradev-pkgowners: $(srcdir)/src/fedoradev-pkgowners + rm -f fedoradev-pkgowners + cp -p $(srcdir)/src/fedoradev-pkgowners fedoradev-pkgowners + chmod ugo+x fedoradev-pkgowners + +fedora-cert: $(srcdir)/src/fedora-cert.py + rm -f fedora-cert + cp -p $(srcdir)/src/fedora-cert.py fedora-cert + chmod ugo+x fedora-cert + +fedora-getsvn: $(srcdir)/src/fedora-getsvn + rm -f fedora-getsvn + cp -p $(srcdir)/src/fedora-getsvn fedora-getsvn + chmod ugo+x fedora-getsvn @@ -1,3 +1,7 @@ +Jun 21 2009 +add hppa configs. fix bug in fedora-packager-setup trying to unlink non existant file + + Mar 02 2009 rewrite fedora-packager-setup in python diff --git a/configure.ac b/configure.ac index 2c464c2..dad94fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([fedora-packager], [0.3.3]) +AC_INIT([fedora-packager], [0.3.4]) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) AC_PATH_PROGS(PYTHON, python) AC_PATH_PROGS(BASH, sh bash) diff --git a/src/fedora-getsvn b/src/fedora-getsvn new file mode 100644 index 0000000..72f08ab --- /dev/null +++ b/src/fedora-getsvn @@ -0,0 +1,22 @@ +#! /bin/sh + +if [ $# -ne 3 ]; +then + echo "Usage: $0 <project> <url> <revision>" + exit 1 +fi + +project=$1 +url=$2 +rev=$3 + +tmpdir=`mktemp -d` +curdir=`pwd` + +( + cd ${tmpdir} + LANG=C TZ=GMT svn export ${url} -r ${rev} ${project} + tar cjvf ${curdir}/${project}-svn${rev}.tar.bz2 ${project} +) + +rm -rf ${tmpdir} diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index 898e111..1828b11 100755 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -114,16 +114,20 @@ Save it to ~/.fedora.cert and re-run this script''' download_cert('https://admin.fedoraproject.org/accounts/fedora-server-ca.cert', server_ca_cert) if not os.path.islink(upload_ca_cert): print 'Linking: ~/.fedora-server-ca.cert to ~/.fedora-upload-ca.cert' - os.unlink(upload_ca_cert) + if os.path.exists(upload_ca_cert): + os.unlink(upload_ca_cert) os.symlink(server_ca_cert, upload_ca_cert) if not os.path.isdir(os.path.join(user_home, '.koji')): os.mkdir(os.path.join(user_home, '.koji')) - for arch in ['sparc', 'arm', 'alpha', 'ia64', 's390']: + for arch in ['sparc', 'arm', 'alpha', 'ia64', 's390', 'hppa']: config_file = '%s/.koji/%s-config' % (user_home, arch) if not os.path.isfile(config_file): write_arch_config(arch, config_file) else: - print "koji config for %s exists" % arch + print "koji config for %s exists. Replacing with new file." % arch + os.unlink(config_file) + write_arch_config(arch, config_file) + print 'Setting up Browser Certificates' generate_browser_cert() diff --git a/src/fedora-packager-setup.sh b/src/fedora-packager-setup.sh deleted file mode 100755 index cbb2868..0000000 --- a/src/fedora-packager-setup.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -set -e - -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/user/gencert" - echo "Save it to ~/.fedora.cert and re-run this script" - exit 1 -fi - -rm ~/.fedora-upload-ca.cert - -if [ ! -f ~/.fedora-upload-ca.cert ]; then - check_wget - /usr/bin/wget -q "https://admin.fedoraproject.org/accounts/fedora-upload-ca.cert" -O ~/.fedora-upload-ca.cert -fi - -rm ~/.fedora-server-ca.cert - -if [ ! -f ~/.fedora-server-ca.cert ]; then - check_wget - /usr/bin/wget -q "https://admin.fedoraproject.org/accounts/fedora-server-ca.cert" -O ~/.fedora-server-ca.cert -fi - -if [ ! -d ~/.koji ]; then - mkdir ~/.koji -fi - - -for arch in arm alpha ia64 sparc s390 parisc ;do -rm -f ~/.koji/$arch-config -cat > ~/.koji/$arch-config <<EOF -[koji] - -;configuration for koji cli tool - -;url of XMLRPC server -server = http://$arch.koji.fedoraproject.org/kojihub - -;url of web interface -weburl = http://$arch.koji.fedoraproject.org/koji - -;url of package download site -pkgurl = http://$arch.koji.fedoraproject.org/packages - -;path to the koji top directory -;topdir = /mnt/koji - -;configuration for SSL athentication - -;client certificate -cert = ~/.fedora.cert - -;certificate of the CA that issued the client certificate -ca = ~/.fedora-upload-ca.cert - -;certificate of the CA that issued the HTTP server certificate -serverca = ~/.fedora-server-ca.cert - -EOF -echo "Wrote $arch koji config file" -done - -cat > ~/.plague-client.cfg <<EOF -[Certs] -user-ca-cert = ~/.fedora-upload-ca.cert -server-ca-cert = ~/.fedora-server-ca.cert -user-cert = ~/.fedora.cert - -[User] -email = $email - -[Server] -use_ssl = yes -upload_user = me -allow_uploads = no -address = https://buildsys.fedoraproject.org:8887 -EOF -echo "Wrote Plague Config file" - -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. - -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-browser-cert.p12 -Type the export passphrase you chose earlier - -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. -EOF |