- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] cgitrc.proto: Fix clone prefix
by Lukas Fleischer 04 Jun '15

04 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/cgitrc.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto index 1322f93..cb77367 100644 --- a/conf/cgitrc.proto +++ b/conf/cgitrc.proto @@ -1,5 +1,5 @@ virtual-root=/cgit/ -clone-prefix=git+ssh://aur@aur.archlinux.org +clone-prefix=https://aur.archlinux.org noheader=0 logo= css=/css/cgit.css -- 2.4.2

1 0

[aur-dev] [PATCH 1/2] git-update: Only check HEAD for blacklisted packages
by Lukas Fleischer 04 Jun '15

04 Jun '15

When a part of a package base is moved to the official repositories, it needs to be dropped from the AUR package. However, we want to allow that the moved packages still appear in the history. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index c4f9da7..34633e8 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -225,10 +225,6 @@ for commit in walker: die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) - if pkginfo['pkgname'] in blacklist: - die_commit('package is blacklisted: %s' % (pkginfo['pkgname']), - commit.id) - if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) @@ -256,6 +252,12 @@ srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] if srcinfo_pkgbase != pkgbase: die('invalid pkgbase: %s' % (srcinfo_pkgbase)) +for pkgname in srcinfo.GetPackageNames(): + pkginfo = srcinfo.GetMergedPackage(pkgname) + + if pkginfo['pkgname'] in blacklist: + die('package is blacklisted: %s' % (pkginfo['pkgname'])) + save_srcinfo(srcinfo, db, cur, user) db.close() -- 2.4.2

1 2

[aur-dev] [PATCH] aurblup: Fix path to configuration file
by Lukas Fleischer 03 Jun '15

03 Jun '15

Fixes a regression introduced in commit 10ecd39 (Restructure scripts, 2015-06-01). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/aurblup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/aurblup.py b/scripts/aurblup.py index e678fee..d6d0c3c 100755 --- a/scripts/aurblup.py +++ b/scripts/aurblup.py @@ -6,7 +6,7 @@ import os import pyalpm config = configparser.RawConfigParser() -config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config") +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config") aur_db_host = config.get('database', 'host') aur_db_name = config.get('database', 'name') -- 2.4.2

1 0

[aur-dev] [PATCH] git-update: Only check HEAD for matching pkgbase
by Lukas Fleischer 03 Jun '15

03 Jun '15

When renaming a package base, we want to keep commits of the former package. Move the check that compares the package base name with the repository name such that only HEAD is validated. Fixes FS#45065. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index b7eaa14..c4f9da7 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -20,6 +20,7 @@ aur_db_pass = config.get('database', 'password') aur_db_socket = config.get('database', 'socket') repo_path = config.get('serve', 'repo-path') +repo_regex = config.get('serve', 'repo-regex') def extract_arch_fields(pkginfo, field): values = [] @@ -207,7 +208,7 @@ for commit in walker: exit(1) srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] - if srcinfo_pkgbase != pkgbase: + if not re.match(repo_regex, srcinfo_pkgbase): die_commit('invalid pkgbase: %s' % (srcinfo_pkgbase), commit.id) for pkgname in srcinfo.GetPackageNames(): @@ -251,6 +252,10 @@ srcinfo_raw = repo[repo[sha1_new].tree['.SRCINFO'].id].data.decode() srcinfo_raw = srcinfo_raw.split('\n') srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw) +srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] +if srcinfo_pkgbase != pkgbase: + die('invalid pkgbase: %s' % (srcinfo_pkgbase)) + save_srcinfo(srcinfo, db, cur, user) db.close() -- 2.4.2

1 0

[aur-dev] [PATCH] pkgfuncs.inc.php: Remove a conflict marker
by Lukas Fleischer 03 Jun '15

03 Jun '15

Remove a Git conflict marker that was added accidentally in 74edb6f (Use Git repositories to store packages, 2014-06-06). Reported-by: Helped-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 2b5afaa..ee63e42 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -779,7 +779,6 @@ function sanitize_ids($ids) { } /** -<<<<<<< HEAD * Add package information to the database for a specific package * * @param int $base_id ID of the package base -- 2.4.2

1 0

[aur-dev] [PATCH] config.proto: Cleanup
by Lukas Fleischer 02 Jun '15

02 Jun '15

Remove the template-path and git-update-hook options which are no longer used. Update the git_clone_uri_anon default value. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 4 +--- git-interface/git-serve.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 7c56a2b..94ef8e6 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -19,7 +19,7 @@ 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/cgit/%s.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 aur_request_ml = aur-requests(a)archlinux.org @@ -36,8 +36,6 @@ ssh-options = no-port-forwarding,no-X11-forwarding,no-pty [serve] repo-path = /srv/http/aurweb/aur.git/ repo-regex = [a-z0-9][a-z0-9.+_-]*$ -template-path = /srv/http/aurweb/git-interface/templates/ -git-update-hook = /srv/http/aurweb/git-interface/git-update.py git-shell-cmd = /usr/bin/git-shell ssh-cmdline = ssh aur(a)aur.archlinux.org diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index fce766a..5aa44c3 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -21,7 +21,6 @@ repo_path = config.get('serve', 'repo-path') repo_regex = config.get('serve', 'repo-regex') git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') -template_path = config.get('serve', 'template-path') def pkgbase_exists(pkgbase): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, -- 2.4.2

1 0

[aur-dev] [PATCH] Setup Git repositories even if package base exists
by Lukas Fleischer 02 Jun '15

02 Jun '15

Sometimes, we need to initialize the Git repository even if the package base already exists (e.g. when using a non-empty package database with empty repositories during the AUR 4.0.0 migration period). Make sure that the package branch and the namespaced HEAD ref is always created. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index eebb087..fce766a 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -52,7 +52,7 @@ def list_repos(user): print((' ' if row[1] else '*') + row[0]) db.close() -def setup_repo(pkgbase, user): +def create_pkgbase(pkgbase, user): if not re.match(repo_regex, pkgbase): die('%s: invalid repository name: %s' % (action, pkgbase)) if pkgbase_exists(pkgbase): @@ -79,11 +79,20 @@ def setup_repo(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) - repo.create_reference('refs/heads/' + pkgbase, - 'refs/namespaces/' + pkgbase + '/refs/heads/master') - repo.create_reference('refs/namespaces/' + pkgbase + '/HEAD', - 'refs/namespaces/' + pkgbase + '/refs/heads/master') + 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, @@ -130,7 +139,8 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': die('%s: invalid repository name: %s' % (action, repo)) if not pkgbase_exists(pkgbase): - setup_repo(pkgbase, user) + create_pkgbase(pkgbase, user) + setup_repo(pkgbase); if action == 'git-receive-pack': if not check_permissions(pkgbase, user): @@ -150,7 +160,7 @@ elif action == 'setup-repo': die_with_help("%s: missing repository name" % (action)) if len(cmdargv) > 2: die_with_help("%s: too many arguments" % (action)) - setup_repo(cmdargv[1], user) + create_pkgbase(cmdargv[1], user) elif action == 'help': die("Commands:\n" + " help Show this help message and exit.\n" + -- 2.4.2

1 0

[aur-dev] [PATCH] Add a Makefile for the git-auth wrapper
by Lukas Fleischer 02 Jun '15

02 Jun '15

Avoid manual editing of the wrapper script when a non-standard path is used. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 3 +-- git-interface/Makefile | 18 ++++++++++++++++++ git-interface/config.mk | 1 + git-interface/git-auth.sh | 3 --- git-interface/git-auth.sh.in | 3 +++ 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 git-interface/Makefile create mode 100644 git-interface/config.mk delete mode 100755 git-interface/git-auth.sh create mode 100644 git-interface/git-auth.sh.in diff --git a/INSTALL b/INSTALL index 3aad515..a2a6153 100644 --- a/INSTALL +++ b/INSTALL @@ -34,8 +34,7 @@ Setup on Arch Linux 7) Install the git-auth wrapper script: # cd /srv/http/aurweb/git-interface/ - # cp git-auth.sh /usr/local/bin/aur-git-auth - # chmod 755 /usr/local/bin/aur-git-auth + # make && make install 8) Configure sshd(8) for the AUR. Add the following lines at the end of your sshd_config(5) and restart the sshd. Note that OpenSSH 6.9 or newer is diff --git a/git-interface/Makefile b/git-interface/Makefile new file mode 100644 index 0000000..8865790 --- /dev/null +++ b/git-interface/Makefile @@ -0,0 +1,18 @@ +GIT_INTERFACE_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) + +include config.mk + +git-auth.sh: + sed 's#%GIT_INTERFACE_DIR%#$(GIT_INTERFACE_DIR)#' <git-auth.sh.in >git-auth.sh + chmod +x git-auth.sh + +install: git-auth.sh + install -Dm0755 git-auth.sh "$(DESTDIR)$(PREFIX)/bin/aur-git-auth" + +uninstall: + rm -f "$(DESTDIR)$(PREFIX)/bin/aur-git-auth" + +clean: + rm -f git-auth.sh + +.PHONY: install uninstall clean diff --git a/git-interface/config.mk b/git-interface/config.mk new file mode 100644 index 0000000..4d794a1 --- /dev/null +++ b/git-interface/config.mk @@ -0,0 +1 @@ +PREFIX = /usr/local diff --git a/git-interface/git-auth.sh b/git-interface/git-auth.sh deleted file mode 100755 index a5caeec..0000000 --- a/git-interface/git-auth.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/srv/http/aurweb/git-interface/git-auth.py "$1" "$2" diff --git a/git-interface/git-auth.sh.in b/git-interface/git-auth.sh.in new file mode 100644 index 0000000..223816a --- /dev/null +++ b/git-interface/git-auth.sh.in @@ -0,0 +1,3 @@ +#!/bin/sh + +%GIT_INTERFACE_DIR%/git-auth.py "$1" "$2" -- 2.4.2

1 0

[aur-dev] [PATCH] Restructure scripts
by Lukas Fleischer 02 Jun '15

02 Jun '15

* Move scripts/git-integration/ to git-interface/. * Move scripts/aurblup/aurblup.py to scripts/aurblup.py. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- {scripts/git-integration => git-interface}/aurinfo.py | 0 {scripts/git-integration => git-interface}/git-auth.py | 0 {scripts/git-integration => git-interface}/git-auth.sh | 0 {scripts/git-integration => git-interface}/git-serve.py | 0 {scripts/git-integration => git-interface}/git-update.py | 0 scripts/{aurblup => }/aurblup.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {scripts/git-integration => git-interface}/aurinfo.py (100%) rename {scripts/git-integration => git-interface}/git-auth.py (100%) rename {scripts/git-integration => git-interface}/git-auth.sh (100%) rename {scripts/git-integration => git-interface}/git-serve.py (100%) rename {scripts/git-integration => git-interface}/git-update.py (100%) rename scripts/{aurblup => }/aurblup.py (100%) diff --git a/scripts/git-integration/aurinfo.py b/git-interface/aurinfo.py similarity index 100% rename from scripts/git-integration/aurinfo.py rename to git-interface/aurinfo.py diff --git a/scripts/git-integration/git-auth.py b/git-interface/git-auth.py similarity index 100% rename from scripts/git-integration/git-auth.py rename to git-interface/git-auth.py diff --git a/scripts/git-integration/git-auth.sh b/git-interface/git-auth.sh similarity index 100% rename from scripts/git-integration/git-auth.sh rename to git-interface/git-auth.sh diff --git a/scripts/git-integration/git-serve.py b/git-interface/git-serve.py similarity index 100% rename from scripts/git-integration/git-serve.py rename to git-interface/git-serve.py diff --git a/scripts/git-integration/git-update.py b/git-interface/git-update.py similarity index 100% rename from scripts/git-integration/git-update.py rename to git-interface/git-update.py diff --git a/scripts/aurblup/aurblup.py b/scripts/aurblup.py similarity index 100% rename from scripts/aurblup/aurblup.py rename to scripts/aurblup.py -- 2.4.2

1 1

[aur-dev] Should git hook check for missing files?
by Marcel Korpel 01 Jun '15

01 Jun '15

Hi, I just tested the omittance of an install file after adding an `install` variable to a PKGBUILD and running mksrcinfo. `git push` went on without errors. The same with a local, non-downloadable file. So, my question is: should the git hook also test for missing files? Of course this is non-trivial, as all instances of `source` in .SRCINFO should be processed at that point *and* checked for non-downloadable files (non-URLs). Perhaps it's a feature that could be added in the future. Of course I'm asking because I fear that people will forget to add new patches/install files/etc. to the index and upload commits where necessary files are missing. If you want to test, I created a bogus package at https://aur4.archlinux.org/packages/foobartest/ Best, Marcel

5 20