- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] git-update: Notify privileged users of forced uploads
by Lukas Fleischer 01 Aug '16

01 Aug '16

Show a warning when a Trusted User or a developer creates a package that is blacklisted or already provided by an official package. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 2c24e72..41b38a6 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -202,6 +202,7 @@ repo = pygit2.Repository(repo_path) user = os.environ.get("AUR_USER") pkgbase = os.environ.get("AUR_PKGBASE") privileged = (os.environ.get("AUR_PRIVILEGED", '0') == '1') +warn_or_die = warn if privileged else die if len(sys.argv) == 2 and sys.argv[1] == "restore": if 'refs/heads/' + pkgbase not in repo.listall_references(): @@ -338,11 +339,11 @@ for pkgname in srcinfo.utils.get_package_names(metadata): pkginfo = srcinfo.utils.get_merged_package(pkgname, metadata) pkgname = pkginfo['pkgname'] - if pkgname in blacklist and not privileged: - die('package is blacklisted: {:s}'.format(pkgname)) - if pkgname in providers and not privileged: + if pkgname in blacklist: + warn_or_die('package is blacklisted: {:s}'.format(pkgname)) + if pkgname in providers: repo = providers[pkgname] - die('package already provided by [{:s}]: {:s}'.format(repo, pkgname)) + warn_or_die('package already provided by [{:s}]: {:s}'.format(repo, pkgname)) cur.execute("SELECT COUNT(*) FROM Packages WHERE Name = %s AND " + "PackageBaseID <> %s", [pkgname, pkgbase_id]) -- 2.9.0

1 0

[aur-dev] [PATCH] git-serve: Refactor environment variable access
by Lukas Fleischer 01 Aug '16

01 Aug '16

Read all environment variables at the beginning of the script and immediately pre-process their values. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 35c6b3a..aa5f1c9 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -108,15 +108,12 @@ def pkgbase_set_keywords(pkgbase, keywords): db.close() -def check_permissions(pkgbase, user): +def pkgbase_has_write_access(pkgbase, user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, unix_socket=aur_db_socket, buffered=True) cur = db.cursor() - if os.environ.get('AUR_PRIVILEGED', '0') == '1': - return True - cur.execute("SELECT COUNT(*) FROM PackageBases " + "LEFT JOIN PackageComaintainers " + "ON PackageComaintainers.PackageBaseID = PackageBases.ID " + @@ -136,15 +133,18 @@ def die_with_help(msg): die(msg + "\nTry `{:s} help` for a list of commands.".format(ssh_cmdline)) -user = os.environ.get("AUR_USER") -cmd = os.environ.get("SSH_ORIGINAL_COMMAND") -if not cmd: +user = os.environ.get('AUR_USER') +privileged = (os.environ.get('AUR_PRIVILEGED', '0') == '1') +ssh_cmd = os.environ.get('SSH_ORIGINAL_COMMAND') +ssh_client = os.environ.get('SSH_CLIENT') + +if not ssh_cmd: die_with_help("Interactive shell is disabled.") -cmdargv = shlex.split(cmd) +cmdargv = shlex.split(ssh_cmd) action = cmdargv[0] +remote_addr = ssh_client.split(' ')[0] if ssh_client else None if enable_maintenance: - remote_addr = os.environ["SSH_CLIENT"].split(" ")[0] if remote_addr not in maintenance_exc: die("The AUR is down due to maintenance. We will be back soon.") @@ -165,7 +165,7 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': create_pkgbase(pkgbase, user) if action == 'git-receive-pack': - if not check_permissions(pkgbase, user): + if not privileged and not pkgbase_has_write_access(pkgbase, user): die('{:s}: permission denied: {:s}'.format(action, user)) os.environ["AUR_USER"] = user -- 2.9.0

1 0

[aur-dev] [PATCH] Make LangPreference DB field wide enough to fit es_419
by Johannes Löthberg 20 Jul '16

20 Jul '16

The language code for Latin American Spanish is es_419, which is longer than the 5 characters previously allowed. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- schema/aur-schema.sql | 2 +- upgrading/4.3.0.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 1affc25..9991129 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -31,7 +31,7 @@ CREATE TABLE Users ( Salt CHAR(32) NOT NULL DEFAULT '', ResetKey CHAR(32) NOT NULL DEFAULT '', RealName VARCHAR(64) NOT NULL DEFAULT '', - LangPreference VARCHAR(5) NOT NULL DEFAULT 'en', + LangPreference VARCHAR(6) NOT NULL DEFAULT 'en', Homepage TEXT NULL DEFAULT NULL, IRCNick VARCHAR(32) NOT NULL DEFAULT '', PGPKey VARCHAR(40) NULL DEFAULT NULL, diff --git a/upgrading/4.3.0.txt b/upgrading/4.3.0.txt index 6c1753d..78f9455 100644 --- a/upgrading/4.3.0.txt +++ b/upgrading/4.3.0.txt @@ -21,3 +21,9 @@ ALTER TABLE OfficialProviders ADD COLUMN Repo VARCHAR(64) NOT NULL; ---- ALTER TABLE Users ADD COLUMN Homepage TEXT NULL DEFAULT NULL; ---- + +5. Resize LangPreference to fit Latin American Spanish language code: + +-- +ALTER TABLE Users MODIFY LangPreference VARCHAR(6); +-- -- 2.9.0

1 0

[aur-dev] [PATCH] Remove wearout factor from translatable string
by Lukas Fleischer 15 Jul '16

15 Jul '16

Even though that number is hardcoded in the source code, it is better to make it not appear in the message catalog such that it can be made configurable easily later. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_search_results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index 3046c25..37a9032 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -35,7 +35,7 @@ if (!$result): ?> <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> <th><?= __("Version") ?></th> <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> - <th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a>" class="hover-help">?</th> + <th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a>" class="hover-help">?</th> <?php if ($SID): ?> <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> <th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th> -- 2.9.0

1 0

[aur-dev] [PATCH] Add RTL Support
by safaalfulaij 15 Jul '16

15 Jul '16

Add Right-To-Left layout support. Signed-off-by: Safa AlFulaij <safa1996alfulaij(a)gmail.com> --- web/html/css/archweb.css | 193 +++++++++++++++++++++++++++++++++++++++++++++ web/html/css/aurweb.css | 14 ++++ web/lib/aur.inc.php | 1 + web/lib/translator.inc.php | 10 +++ web/template/header.php | 4 +- 5 files changed, 221 insertions(+), 1 deletion(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index b7d6e1e..a908049 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -58,6 +58,12 @@ ul { padding-left: 2em; } +html[dir="rtl"] ol, +ul { + padding-left: auto; + padding-right: 2em; +} + ul { list-style: square; } @@ -152,6 +158,11 @@ a.headerlink { padding-left: 0.5em; } +html[dir="rtl"] a.headerlink { + padding-left: auto; + padding-right: 0.5em; +} + h3:hover > a.headerlink { visibility: visible; } @@ -185,11 +196,21 @@ h5 { text-align: left; } +html[dir="rtl"] #content { + text-align: right; +} + #content-left-wrapper { float: left; width: 100%; /* req to keep content above sidebar in source code */ } +html[dir="rtl"] #content-left-wrapper { + float: right; + margin-left: auto; + margin-right: -340px; +} + #content-left { margin: 0 340px 0 0; } @@ -200,6 +221,11 @@ h5 { margin-left: -300px; } +html[dir="rtl"] #content-right { + margin-left: auto; + margin-right: -300px; +} + div.box { margin-bottom: 1.5em; padding: 0.65em; @@ -249,6 +275,11 @@ td { text-align: left; } +html[dir="rtl"] th, +td { + text-align: right; +} + th { vertical-align: middle; font-weight: bold; @@ -325,6 +356,12 @@ dl { padding-right:15px; } + html[dir="rtl"] dl dt { + float:right; + padding-right: auto; + padding-left: 15px; + } + /* forms and input styling */ form p { margin: 0.5em 0; @@ -409,6 +446,11 @@ table th.tablesorter-header { cursor: pointer; } +html[dir="rtl"] table th.tablesorter-header { + padding-right: auto; + padding-left: 20px; +} + table thead th.tablesorter-headerAsc { background-color: #e4eeff; background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); @@ -435,6 +477,10 @@ table thead th.sorter-false { text-align: right; } +html[dir="rtl"] #intro p.readmore { + text-align: left; +} + /* home: news */ #news { margin-top: 1.5em; @@ -444,6 +490,10 @@ table thead th.sorter-false { float: left; padding-bottom: .5em } + + html[dir="rtl"] #news h3 { + float: right; + } #news div { margin-bottom: 1em; @@ -462,6 +512,10 @@ table thead th.sorter-false { margin-top: 1em; } + html[dir="rtl"] #news .rss-icon { + float: left; + } + #news h4 { clear: both; font-size: 1em; @@ -474,6 +528,10 @@ table thead th.sorter-false { font-size: 0.85em; margin: -1.8em 0.5em 0 0; } + + html[dir="rtl"] #news .timestamp { + float: left; + } /* home: arrowed headings */ #news h3 a { @@ -521,6 +579,11 @@ h3 span.arrow { background: #fff; border: 1px solid #09c; } + + html[dir="rtl"] #pkgsearch input { + float: left; + direction: ltr; + } .pkgsearch-typeahead { position: absolute; @@ -560,6 +623,10 @@ h3 span.arrow { float: right; margin: -2em 0 0 0; } + + html[dir="rtl"] #pkg-updates .rss-icon { + float: left; + } #pkg-updates table { margin: 0; @@ -568,11 +635,20 @@ h3 span.arrow { #pkg-updates td.pkg-name { white-space: normal; } + + html[dir="rtl"] #pkg-updates td.pkg-name { + direction: ltr; + text-align: left; + } #pkg-updates td.pkg-arch { text-align: right; } + html[dir="rtl"] #pkg-updates td.pkg-arch { + text-align: left; + } + #pkg-updates span.testing { font-style: italic; } @@ -610,12 +686,22 @@ div.widget { opacity: 0.6; } +html[dir="rtl"] #konami { + left: auto; + right: 0; +} + /* feeds page */ #rss-feeds .rss { padding-right: 20px; background: url(rss.png) top right no-repeat; } +html[dir="rtl"] #rss-feeds .rss { + padding-right: auto; + padding-left: 20px; +} + /* artwork: logo images */ #artwork img.inverted { background: #333; @@ -633,6 +719,10 @@ div.widget { margin-top: -2.2em; } +html[dir="rtl"] .news-nav { + float: left; +} + .news-nav .prev, .news-nav .next { margin: 0 1em; @@ -665,6 +755,10 @@ div.news-article .article-info { min-width: 20em; } + html[dir="rtl"] #donor-list li { + float: right; + } + /* download page */ #arch-downloads h3 { border-bottom: 1px dotted #bbb; @@ -684,10 +778,21 @@ table.results { background-color:#fff; } + html[dir="rtl"] .results th { + padding-right: 0.25em; + padding-left: 1em; + } + .results td { padding: .3em 1em .3em 3px; } + html[dir="rtl"] .results td { + padding-right: 3px; + padding-left: 1em; + direction: ltr; + } + .results tr.odd { background: #fff; } @@ -715,14 +820,28 @@ table.results { margin-top: -2.2em; } +html[dir="rtl"] #pkglist-results .pkglist-nav { + float: left; +} + .pkglist-nav .prev { margin-right: 1em; } +html[dir="rtl"] .pkglist-nav .prev { + margin-right: auto; + margin-left: 1em; +} + .pkglist-nav .next { margin-right: 1em; } +html[dir="rtl"] .pkglist-nav .next { + margin-right: auto; + margin-left: 1em; +} + /* search fields and other filter selections */ .filter-criteria { margin-bottom: 1em; @@ -739,6 +858,12 @@ table.results { font-size: 0.85em; } +html[dir="rtl"] .filter-criteria div { + float: right; + margin-right: auto; + margin-left: 1.65em; +} + .filter-criteria legend { display: none; } @@ -754,6 +879,10 @@ table.results { float: right; } +html[dir="rtl"] #pkgdetails #detailslinks { + float: left; +} + #pkgdetails #detailslinks h4 { margin-top: 0; margin-bottom: 0.25em; @@ -787,6 +916,11 @@ table.results { #pkgdetails #pkginfo td { padding: 0.25em 0 0.25em 1.5em; } + + html[dir="rtl"] #pkgdetails #pkginfo td { + padding-left: auto; + padding-right: 1.5em; + } #pkgdetails #pkginfo .userdata { font-size: 0.85em; @@ -826,10 +960,21 @@ table.results { padding-left: 0.5em; } +html[dir="rtl"] #pkgdetails #metadata li { + padding-left: auto; + padding-right: 0.5em; + direction: ltr; +} + #pkgdetails #metadata p { padding-left: 0.5em; } +html[dir="rtl"] #pkgdetails #metadata p { + padding-left: auto; + padding-right: 0.5em; +} + #pkgdetails #metadata .message { font-style: italic; } @@ -844,6 +989,12 @@ table.results { margin-right: 2%; } +html[dir="rtl"] #pkgdetails #pkgdeps { + float: right; + margin-right: auto; + margin-left: 2%; +} + #pkgdetails #metadata .virtual-dep, #pkgdetails #metadata .testing-dep, #pkgdetails #metadata .staging-dep, @@ -858,11 +1009,19 @@ table.results { width: 50%; } +html[dir="rtl"] #pkgdetails #pkgreqs { + float: right; +} + #pkgdetails #pkgfiles { clear: left; padding-top: 1em; } +html[dir="rtl"] #pkgdetails #pkgfiles { + clear: right; +} + #pkgfilelist li.d { color: #666; } @@ -881,6 +1040,11 @@ table td.country { padding-left: 0; } +html[dir="rtl"] #list-generator div ul { + padding-left: auto; + padding-right: 0; +} + #list-generator div ul li { display: inline; } @@ -925,6 +1089,11 @@ table td.country { padding-top: 2.25em; } + html[dir="rtl"] .arch-bio-entry td.pic { + padding-right: auto; + padding-left: 15px; + } + .arch-bio-entry td.pic img { padding: 4px; border: 1px solid #ccc; @@ -947,6 +1116,12 @@ table td.country { vertical-align: top; white-space: nowrap; } + + html[dir="rtl"] .arch-bio-entry table.bio th { + text-align: left; + padding-right: auto; + padding-left: 0.5em; + } .arch-bio-entry table.bio td { width: 100%; @@ -968,6 +1143,10 @@ table td.country { border-top: 1px dotted #bbb; } +html[dir="rtl"] #dash-pkg-notify { + text-align: left; +} + #dash-pkg-notify label { width: auto; font-weight: normal; @@ -997,11 +1176,20 @@ ul.admin-actions { margin-top: -2.5em; } +html[dir="rtl"] ul.admin-actions { + float: left; +} + ul.admin-actions li { display: inline; padding-left: 1.5em; } + html[dir="rtl"] ul.admin-actions li { + padding-left: auto; + padding-right: 1.5em; + } + /* colored yes/no type values */ .todo-table .complete, .signoff-yes, @@ -1065,6 +1253,11 @@ ul.signoff-list { padding-left: 1em; } +html[dir="rtl"] #releng-feedback ul { + padding-left: auto; + padding-right: 1em; +} + #releng-feedback li { list-style: none; } diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index f777ab8..b1cd561 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -12,6 +12,10 @@ float: right; } +html[dir="rtl"] #lang_sub { + float: left; +} + .pkglist-nav .page { margin: 0 .25em; } @@ -45,6 +49,10 @@ text-align:right; } +html[dir="rtl"] #pkg-updates td.pkg-date { + text-align: left; +} + .keyword:link, .keyword:visited { float: left; margin: 1px .5ex 1px 0; @@ -55,6 +63,12 @@ border-radius: 2px; } +html[dir="rtl"] .keyword:link, .keyword:visited { + float: right; + margin-right: auto; + margin-left: 0.5em; +} + .keyword:hover { cursor: pointer; } diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 9015ae8..6fbb32e 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -355,6 +355,7 @@ function uid_from_sid($sid="") { */ function html_header($title="", $details=array()) { global $LANG; + global $LANG_DIRECTION; global $SUPPORTED_LANGS; include('header.php'); diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index d53bd53..0a422cf 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -52,6 +52,11 @@ $SUPPORTED_LANGS = array( "zh_TW" => "正體中文" ); +$RTL_LANGS = array( + "ar" => "Arabic", + "he" => "Hebrew" +); + function __() { global $LANG; global $l10n; @@ -85,6 +90,7 @@ function _n($msgid1, $msgid2, $n) { # function set_lang() { global $LANG; + global $LANG_DIRECTION = "ltr"; global $SUPPORTED_LANGS; global $streamer, $l10n; @@ -122,6 +128,10 @@ function set_lang() { $LANG = config_get('options', 'default_lang'); } + if array_key_exists($LANG, $RTL_LANGS) { + $LANG_DIRECTION = "rtl"; + } + if ($update_cookie) { $timeout = intval(config_get('options', 'persistent_cookie_timeout')); $cookie_time = time() + $timeout; diff --git a/web/template/header.php b/web/template/header.php index 874109a..4dab832 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -2,7 +2,9 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xml:lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>" lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>"> + xml:lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>" + lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>" + dir="<?= htmlspecialchars($LANG_DIRECTION, ENT_QUOTES) ?>"> <head> <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title> <link rel='stylesheet' type='text/css' href='/css/archweb.css' /> -- 2.9.0

3 3

[aur-dev] [PATCH] Fix Plural String
by safaalfulaij 14 Jul '16

14 Jul '16

Signed-off-by: Safa AlFulaij <safa1996alfulaij(a)gmail.com> --- web/template/pkgreq_results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 24ee877..b27963b 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -39,7 +39,7 @@ if (!$due) { $time_left = $idle_time - (time() - intval($row['RequestTS'])); if ($time_left > 48 * 3600) { - $time_left_fmt = __("~%d days left", round($time_left / (24 * 3600))); + $time_left_fmt = _n("~%d day left", "~%d days left", round($time_left / (24 * 3600))); } elseif ($time_left > 3600) { $time_left_fmt = _n("~%d hour left", "~%d hours left", round($time_left / 3600)); } else { -- 2.9.0

2 1

[aur-dev] [PATCH] Update the Git/SSH interface documentation
by Lukas Fleischer 12 Jul '16

12 Jul '16

Add information on the new set-keywords command and slightly reword some paragraphs. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- doc/git-interface.txt | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/doc/git-interface.txt b/doc/git-interface.txt index 69c558b..14ff0c5 100644 --- a/doc/git-interface.txt +++ b/doc/git-interface.txt @@ -22,15 +22,15 @@ Authentication: git-auth Pushing to package repositories is possible via SSH. In order to access the SSH interface, users first need to add an SSH public key to their account using the web interface. Authentication is performed by the git-auth -AuthorizedKeysCommand script (see sshd_config(5) for details) that looks up the -public key in the AUR user table. Using this concept of "virtual users", there -is no need to create separate UNIX accounts for each registered AUR user. +AuthorizedKeysCommand script (see sshd_config(5) for details) which looks up +the public key in the AUR user table. Using this concept of "virtual users", +there is no need to create separate UNIX accounts for each registered AUR user. If the public key is found, the corresponding authorized_keys line is printed to stdout. If the public key does not exist, the login is denied. The authorized_keys line also contains a forced command such that authenticated users cannot access anything on the server except for the aurweb SSH interface. -The forced command can be configured in the aurweb configuration file and +The forced command can be configured in the aurweb configuration file and it usually points to the git-serve program. The INSTALL file in the top-level directory contains detailed instructions on @@ -43,17 +43,18 @@ The git-serve command, the "aurweb shell", provides different subcommands: * The help command shows a list of available commands. * The list-repos command lists all repositories of the authenticated user. +* The set-keywords command modifies the keywords assigned to a package base. * The setup-repo command can be used to create a new repository. * The restore command can be used to restore a deleted package base. * The git-{receive,upload}-pack commands are redirected to git-shell(1). -The requested command is extracted from the SSH_ORIGINAL_COMMAND environment -variable which is usually set by the SSH daemon. If no command is specified, -git-serve displays a message that aurweb does not provide an interactive shell. +The command is extracted from the SSH_ORIGINAL_COMMAND environment variable +which is usually set by the SSH daemon. If no command is specified, git-serve +displays a message stating that aurweb does not provide an interactive shell. When invoking git-shell(1), the git-serve command also redirects all paths to the shared Git repository and sets up the GIT_NAMESPACE environment variable -such that Git updates the right namespaced branch. +such that Git updates the correct namespaced branch. The Update Hook: git-update --------------------------- @@ -62,7 +63,7 @@ The Git update hook, called git-update, performs several subtasks: * Prevent from creating branches or tags other than master. * Deny non-fast-forwards, except for Trusted Users and Developers. -* Check each new commit (validate meta data, impose file size limits, ...) +* Verify each new commit (validate meta data, impose file size limits, ...) * Update package base information and package information in the database. * Update the named branch and the namespaced HEAD ref of the package. @@ -74,9 +75,8 @@ Accessing Git repositories via HTTP Git repositories can also be accessed via HTTP by configuring the web server to forward specific requests to git-http-backend(1). Note that, since Git -namespaces are used internally, the web server also needs to rewrite URIs and -setup the GIT_NAMESPACE environment variable accordingly before forwarding a -request. +namespaces are used internally, the web server needs to rewrite URIs and setup +the GIT_NAMESPACE environment variable accordingly before forwarding a request. An example configuration for nginx and fcgiwrap can be found in the INSTALL instructions in the top-level directory. @@ -86,10 +86,11 @@ Further Configuration When using Git namespaces, Git advertises refs outside the current namespace as so-called "have" lines. This is normally used to reduce traffic but it has the -opposite effect in the case of aurweb: Many essentially useless lines are -transferred to the Git client during `git push` operations. - -In order to omit these advertisements, add the strings "^refs/", "!refs/" and -"!HEAD" to the transfer.hideRefs configuration setting. Note that the order of -these patterns is important ("^refs/" must come first) and that Git 2.7 or -newer is required for them to work. +opposite effect in the case of aurweb: Most of the refs transferred to the +client during `git push` operations belong to branches of other package bases +and are essentially useless. + +In order to omit these advertisements, one can add the strings "^refs/", +"!refs/" and "!HEAD" to the transfer.hideRefs configuration setting. Note that +the order of these patterns is important ("^refs/" must come first) and that +Git 2.7 or newer is required for them to work. -- 2.9.0

1 0

[aur-dev] [PATCH] notify: Fix check for 0 when sending req close notification
by Johannes Löthberg 30 Jun '16

30 Jun '16

528bf84 (Distinguish auto-accepted requests, 2016-06-30) reimplemented sending the message saying that the request was automatically accepted, but checks if the uid argument is false. The argument passed from PHP when a user didn't manually accept the request is '0' though, causing the request to not be sent properly. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- scripts/notify.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/notify.py b/scripts/notify.py index ac02a01..2819728 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -385,15 +385,15 @@ def request_close(cur, uid, reqid, reason): text = get_request_closure_comment(cur, reqid) subject = '[PRQ#%d] Request %s' % (int(reqid), reason.title()) - if uid: + if uid == '0': + body = 'Request #%d has been %s automatically by the Arch User ' \ + 'Repository package request system' % (int(reqid), reason) + refs = None + else: user = username_from_id(cur, uid) user_uri = aur_location + '/account/' + user + '/' body = 'Request #%d has been %s by %s [1]' % (int(reqid), reason, user) refs = '[1] ' + user_uri - else: - body = 'Request #%d has been %s automatically by the Arch User ' \ - 'Repository package request system' % (int(reqid), reason) - refs = None if text.strip() == '': body += '.' else: -- 2.9.0

2 1

[aur-dev] [PATCH] Make request type hints translatable
by Lukas Fleischer 25 Jun '16

25 Jun '16

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgreq_form.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php index 639326e..35dbef5 100644 --- a/web/template/pkgreq_form.php +++ b/web/template/pkgreq_form.php @@ -68,13 +68,13 @@ <textarea name="comments" id="id_comments" rows="5" cols="50"></textarea> - <?= 'By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.' ?> + <?= __('By submitting a deletion request, you ask a Trusted User to delete the package base. This type of request should be used for duplicates, software abandoned by upstream, as well as illegal and irreparably broken packages.') ?> - <?= 'By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.' ?> + <?= __('By submitting a merge request, you ask a Trusted User to delete the package base and transfer its votes and comments to another package base. Merging a package does not affect the corresponding Git repositories. Make sure you update the Git history of the target package yourself.') ?> - <?= 'By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.' ?> + <?= __('By submitting an orphan request, you ask a Trusted User to disown the package base. Please only do this if the package needs maintainer action, the maintainer is MIA and you already tried to contact the maintainer previously.') ?> <input type="submit" class="button" name="do_FileRequest" value="<?= __("Submit Request") ?>" /> -- 2.9.0

1 0

[aur-dev] [PATCH] Fixup for missing changes in 6ec4a3589
by Johannes Löthberg 25 Jun '16

25 Jun '16

Commit 6ec4a3589 forgot to change the usages of the display_account_form and process_account_form function to account for the new parameter, and forgot to add the new column to aur-schema.sql. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Accidentally broke editing account details. It took me way too long to figure this out.. schema/aur-schema.sql | 1 + web/html/account.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 0804ac3..4c495ea 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -40,6 +40,7 @@ CREATE TABLE Users ( RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, CommentNotify TINYINT(1) NOT NULL DEFAULT 1, UpdateNotify TINYINT(1) NOT NULL DEFAULT 0, + OwnershipNotify TINYINT(1) NOT NULL DEFAULT 1, PRIMARY KEY (ID), UNIQUE (Username), UNIQUE (Email), diff --git a/web/html/account.php b/web/html/account.php index 9007ace..c77aedb 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -36,7 +36,7 @@ if ($action == "UpdateAccount") { in_request("C"), in_request("R"), in_request("L"), in_request("I"), in_request("K"), in_request("PK"), in_request("J"), in_request("CN"), in_request("UN"), - in_request("ID"), $row["Username"]); + in_request("ON"), in_request("ID"), $row["Username"]); } } @@ -83,7 +83,8 @@ if (isset($_COOKIE["AURSID"])) { $row["HideEmail"], "", "", $row["RealName"], $row["LangPreference"], $row["IRCNick"], $row["PGPKey"], $PK, $row["InactivityTS"] ? 1 : 0, $row["CommentNotify"], - $row["UpdateNotify"], $row["ID"], $row["Username"]); + $row["UpdateNotify"], $row["OwnershipNotify"], + $row["ID"], $row["Username"]); } else { print __("You do not have permission to edit this account."); } @@ -124,7 +125,8 @@ if (isset($_COOKIE["AURSID"])) { in_request("I"), in_request("K"), in_request("PK"), in_request("J"), in_request("CN"), in_request("UN"), - in_request("ID"), $row["Username"]); + in_request("ON"), in_request("ID"), + $row["Username"]); } } else { -- 2.9.0

2 5