Rename the AUR software to aurweb

Rename the project to help differentiate between the software providing
access to the Arch User Repository and the collection of source packages
itself.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

AUTHORS

@@ -17,7 +17,7 @@ Past Maintainers
 Contributors
 ------------
 
-Use `git shortlog -s` for a list of AUR contributors.
+Use `git shortlog -s` for a list of aurweb contributors.
 
 Translations
 ------------

INSTALL

@@ -4,7 +4,7 @@ Setup on Arch Linux
 1) Clone the AUR project:
 
    $ cd /srv/http/
-   $ git clone git://projects.archlinux.org/aur.git
+   $ git clone git://projects.archlinux.org/aurweb.git
 
 2) Setup a web server with PHP and MySQL. Configure the web server to redirect
    all URLs to /index.php/foo/bar/. The following block can be used with nginx:
@@ -17,15 +17,15 @@ Setup on Arch Linux
 
 4) Create a new MySQL database and a user and import the AUR SQL schema:
 
-   $ mysql -uaur -p AUR </srv/http/aur/schema/aur-schema.sql
+   $ mysql -uaur -p AUR </srv/http/aurweb/schema/aur-schema.sql
 
 5) Generate templates for new Git repositories:
 
-   $ /srv/http/aur/scripts/git-integration/gen-templates.py
+   $ /srv/http/aurweb/scripts/git-integration/gen-templates.py
 
-6) Clone the OpenSSH project, apply the AUR sshd patch and run `make`:
+6) Clone the OpenSSH project, apply the aurweb sshd patch and run `make`:
 
-   $ cd /srv/http/aur/
+   $ cd /srv/http/aurweb/
    $ git clone git://anongit.mindrot.org/openssh.git
    $ cd openssh
    $ git checkout V_6_7_P1
@@ -36,7 +36,7 @@ Setup on Arch Linux
 
 7) Create and edit the sshd configuration:
 
-   $ cd /srv/http/aur/
+   $ cd /srv/http/aurweb/
    $ umask 077
    $ mkdir .ssh/
    $ ssh-keygen -f .ssh/ssh_host_rsa_key -N '' -t rsa
@@ -44,12 +44,12 @@ Setup on Arch Linux
 
 8) Create a new user and change ownership of the .ssh directory:
 
-   # useradd -U -d /srv/http/aur -c 'AUR user' aur
+   # useradd -U -d /srv/http/aurweb -c 'AUR user' aur
-   # chown aur:aur /srv/http/aur/.ssh/
+   # chown aur:aur /srv/http/aurweb/.ssh/
 
 9) Add, enable and start systemd unit files for the new sshd:
 
-   # cp /srv/http/aur/conf/aur-sshd.socket /etc/systemd/system/
+   # cp /srv/http/aurweb/conf/aur-sshd.socket /etc/systemd/system/
-   # cp /srv/http/aur/conf/aur-sshd@.service /etc/systemd/system/
+   # cp /srv/http/aurweb/conf/aur-sshd@.service /etc/systemd/system/
    # systemctl enable aur-sshd.socket
    # systemctl start aur-sshd.socket

README

@@ -1,12 +1,12 @@
-Arch User Repository (AUR)
+aurweb
-==========================
+======
 
-The Arch User Repository (AUR) is a framework for hosting a collection of
+aurweb is a framework for hosting the Arch User Repository (AUR), a collection
-packaging scripts that are created and submitted by the Arch community. The
+of packaging scripts that are created and submitted by the Arch Linux
-scripts contained in the repository (PKGBUILDs) can be built using makepkg and
+community. The scripts contained in the repository (PKGBUILDs) can be built
-installed via the Arch package manager pacman. The AUR project aims to provide
+using makepkg and installed via the Arch Linux package manager pacman. The
-the necessary web interface, database schema, and scripts for a multi-lingual
+aurweb project aims to provide the necessary web interface, database schema,
-community-driven repository.
+and scripts for a multi-lingual community-driven repository.
 
 Functionality
 -------------
@@ -25,7 +25,7 @@ Directory Layout
 ----------------
 
 po::
-	Translation files for strings in the AUR web interface.
+	Translation files for strings in the aurweb interface.
 
 scripts::
 	aurblup package blacklist tool. Scripts for AUR maintenance.
@@ -42,9 +42,9 @@ Links
 * The official repository is hosted at git://projects.archlinux.org/aur.git --
   see HACKING for information on submitting patches.
 
-* Discovered bugs can be submitted to the AUR bug tracker:
+* Discovered bugs can be submitted to the aurweb bug tracker:
   https://bugs.archlinux.org/index.php?project=2
 
-* Questions, comments, and patches related to the AUR can be sent to the AUR
+* Questions, comments, and patches related to aurweb can be sent to the aurweb
   development mailing list: aur-dev@archlinux.org -- mailing list archives:
   https://mailman.archlinux.org/mailman/listinfo/aur-dev

TRANSLATING

@@ -1,31 +1,31 @@
-AUR Translation
+aurweb Translation
-================
+==================
 
-This document describes how to create and maintain AUR translations. It was
+This document describes how to create and maintain aurweb translations. It was
-originally derived from https://wiki.archlinux.org/index.php/AUR_Translation
+originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation
 
-Creating an AUR translation requires a Transifex (http://www.transifex.com/)
+Creating an aurweb translation requires a Transifex (http://www.transifex.com/)
-account. You will need to register with a translation team on the AUR project
+account. You will need to register with a translation team on the aurweb
-page (http://www.transifex.com/projects/p/aur/).
+project page (http://www.transifex.com/projects/p/aurweb/).
 
 
 Creating a New Translation
----------------------------
+--------------------------
 
 Before beginning, please sign up for an Transifex account and request the
-addition of a new translation team for the AUR project. Also, please do not
+addition of a new translation team for the aurweb project. Also, please do not
 translate if you are unwilling to maintain or find someone to maintain the
-translation. This is due to the fact that the AUR is a rapidly evolving project
+translation. This is due to the fact that aurweb is a rapidly evolving project
 and there are constantly new strings to be translated. If the translations get
 too out of sync with the released versions, there will be too many untranslated
 strings for the translation to be usable, and it may have to be disabled.
 
-1. Check out the AUR source using git:
+1. Check out the aurweb source using git:
 
-$ git clone git://projects.archlinux.org/aur.git aur-git
+$ git clone git://projects.archlinux.org/aurweb.git aurweb-git
 
-2. Go into the "po/" directory in the AUR source and run msginit(1) to create a
+2. Go into the "po/" directory in the aurweb source and run msginit(1) to
-   initial translation file from our translation catalog:
+   create a initial translation file from our translation catalog:
 
 $ cd aur-git
 $ git checkout master
@@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot
 
 $ poedit <locale>.po
 
-5. If you have a working AUR setup, add a line for the new translation in
+5. If you have a working aurweb setup, add a line for the new translation in
    "web/lib/config.inc.php.proto" and test if everything looks right.
 
 6. Upload the newly created ".po" file to Transifex. If you don't like the web
@@ -45,7 +45,7 @@ $ poedit <locale>.po
 
 
 Updating an Existing Translation
----------------------------------
+--------------------------------
 
 1. Download current translation files from Transifex. You can also do this
    using transifex-client which is available through the AUR:

conf/aur-sshd@.service

@@ -2,7 +2,7 @@
 Description=AUR OpenSSH Per-Connection Daemon
 
 [Service]
-ExecStart=-/srv/http/aur/openssh/sshd -i -f /srv/http/aur/.ssh/sshd_config
+ExecStart=-/srv/http/aurweb/openssh/sshd -i -f /srv/http/aurweb/.ssh/sshd_config
 User=aur
 StandardInput=socket
 StandardError=syslog

conf/cgitrc.proto

@@ -19,11 +19,11 @@ cache-static-ttl=60
 
 root-title=AUR Package Repositories
 root-desc=Web interface to the AUR Package Repositories
-header=/srv/http/aur/web/template/cgit/header.html
+header=/srv/http/aurweb/web/template/cgit/header.html
-footer=/srv/http/aur/web/template/cgit/footer.html
+footer=/srv/http/aurweb/web/template/cgit/footer.html
 max-repodesc-length=50
 max-blob-size=2048
 max-stats=year
 enable-http-clone=1
 
-scan-path=/srv/http/aur/repos/
+scan-path=/srv/http/aurweb/repos/

conf/config.proto

@@ -29,18 +29,18 @@ auto_orphan_age = 15552000
 [auth]
 key-prefixes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519
 username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
-git-serve-cmd = /srv/http/aur/scripts/git-integration/git-serve.py
+git-serve-cmd = /srv/http/aurweb/scripts/git-integration/git-serve.py
 ssh-options = no-port-forwarding,no-X11-forwarding,no-pty
 
 [serve]
-repo-base = /srv/http/aur/repos/
+repo-base = /srv/http/aurweb/repos/
 repo-regex = [a-z0-9][a-z0-9.+_-]*$
-template-path =  /srv/http/aur/scripts/git-integration/templates/
+template-path =  /srv/http/aurweb/scripts/git-integration/templates/
-git-update-hook = /srv/http/aur/scripts/git-integration/git-update.py
+git-update-hook = /srv/http/aurweb/scripts/git-integration/git-update.py
 git-shell-cmd = /usr/bin/git-shell
 ssh-cmdline = ssh -p 2222 aur@aur.archlinux.org
 
 [aurblup]
-db-path = /srv/http/aur/scripts/aurblup/
+db-path = /srv/http/aurweb/scripts/aurblup/
 sync-dbs = core extra community multilib testing community-testing
 servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64

po/Makefile

@@ -49,7 +49,7 @@ POTFILES:
 
 update-pot: POTFILES
 	pkgname=AUR; \
-	pkgver=`sed -n 's/.*"AUR_VERSION", "\(.*\)".*/\1/p' ../web/lib/version.inc.php`; \
+	pkgver=`sed -n 's/.*"AURWEB_VERSION", "\(.*\)".*/\1/p' ../web/lib/version.inc.php`; \
 	xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \
 		--no-location --add-comments=TRANSLATORS: \
 		--package-name="$$pkgname" --package-version="$$pkgver" \

scripts/git-integration/sshd_config

@@ -2,5 +2,5 @@ Port 2222
 HostKey ~/.ssh/ssh_host_rsa_key
 PasswordAuthentication no
 UsePrivilegeSeparation no
-AuthorizedKeysCommand /srv/http/aur/scripts/git-integration/git-auth.py
+AuthorizedKeysCommand /srv/http/aurweb/scripts/git-integration/git-auth.py
 AuthorizedKeysCommandUser aur

web/README

@@ -1,104 +0,0 @@
-==============
-AUR Web Interface
-==============
-
-Terms and Definitions:
-================
-AUR - Arch User Repository
-	Repository made up of a collection of build scripts that are
-	created and submitted by the Arch community.
-
-TU - Trusted User
-	A user that can add binary packages to the [community]
-	repository and administer AUR.
-
-[unsupported]
-	The collection of package build files hosted via the AUR website.
-
-File Hierachy
-=========
-
-Directory Layout:
--------------------
-./html			- DocumentRoot for AUR, where the PHP scripts live.
-./html/css		- CSS for AUR appearance
-./html/css/navbar	- CSS for Arch navigation bar appearance
-./html/images		- Any AUR images live here.
-./lib			- Supporting PHP include files. Access denied to Apache.
-./locale
-./template		- Where most of the html markup resides and minimal
-			amount of PHP scripting.
-./template/stats
-
-./html Files:
--------------
-account.php -
-	PHP script to handle registering for a new account.  It prompts
-	the visitor for account information: desired username, E-mail,
-	password, real name, IRC nick, and default language. The info is
-	recorded in the Users table.
-
-	A logged-in user can change any of their own account information. If a
-	TU or Developer is logged into the system, they can search for and
-	edit accounts. A TU can change an account to a TU or User account. A
-	Developer can also change an account to the Developer type. TUs and
-	Developers are able to suspend accounts. If an account is suspended,
-	all packages are orphaned (the MaintainerUID field in the Packages
-	table is set to NULL).
-
-addvote.php -
-	A form to submit proposals relating to the AUR. Only accessible to TUs
-	and Developers. Can be used to vote on a potential new TU, or any
-	other proposal that needs a vote. Length of the vote can be specified.
-
-index.php -
-	Main page for the AUR. Provides links to all other pages in the AUR.
-	Gives a brief synopsis of what the AUR is and where to go for more
-	information.
-
-logout.php -
-	Logs out a logged-in user. Clears the session id from the Sessions
-	table and unsets the cookie.
-
-packages.php -
-	Page used to search the package database. Supports searching by name,
-	category, maintainer, popularity, etc. Also provides the ability to go
-	to a package page which has specific information for that package.
-	A specific package page includes the name, description, votes, etc.
-	As well as the ability to perform actions on the packages, such as
-	flagging or leaving a comment on the package.
-
-passreset.php -
-	A page for a user to enter their e-mail and receive a reset e-mail to
-	replace the forgotten password.
-
-pkgsubmit.php -
-	Page for users to upload a new package. Only allows upload of a
-	tarball that has been compressed with gzip. Tarball must contain the
-	PKGBUILD, scriptlets, and any other files necessary to build the
-	package from source. The user can select a category for the package.
-	The page makes appropriate entries into the database for tracking the
-	newly added source package and associated information.
-
-rpc.php -
-	A frontend for tools to obtain raw information from the AUR. Features
-	the ability to search for a package, return information on a package,
-	return information on multiple packages, and search for a specific
-	package maintainer. Functionality through HTTP GET.
-
-rss.php -
-	Generates RDF Site Summary (RSS) feed with the latest packages updated
-	in the AUR. Lists most recent 20 packages. Includes package name, link
-	to package page, package description, time of update, source listing,
-	maintainer name.
-
-tu.php -
-	Page only available to TUs and Developers. Shows ongoing votes for
-	proposals and past votes for proposals. Current votes can be voted on
-	with a "Yes" vote, "No" vote, or an "Abstain" vote. Developers and TUs
-	can only vote once. Cannot vote on a proposal about themselves.
-
-voters.php -
-	Page only available to TUs and Developers. Shows list of users that
-	voted for a specific package. Each username links to the user's
-	account information page.

web/html/404.php

@@ -11,4 +11,4 @@ html_header( __("Page Not Found") );
 </div>
 
 <?php
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/html/account.php

@@ -136,6 +136,6 @@ if (isset($_COOKIE["AURSID"])) {
 
 echo "</div>";
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 
 ?>

web/html/addvote.php

@@ -113,5 +113,5 @@ if (has_credential(CRED_TU_ADD_VOTE)) {
 	print __("You are not allowed to access this area.");
 }
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 

web/html/comaintainers.php

@@ -16,6 +16,6 @@ if (!isset($base_id) || !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(p
 html_header(__("Manage Co-maintainers"));
 $users = pkgbase_get_comaintainers($base_id);
 include('comaintainers_form.php');
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 
 

web/html/css/aurweb.css

@@ -1,4 +1,5 @@
-/* AUR-specific customizations to "archweb.css". */
+/* aurweb-specific customizations to archweb.css */
+
 #archnavbar.anb-aur ul li#anb-aur a {
     color: white !important;
 }

web/html/home.php

@@ -45,7 +45,7 @@ html_header( __("Home") );
 			<p>
 			<?php
 			echo __(
-				'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR, use the %saur-dev%s mailing list.',
+				'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.',
 				'<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">',
 				'</a>',
 				'<var>',
@@ -129,4 +129,4 @@ $(document).ready(function() {
 });
 </script>
 <?php
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/html/index.php

@@ -143,7 +143,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 } else {
 	switch ($path) {
 	case "/css/archweb.css":
-	case "/css/aur.css":
+	case "/css/aurweb.css":
 	case "/css/cgit.css":
 	case "/css/archnavbar/archnavbar.css":
 		header("Content-Type: text/css");

web/html/login.php

@@ -53,4 +53,4 @@ html_header('AUR ' . __("Login"));
 	<?php endif; ?>
 </div>
 <?php
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/html/packages.php

@@ -99,5 +99,5 @@ if (isset($pkgid)) {
 	}
 }
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 

web/html/passreset.php

@@ -109,4 +109,4 @@ html_header(__("Password Reset"));
 
 <?php
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/html/pkgbase.php

@@ -155,5 +155,5 @@ if (isset($_COOKIE["AURSID"])) {
 	pkgbase_display_details($base_id, $details, null);
 }
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 

web/html/pkgdel.php

@@ -45,4 +45,4 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 	print __("Only Trusted Users and Developers can delete packages.");
 endif;
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/html/pkgmerge.php

@@ -66,4 +66,4 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
 	print __("Only Trusted Users and Developers can merge packages.");
 endif;
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/html/pkgreq.php

@@ -80,5 +80,5 @@ if (isset($base_id)) {
 	include('pkgreq_results.php');
 }
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 

web/html/tu.php

@@ -121,5 +121,5 @@ else {
 	header('Location: /');
 }
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);
 

web/html/voters.php

@@ -31,4 +31,4 @@ if (has_credential(CRED_PKGBASE_LIST_VOTERS)):
 <?php
 endif;
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);

web/lib/version.inc.php

@@ -1,3 +1,3 @@
 <?php
-define("AUR_VERSION", "v3.5.1");
+define("AURWEB_VERSION", "v3.5.1");
 

web/template/cgit/footer.html

@@ -1,6 +1,6 @@
 <div id="footer">
 	<p>
-		Copyright &copy; 2004-2014 AUR Development Team &ndash;
+		Copyright &copy; 2004-2014 aurweb Development Team &ndash;
 		<strong>Unsupported packages are user produced content. Any use of the provided files is at your own risk.</strong>
 	</p>
 </div>

web/template/footer.php

@@ -3,9 +3,9 @@
 
 			<div id="footer">
 				<?php if ($ver): ?>
-				<p>AUR <?= htmlspecialchars($ver) ?></p>
+				<p>aurweb <?= htmlspecialchars($ver) ?></p>
 				<?php endif; ?>
-				<p>Copyright &copy; 2004-<?= date("Y") ?> AUR Development Team.</p>
+				<p>Copyright &copy; 2004-<?= date("Y") ?> aurweb Development Team.</p>
 				<p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p>
 			</div>
 		</div>

web/template/header.php

@@ -6,7 +6,7 @@
   <head>
     <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
 	<link rel='stylesheet' type='text/css' href='/css/archweb.css' />
-	<link rel='stylesheet' type='text/css' href='/css/aur.css' />
+	<link rel='stylesheet' type='text/css' href='/css/aurweb.css' />
 	<link rel='shortcut icon' href='/images/favicon.ico' />
 	<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' />
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

web/template/template.phps

@@ -16,5 +16,5 @@ html_header();              # print out the HTML header
 print __("Hi, this is worth reading!")."<br />\n";
 
 
-html_footer(AUR_VERSION);
+html_footer(AURWEB_VERSION);