diff --git a/INSTALL.centos.in b/INSTALL.centos.in new file mode 100644 index 0000000..365ca68 --- /dev/null +++ b/INSTALL.centos.in @@ -0,0 +1,31 @@ + +1. Install Apache web server + +yum install httpd +service httpd start + +2. Configure Apache to serve xml-signer + +xml-signer ships with a sample Apache configuration file: + + @pkgdatadir@/etc/apache2.conf + +You can use this file in several ways to add xml-signer to your Apache +configuration. If you want to serve it globally you can simply create +a link in /etc/httpd/conf.d to the sample xml-signer Apache +configuration file: + + # Add file or link in /etc/httpd/conf.d + ln -s @pkgdatadir@/etc/apache2.conf /etc/httpd/conf.d/xml-signer.conf + +Alternatively, if you want more control over how xml-signer is served, +you can include the sample xml-signer Apache configuration file in an +appropriate Apache configuration file. For instance, if you want to +server xml-signer only via ssl, add the following line inside the +VirtualHost definition in /etc/httpd/conf.d/ssl.conf: + + Include @pkgdatadir@/etc/apache2.conf + +Finally, you can serve xml-signer from a location of your choosing by +copying the contents of the sample xml-signer Apache configuration +file into your Apache configuration, modifying to suit your situation. diff --git a/Makefile.am b/Makefile.am index 48135f5..e71bea5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ edit = sed \ -e 's|@pkgsysconfdir[@]|$(pkgsysconfdir)|g' \ -e 's|@prefix[@]|$(prefix)|g' -etc/apache2.conf: Makefile +INSTALL.centos etc/apache2.conf: Makefile rm -f $@ $@.tmp srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ @@ -22,14 +22,20 @@ etc/apache2.conf: Makefile mv $@.tmp $@ etc/apache2.conf: $(srcdir)/etc/apache2.conf.in +INSTALL.centos: $(srcdir)/INSTALL.centos.in # Distribute these but do not install them EXTRA_DIST = \ + INSTALL.centos.in \ + debian \ + xml-signer.spec \ etc/apache2.conf.in -CLEANFILES = etc/apache2.conf +CLEANFILES = \ + etc/apache2.conf \ + INSTALL.centos -nobase_dist_pkgdata_DATA = \ +nobase_pkgdata_DATA = \ etc/apache2.conf # Put all the files for the web server under 'www' for easy apache @@ -115,4 +121,7 @@ nobase_dist_wwwdata_DATA = \ tool.html \ xml-signer.js -doc_DATA = README.md AUTHORS +dist_doc_DATA = \ + AUTHORS \ + INSTALL.centos \ + README.md diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..9666c6e --- /dev/null +++ b/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf --install --force --symlink || exit 1 diff --git a/xml-signer.spec b/xml-signer.spec new file mode 100644 index 0000000..c0286dc --- /dev/null +++ b/xml-signer.spec @@ -0,0 +1,131 @@ +Name: xml-signer +Version: 1.0.1 +Release: 1%{?dist} +Summary: Credential signer for GENI +BuildArch: noarch +License: GENI Public License +URL: https://github.com/duerig/xml-signer +Source0: https://github.com/duerig/xml-signer/xml-signer-1.0.1.tar.gz +Group: Applications/Internet + +# BuildRequires: gettext +# Requires(post): info +# Requires(preun): info + +%description +Produce a signed XML documents inside the web browser. With a +certificate and private key loaded into the browser storage or +uploaded by the user an XML document can be signed and returned to +the original calling web page. + +%prep +%setup -q +#iconv -f iso8859-1 -t utf-8 -o ChangeLog.conv ChangeLog && mv -f ChangeLog.conv ChangeLog +#iconv -f iso8859-1 -t utf-8 -o THANKS.conv THANKS && mv -f THANKS.conv THANKS + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +%make_install +# Include the copyright file +install -m 0644 debian/copyright $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/copyright + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%attr(-, root, root) %doc AUTHORS INSTALL.centos README.md debian/copyright +%attr(-, root, root) %{_defaultdocdir}/%{name}/AUTHORS +%attr(-, root, root) %{_defaultdocdir}/%{name}/INSTALL.centos +%attr(-, root, root) %{_defaultdocdir}/%{name}/README.md +%attr(-, root, root) %{_defaultdocdir}/%{name}/copyright +%attr(-, root, root) %{_datadir}/%{name}/etc/apache2.conf +%attr(-, root, root) %{_datadir}/%{name}/www/emulab.html +%attr(-, root, root) %{_datadir}/%{name}/www/emulab.js +%attr(-, root, root) %{_datadir}/%{name}/www/error.js +%attr(-, root, root) %{_datadir}/%{name}/www/geni-auth.js +%attr(-, root, root) %{_datadir}/%{name}/www/index.html +%attr(-, root, root) %{_datadir}/%{name}/www/index.php +%attr(-, root, root) %{_datadir}/%{name}/www/lib/amelia.min.css +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/css/bootstrap-theme.css +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/css/bootstrap-theme.css.map +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/css/bootstrap-theme.min.css +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/css/bootstrap.css +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/css/bootstrap.css.map +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/css/bootstrap.min.css +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/fonts/glyphicons-halflings-regular.eot +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/fonts/glyphicons-halflings-regular.svg +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/fonts/glyphicons-halflings-regular.woff +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/js/bootstrap.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/bootstrap/js/bootstrap.min.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/cyborg.min.css +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/aes.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/aesCipherSuites.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/asn1.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/debug.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/des.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/forge.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/form.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/hmac.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/http.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/jsbn.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/log.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/md.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/md5.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/mgf.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/mgf1.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/oids.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pbe.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pbkdf2.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pem.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pkcs1.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pkcs12.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pkcs7.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pkcs7asn1.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pki.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/prime.worker.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/prng.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/pss.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/random.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/rc2.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/rsa.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/sha1.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/sha256.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/socket.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/task.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/tls.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/tlssocket.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/util.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/x509.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/forge/xhr.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/jquery-1.8.2.min.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/underscore-min.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xml-crypto/enveloped-signature.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xml-crypto/exclusive-canonicalization.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xml-crypto/signed-xml.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xml-crypto/utils.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xml-crypto/xpath.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xmldom/dom-parser.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xmldom/dom.js +%attr(-, root, root) %{_datadir}/%{name}/www/lib/xmldom/sax.js +%attr(-, root, root) %{_datadir}/%{name}/www/require-jquery.js +%attr(-, root, root) %{_datadir}/%{name}/www/signer.css +%attr(-, root, root) %{_datadir}/%{name}/www/template/authorize.html +%attr(-, root, root) %{_datadir}/%{name}/www/template/credential.txt +%attr(-, root, root) %{_datadir}/%{name}/www/template/no-key.html +%attr(-, root, root) %{_datadir}/%{name}/www/text.js +%attr(-, root, root) %{_datadir}/%{name}/www/tool.html +%attr(-, root, root) %{_datadir}/%{name}/www/xml-signer.js + +%changelog +* Thu Sep 25 2014 Tom Mitchell - 1.0.1-1%{?dist} +- RPM packaging +* Fri Sep 19 2014 Tom Mitchell - 1.0-1%{?dist} +- Add new optional authentication protocol +- Add advanced mode to simplify UI +- UI Cleanups