From 9bf3c49ae9b4557ae4948172a16dff195aa2e801 Mon Sep 17 00:00:00 2001 From: "dennis@bratac.ausil.us" Date: Mon, 3 Dec 2007 12:58:35 -0600 Subject: attempt to autotoolise --- AUTHORS | 1 + ChangeLog | 0 Makefile.am | 11 ++++ NEWS | 0 README | 0 configure.in | 5 ++ fedora-packager.spec | 4 +- scripts/fedora-cvs.py | 49 --------------- scripts/fedora-packager-setup.sh | 129 --------------------------------------- src/fedora-cvs.py | 49 +++++++++++++++ src/fedora-packager-setup.sh | 129 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 197 insertions(+), 180 deletions(-) create mode 100644 AUTHORS create mode 100644 ChangeLog create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 README create mode 100644 configure.in delete mode 100755 scripts/fedora-cvs.py delete mode 100644 scripts/fedora-packager-setup.sh create mode 100755 src/fedora-cvs.py create mode 100644 src/fedora-packager-setup.sh diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..5d55b61 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Dennis Gilmore diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..3051d41 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,11 @@ +bin_SCRIPTS = fedora-cvs fedora-packager-setup.sh +CLEANFILES = $(bin_SCRIPTS) +EXTRA_DIST = fedora-cvs fedora-packager-setup.sh + +fedora-cvs: $(srcdir)/fedora-cvs.py + rm -f fedora-cvs + chmod ugo+x fedora-cvs + +fedora-packager-setup.sh: $(srcdir)/fedora-packager-setup.sh + rm -f fedora-packager-setup.sh + chmod ugo+x fedora-packager-setup.sh diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/configure.in b/configure.in new file mode 100644 index 0000000..0d3175b --- /dev/null +++ b/configure.in @@ -0,0 +1,5 @@ +AC_INIT(fedora-cvs) +AM_INIT_AUTOMAKE(fedora-packager,0.1) +AC_PROG_CC +AC_PROG_INSTALL +AC_OUTPUT(Makefile) diff --git a/fedora-packager.spec b/fedora-packager.spec index a8a06a0..efff88b 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -22,12 +22,11 @@ Set of utilities useful for a fedora packager in setting up thier environment. %build -%configure -make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} make install DESTDIR=$RPM_BUILD_ROOT @@ -39,6 +38,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %{_bindir}/fedora-packager-setup.sh +%{_bindir}/fedora-cvs diff --git a/scripts/fedora-cvs.py b/scripts/fedora-cvs.py deleted file mode 100755 index eb0a7b4..0000000 --- a/scripts/fedora-cvs.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python - -import os -import string -import sys -import commands - -def readUser(): - ''' samle line "Subject: C=US, ST=North Carolina, O=Fedora Project, OU=Dennis Gilmore, CN=ausil/emailAddress=dennis@ausil.us" ''' - userCert = "" - if os.access(os.path.join(os.path.expanduser('~'),".fedora.cert"), os.R_OK): - userCert = open(os.path.join(os.path.expanduser('~'),".fedora.cert"), "r").read() - else: - print "!!! cannot read your ~/.fedora.cert file !!!" - print "!!! Ensure the file is readable and try again !!!" - os.exit(1) - for certLine in userCert.split("\n"): - if not len(certLine): - continue - stripCertLine = certLine.strip() - if stripCertLine.startswith("Subject: "): - subjectLine = certLine.split("CN=") - name = subjectLine[1].split("/") - return name[0] - - -def cvsco(user, module): - '''CVSROOT=:ext:ausil@cvs.fedoraproject.org:/cvs/extras/''' - (s, o) = commands.getstatusoutput("CVSROOT=:ext:%s@cvs.fedoraproject.org:/cvs/extras/ CVS_RSH=ssh cvs co %s" % (user, module)) - if s != 0: - print "Error: %s" % o - else: - print o - - -def main(pkg): - userName = readUser() - cvsco(userName, pkg) - -if __name__ == '__main__': - if len(sys.argv) < 2: - print "you need to specify the module to checkout of cvs" - sys.exit(1) - - #the package we want to pull from cvs - pkg = sys.argv[1] - - main(pkg) - diff --git a/scripts/fedora-packager-setup.sh b/scripts/fedora-packager-setup.sh deleted file mode 100644 index 92faf28..0000000 --- a/scripts/fedora-packager-setup.sh +++ /dev/null @@ -1,129 +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/gen-cert.cgi" - echo "Save it to ~/.fedora.cert and re-run this script" - exit 1 -fi - -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 - -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 - -# remove existing contents of ~/.koji to avoid confusion -rm -f ~/.koji/* - -cat > ~/.koji/config < ~/.koji/$arch-config < 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 diff --git a/src/fedora-cvs.py b/src/fedora-cvs.py new file mode 100755 index 0000000..eb0a7b4 --- /dev/null +++ b/src/fedora-cvs.py @@ -0,0 +1,49 @@ +#!/usr/bin/python + +import os +import string +import sys +import commands + +def readUser(): + ''' samle line "Subject: C=US, ST=North Carolina, O=Fedora Project, OU=Dennis Gilmore, CN=ausil/emailAddress=dennis@ausil.us" ''' + userCert = "" + if os.access(os.path.join(os.path.expanduser('~'),".fedora.cert"), os.R_OK): + userCert = open(os.path.join(os.path.expanduser('~'),".fedora.cert"), "r").read() + else: + print "!!! cannot read your ~/.fedora.cert file !!!" + print "!!! Ensure the file is readable and try again !!!" + os.exit(1) + for certLine in userCert.split("\n"): + if not len(certLine): + continue + stripCertLine = certLine.strip() + if stripCertLine.startswith("Subject: "): + subjectLine = certLine.split("CN=") + name = subjectLine[1].split("/") + return name[0] + + +def cvsco(user, module): + '''CVSROOT=:ext:ausil@cvs.fedoraproject.org:/cvs/extras/''' + (s, o) = commands.getstatusoutput("CVSROOT=:ext:%s@cvs.fedoraproject.org:/cvs/extras/ CVS_RSH=ssh cvs co %s" % (user, module)) + if s != 0: + print "Error: %s" % o + else: + print o + + +def main(pkg): + userName = readUser() + cvsco(userName, pkg) + +if __name__ == '__main__': + if len(sys.argv) < 2: + print "you need to specify the module to checkout of cvs" + sys.exit(1) + + #the package we want to pull from cvs + pkg = sys.argv[1] + + main(pkg) + diff --git a/src/fedora-packager-setup.sh b/src/fedora-packager-setup.sh new file mode 100644 index 0000000..92faf28 --- /dev/null +++ b/src/fedora-packager-setup.sh @@ -0,0 +1,129 @@ +#!/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/gen-cert.cgi" + echo "Save it to ~/.fedora.cert and re-run this script" + exit 1 +fi + +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 + +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 + +# remove existing contents of ~/.koji to avoid confusion +rm -f ~/.koji/* + +cat > ~/.koji/config < ~/.koji/$arch-config < 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 -- cgit