- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] git-update: Deny non-fast-forwards
by Lukas Fleischer 11 Jun '15

11 Jun '15

To make sure we never lose any history, non-fast-forwards are forbidden. Instead of relying on receive.denyNonFastForwards, add a simple check to the update hook. This has the added benefit of more flexibility. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 1 - git-interface/git-update.py | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 50405df..a2a6153 100644 --- a/INSTALL +++ b/INSTALL @@ -29,7 +29,6 @@ Setup on Arch Linux # cd /srv/http/aurweb/aur.git/ # git init --bare # ln -s ../../git-interface/git-update.py hooks/update - # git config --local receive.denyNonFastForwards true # chown -R aur . 7) Install the git-auth wrapper script: diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 7898f39..3f6cfc1 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -178,6 +178,15 @@ if refname != "refs/heads/master": die("pushing to a branch other than master is restricted") repo = pygit2.Repository(repo_path) + +# Detect and deny non-fast-forwards. +if sha1_old != "0000000000000000000000000000000000000000": + walker = repo.walk(sha1_old, pygit2.GIT_SORT_TOPOLOGICAL) + walker.hide(sha1_new) + if next(walker, None) != None: + die("denying non-fast-forward (you should pull first)") + +# Prepare the walker that validates new commits. walker = repo.walk(sha1_new, pygit2.GIT_SORT_TOPOLOGICAL) if sha1_old != "0000000000000000000000000000000000000000": walker.hide(sha1_old) -- 2.4.2

1 1

[aur-dev] [PATCH] Support exceptions in the maintenance mode
by Lukas Fleischer 11 Jun '15

11 Jun '15

Allow for excluding certain IP addresses from the maintenance mode. This allows administrators to view the web page while the site is still under maintenance for the rest of the world. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 1 + git-interface/git-serve.py | 5 ++++- web/html/index.php | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index e5da57a..628dac3 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -29,6 +29,7 @@ pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 +maintenance-exceptions = 127.0.0.1 [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 21b130c..a6dee13 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -22,6 +22,7 @@ git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') enable_maintenance = config.getboolean('options', 'enable-maintenance') +maintenance_exc = config.get('options', 'maintenance-exceptions').split() def pkgbase_exists(pkgbase): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, @@ -113,7 +114,9 @@ cmdargv = shlex.split(cmd) action = cmdargv[0] if enable_maintenance: - die("The AUR is down due to maintenance. We will be back soon.") + remote_addr = os.environ["SSH_CLIENT"].split(" ")[0] + if not remote_addr in maintenance_exc: + die("The AUR is down due to maintenance. We will be back soon.") if action == 'git-upload-pack' or action == 'git-receive-pack': if len(cmdargv) < 2: diff --git a/web/html/index.php b/web/html/index.php index 27f81c8..27d897c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -8,9 +8,11 @@ $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) { - header("HTTP/1.0 503 Service Unavailable"); - include "./503.php"; - return; + if (!in_array($_SERVER['REMOTE_ADDR'], explode(" ", config_get('options', 'maintenance-exceptions')))) { + header("HTTP/1.0 503 Service Unavailable"); + include "./503.php"; + return; + } } if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { -- 2.4.2

1 0

[aur-dev] [PATCH] Implement a maintenance mode
by Lukas Fleischer 11 Jun '15

11 Jun '15

Add support for a maintenance mode that disables both the website and the SSH interface and can be enabled easily using a configuration option. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 1 + git-interface/git-serve.py | 5 +++++ web/html/503.php | 15 +++++++++++++++ web/html/index.php | 6 ++++++ 4 files changed, 27 insertions(+) create mode 100644 web/html/503.php diff --git a/conf/config.proto b/conf/config.proto index 1d3e329..e5da57a 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -28,6 +28,7 @@ auto_delete_age = 86400 pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz +enable-maintenance = 1 [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 9812acb..21b130c 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -21,6 +21,8 @@ repo_regex = config.get('serve', 'repo-regex') git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') +enable_maintenance = config.getboolean('options', 'enable-maintenance') + def pkgbase_exists(pkgbase): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -110,6 +112,9 @@ if not cmd: cmdargv = shlex.split(cmd) action = cmdargv[0] +if enable_maintenance: + die("The AUR is down due to maintenance. We will be back soon.") + if action == 'git-upload-pack' or action == 'git-receive-pack': if len(cmdargv) < 2: die_with_help("%s: missing path" % (action)) diff --git a/web/html/503.php b/web/html/503.php new file mode 100644 index 0000000..80eb436 --- /dev/null +++ b/web/html/503.php @@ -0,0 +1,15 @@ +<?php + +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); + +html_header( __("Service Unavailable") ); +?> + +<div id="error-page" class="box 503"> + <h2>503 - <?= __("Service Unavailable") ?></h2> + <p><?= __("Don't panic! This site is down due to maintenance. We will be back soon.") ?></p> +</div> + +<?php +html_footer(AURWEB_VERSION); + diff --git a/web/html/index.php b/web/html/index.php index 0275d0a..27f81c8 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -7,6 +7,12 @@ include_once("pkgfuncs.inc.php"); $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); +if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) { + header("HTTP/1.0 503 Service Unavailable"); + include "./503.php"; + return; +} + if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { if (!empty($tokens[2])) { /* TODO: Create a proper data structure to pass variables from -- 2.4.2

1 0

[aur-dev] [PATCH] Do not use symrefs for manually created Git refs
by Lukas Fleischer 11 Jun '15

11 Jun '15

When creating the refs for the package base branch and the HEAD ref workaround, directly use commit IDs instead of symrefs. It looks like Git cannot pack symrefs, so this is expected to improve space efficiency. Also, since the refs are now only created (or updated) when new objects are actually received, this fixes a problem with dangling refs that were created when a user initialized a repository but did not push anything. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 17 ----------------- git-interface/git-update.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index cfd3e34..9812acb 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -3,7 +3,6 @@ import configparser import mysql.connector import os -import pygit2 import re import shlex import sys @@ -78,21 +77,6 @@ def create_pkgbase(pkgbase, user): db.commit() db.close() -def setup_repo(pkgbase): - if not re.match(repo_regex, pkgbase): - die('%s: invalid repository name: %s' % (action, pkgbase)) - - repo = pygit2.Repository(repo_path) - refs = repo.listall_references() - - if not 'refs/heads/' + pkgbase in refs: - repo.create_reference('refs/heads/' + pkgbase, 'refs/namespaces/' + - pkgbase + '/refs/heads/master') - if not 'refs/namespaces/' + pkgbase + '/HEAD' in refs: - repo.create_reference('refs/namespaces/' + pkgbase + '/HEAD', - 'refs/namespaces/' + pkgbase + - '/refs/heads/master') - def check_permissions(pkgbase, user): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -139,7 +123,6 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': if not pkgbase_exists(pkgbase): create_pkgbase(pkgbase, user) - setup_repo(pkgbase); if action == 'git-receive-pack': if not check_permissions(pkgbase, user): diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 958fa7a..7898f39 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -285,3 +285,13 @@ for pkgname in srcinfo.GetPackageNames(): save_srcinfo(srcinfo, db, cur, user) db.close() + +# Create (or update) a branch with the name of the package base for better +# accessibility. +repo.create_reference('refs/heads/' + pkgbase, sha1_new, True) + +# Work around a Git bug: The HEAD ref is not updated when using gitnamespaces. +# This can be removed once the bug fix is included in Git mainline. See +# http://git.661346.n2.nabble.com/PATCH-receive-pack-Create-a-HEAD-ref-for-re… +# for details. +repo.create_reference('refs/namespaces/' + pkgbase + '/HEAD', sha1_new, True) -- 2.4.2

1 0

[aur-dev] What should AURv4 helpers do to get packages?
by Chris Warrick 11 Jun '15

11 Jun '15

Hello, In AURv4, URLPath was removed due to the introduction of Git integration, which raises the question: what is the recommended way for AUR helpers to get packages? Should they: (a) manually generate a clone URL (/PKGBASE.git/) and clone it? (b) manually generate a tarball URL (/cgit/aur.git/snapshot/PKGBASE.tar.gz) and download it? (c) do something else entirely? In other words: could you please add a RPC field with a “recommended” URL to work with? -- Chris Warrick <https://chriswarrick.com/> PGP: 5EAAEA16

3 6

[aur-dev] [PATCH] Reintroduce the URLPath field
by Lukas Fleischer 11 Jun '15

11 Jun '15

In commit 74edb6f (Use Git repositories to store packages, 2014-06-06), the URLPath field was dropped from RPC package results. Reintroduce the field for backwards compatibility, even though it is no longer recommended to use the snapshot tarballs. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 5fb89a9..f25954c 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -228,7 +228,7 @@ class AurJSON { $search_data = array(); while ($row = $result->fetch(PDO::FETCH_ASSOC)) { $resultcount++; - $pkgbase_name = $row['PackageBase']; + $row['URLPath'] = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['PackageBase'])); /* * Unfortunately, mysql_fetch_assoc() returns -- 2.4.2

1 0

[aur-dev] [PATCH] Make URIs to the individual cgit pages configurable
by Lukas Fleischer 11 Jun '15

11 Jun '15

Make the locations of the PKGBUILD preview, the log and the snapshot tarball configurable. This increases flexibility and simplifies the code a bit. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 4 +++- web/template/pkg_details.php | 10 ++++++---- web/template/pkgbase_details.php | 10 ++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 94ef8e6..1d3e329 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -18,7 +18,6 @@ persistent_cookie_timeout = 2592000 max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org -cgit_uri = https://aur.archlinux.org/cgit/aur.git git_clone_uri_anon = https://aur.archlinux.org/%s.git/ git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/ max_rpc_results = 5000 @@ -26,6 +25,9 @@ aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 auto_orphan_age = 15552000 auto_delete_age = 86400 +pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s +log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s +snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 7c68c30..e50f029 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,6 +1,8 @@ <?php -$cgit_uri = config_get('options', 'cgit_uri'); +$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['BaseName'])); +$log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['BaseName'])); +$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['BaseName'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['BaseName'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['BaseName'])); @@ -82,10 +84,10 @@ $sources = pkg_sources($row["ID"]); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['BaseName']) ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['BaseName']) ?>"><?= __('View Changes') ?></a> + <a href="<?= $pkgbuild_uri ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $log_uri ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['BaseName']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $snapshot_uri ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index a425c4c..2ef8788 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -1,6 +1,8 @@ <?php -$cgit_uri = config_get('options', 'cgit_uri'); +$pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['Name'])); +$log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['Name'])); +$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['Name'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); @@ -33,10 +35,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['Name']) ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['Name']) ?>"><?= __('View Changes') ?></a> + <a href="<?= $pkgbuild_uri ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $log_uri ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['Name']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $snapshot_uri ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> -- 2.4.2

1 0

[aur-dev] [PATCH] pkgbase.php: Escape error messages
by Lukas Fleischer 10 Jun '15

10 Jun '15

Fixes FS#45284. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgbase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 2f8f932..c834f8b 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -146,9 +146,9 @@ html_header($title, $details); <?php if ($output): ?> <?php if ($ret): ?> -<p class="pkgoutput"><?= $output ?></p> +<p class="pkgoutput"><?= htmlspecialchars($output) ?></p> <?php else: ?> -<ul class="errorlist"><li><?= $output ?></li></ul> +<ul class="errorlist"><li><?= htmlspecialchars($output) ?></li></ul> <?php endif; ?> <?php endif; ?> -- 2.4.2

1 0

[aur-dev] [PATCH] Encode cgit URIs properly
by Lukas Fleischer 09 Jun '15

09 Jun '15

Fixes FS#45276 and FS#45277. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_details.php | 6 +++--- web/template/pkgbase_details.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 14f8847..7c68c30 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -82,10 +82,10 @@ $sources = pkg_sources($row["ID"]); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . $row['BaseName'] ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . $row['BaseName'] ?>"><?= __('View Changes') ?></a> + <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['BaseName']) ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['BaseName']) ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . $row['BaseName'] . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['BaseName']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 401ebb3..a425c4c 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -33,10 +33,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . $row['Name'] ?>"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . '/log/?h=' . $row['Name'] ?>"><?= __('View Changes') ?></a> + <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . urlencode($row['Name']) ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . '/log/?h=' . urlencode($row['Name']) ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . '/snapshot/' . $row['Name'] . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> + <li><a href="<?= $cgit_uri . '/snapshot/' . urlencode($row['Name']) . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> -- 2.4.2

1 0

[aur-dev] [PATCH] pkgbase_details.php: Fix cgit links
by Lukas Fleischer 09 Jun '15

09 Jun '15

We forgot to amend those when switching to gitnamespaces-based storage in b44411f (Use gitnamespaces for efficient storage, 2015-06-01). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgbase_details.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 98a7219..401ebb3 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -33,10 +33,10 @@ $pkgs = pkgbase_get_pkgnames($base_id); <h4><?= __('Package Actions') ?></h4> <ul class="small"> <li> - <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/tree/PKGBUILD"><?= __('View PKGBUILD') ?></a> / - <a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/log/"><?= __('View Changes') ?></a> + <a href="<?= $cgit_uri . '/tree/PKGBUILD?h=' . $row['Name'] ?>"><?= __('View PKGBUILD') ?></a> / + <a href="<?= $cgit_uri . '/log/?h=' . $row['Name'] ?>"><?= __('View Changes') ?></a> </li> - <li><a href="<?= $cgit_uri . $row['Name'] . '.git' ?>/snapshot/master.tar.gz"><?= __('Download snapshot') ?></a></li> + <li><a href="<?= $cgit_uri . '/snapshot/' . $row['Name'] . '.tar.gz' ?>"><?= __('Download snapshot') ?></a> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> <?php if ($uid): ?> -- 2.4.2

1 0