December 2014 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Update upgrade instructions for 4.0.0
by Lukas Fleischer 28 Dec '14

28 Dec '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- upgrading/4.0.0.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/upgrading/4.0.0.txt b/upgrading/4.0.0.txt index 543fbac..f990c37 100644 --- a/upgrading/4.0.0.txt +++ b/upgrading/4.0.0.txt @@ -3,3 +3,17 @@ ---- ALTER TABLE Users ADD COLUMN SSHPubKey VARCHAR(4096) NULL DEFAULT NULL; ---- + +2. Create a new user and set up a patched version of the sshd as +described in INSTALL. + +3. Create a directory for the package base Git repositories and run +init-repos.py to initialize them. + +4. Reset the packager field of all package bases: + +---- +UPDATE PackageBases SET PackagerUID = NULL; +---- + +5. (optional) Setup cgit to browse the Git repositories via HTTP. -- 2.2.1

1 0

[aur-dev] [PATCH 1/2] Add a script to initialize Git repositories
by Lukas Fleischer 28 Dec '14

28 Dec '14

Introduce a script that creates one repository for each package base in the database. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/init-repos.py | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100755 scripts/git-integration/init-repos.py diff --git a/scripts/git-integration/init-repos.py b/scripts/git-integration/init-repos.py new file mode 100755 index 0000000..62c51b1 --- /dev/null +++ b/scripts/git-integration/init-repos.py @@ -0,0 +1,51 @@ +#!/usr/bin/python3 + +import configparser +import mysql.connector +import os +import pygit2 +import re +import shlex +import sys + +config = configparser.RawConfigParser() +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') +aur_db_user = config.get('database', 'user') +aur_db_pass = config.get('database', 'password') +aur_db_socket = config.get('database', 'socket') + +repo_base_path = config.get('serve', 'repo-base') +repo_regex = config.get('serve', 'repo-regex') +git_update_hook = config.get('serve', 'git-update-hook') + +def die(msg): + sys.stderr.write("%s\n" % (msg)) + exit(1) + +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) +cur = db.cursor() + +cur.execute("SELECT Name FROM PackageBases") +repos = [row[0] for row in cur] +db.close() + +for repo in repos: + if not re.match(repo_regex, repo): + die('invalid repository name: %s' % (repo)) + +i = 1 +n = len(repos) + +for repo in repos: + print("[%s/%d] %s" % (str(i).rjust(len(str(n))), n, repo)) + + repo_path = repo_base_path + '/' + repo + '.git/' + pygit2.init_repository(repo_path, True) + os.symlink(git_update_hook, repo_path + 'hooks/update') + + i += 1 -- 2.2.1

1 1

[aur-dev] [PATCH] git-serve.py: Use virtual paths
by Lukas Fleischer 28 Dec '14

28 Dec '14

Pretend that all repositories are located in the root directory of the file system to achieve location transparency. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/git-integration/git-serve.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 0cad176..1dec6b4 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -89,7 +89,7 @@ cmdargv = shlex.split(cmd) action = cmdargv[0] if action == 'git-upload-pack' or action == 'git-receive-pack': - path = cmdargv[1] + path = repo_base_path.rstrip('/') + cmdargv[1] if not repo_path_validate(path): die('invalid path: %s' % (path)) pkgbase = repo_path_get_pkgbase(path) @@ -99,6 +99,7 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': os.environ["AUR_USER"] = user os.environ["AUR_GIT_DIR"] = path os.environ["AUR_PKGBASE"] = pkgbase + cmd = action + " '" + path + "'" os.execl(git_shell_cmd, git_shell_cmd, '-c', cmd) elif action == 'setup-repo': if len(cmdargv) < 2: -- 2.2.1

1 0

[aur-dev] [PATCH v2 00/10] Use Git repositories to store AUR packages
by Lukas Fleischer 27 Dec '14

27 Dec '14

This is a reroll of the series I submitted in June. I would like to merge this into master soon and start testing stuff, so any reviews are highly appreciated. Lukas Fleischer (10): Use raw scanner mode in config_get() Add support for adding SSH public keys to profiles Add basic Git authentication/authorization scripts Add update hook template Use Git repositories to store packages Add public clone URLs to package details Add sshd setup instructions Honor the database socket setting in Git scripts git-update.py: Update repository description Remove legacy scripts INSTALL | 108 +- conf/config.proto | 18 +- schema/aur-schema.sql | 1 + scripts/cleanup | 46 - .../0001-Patch-sshd-for-the-AUR.patch | 152 ++ scripts/git-integration/aurinfo.py | 204 ++ scripts/git-integration/git-auth.py | 42 + scripts/git-integration/git-serve.py | 108 ++ scripts/git-integration/git-update.py | 217 +++ scripts/git-integration/sshd_config | 6 + scripts/uploadbuckets.sh | 58 - upgrading/4.0.0.txt | 5 + web/html/account.php | 5 +- web/html/pkgsubmit.php | 489 ----- web/lib/Archive/PEAR.php | 1063 ----------- web/lib/Archive/PEAR5.php | 33 - web/lib/Archive/Tar.php | 1993 -------------------- web/lib/acctfuncs.inc.php | 78 +- web/lib/aurjson.class.php | 1 - web/lib/confparser.inc.php | 2 +- web/lib/pkgbasefuncs.inc.php | 39 - web/lib/pkgfuncs.inc.php | 31 +- web/lib/routing.inc.php | 1 - web/template/account_edit_form.php | 5 + web/template/header.php | 1 - web/template/pkg_details.php | 15 +- web/template/pkgbase_details.php | 15 +- 27 files changed, 877 insertions(+), 3859 deletions(-) delete mode 100755 scripts/cleanup create mode 100644 scripts/git-integration/0001-Patch-sshd-for-the-AUR.patch create mode 100644 scripts/git-integration/aurinfo.py create mode 100755 scripts/git-integration/git-auth.py create mode 100755 scripts/git-integration/git-serve.py create mode 100755 scripts/git-integration/git-update.py create mode 100644 scripts/git-integration/sshd_config delete mode 100755 scripts/uploadbuckets.sh create mode 100644 upgrading/4.0.0.txt delete mode 100644 web/html/pkgsubmit.php delete mode 100644 web/lib/Archive/PEAR.php delete mode 100644 web/lib/Archive/PEAR5.php delete mode 100644 web/lib/Archive/Tar.php -- 2.2.1

1 10

[aur-dev] [PATCH] mkpkglists.py: Honor database socket setting
by Lukas Fleischer 26 Dec '14

26 Dec '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/mkpkglists.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/mkpkglists.py b/scripts/mkpkglists.py index 173f5f7..0f2eb84 100755 --- a/scripts/mkpkglists.py +++ b/scripts/mkpkglists.py @@ -15,10 +15,11 @@ aur_db_host = config.get('database', 'host') aur_db_name = config.get('database', 'name') aur_db_user = config.get('database', 'user') aur_db_pass = config.get('database', 'password') +aur_db_socket = config.get('database', 'socket') db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, - buffered=True) + unix_socket=aur_db_socket, buffered=True) cur = db.cursor() datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT") -- 2.2.1

1 0

[aur-dev] list of AUR packages
by Xyne 25 Dec '14

25 Dec '14

Hi, What is the current position on adding a query type to the JSON interface to return a full list of AUR packages? If creating a JSON list of that size is prohibitive, what about providing a simple, newline-delineated text file that is refreshed via a cronjob? I ask because I just discovered aurlist [1] and my immediate thought was that a simple list would save considerable bandwidth and processing vs scraping the search results. If this already exists, please point me to it while mocking me gently. Happy holidays btw ;) [2] Regards, Xyne [1] https://aur.archlinux.org/packages/aurlist/ [2] http://xyne.archlinux.ca/img/xmas/arch-holly_jolly.svg

2 3

[aur-dev] [PATCH] Suggest using makepkg instead of mkaurball
by Lukas Fleischer 19 Dec '14

19 Dec '14

pacman 4.2.0 supports .SRCINFO and generates meta data by default. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- README | 8 ++++---- web/html/pkgsubmit.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 7688ab5..6e7c414 100644 --- a/README +++ b/README @@ -3,10 +3,10 @@ Arch User Repository (AUR) The Arch User Repository (AUR) is a framework for hosting a collection of packaging scripts that are created and submitted by the Arch community. The -scripts contained in the repository (PKGBUILDs) can be built using the AUR -building/packaging script `mkaurball` and installed via the Arch package -manager `pacman`. The AUR project aims to provide the necessary web interface, -database schema, and scripts for a multi-lingual community-driven repository. +scripts contained in the repository (PKGBUILDs) can be built using makepkg and +installed via the Arch package manager pacman. The AUR project aims to provide +the necessary web interface, database schema, and scripts for a multi-lingual +community-driven repository. Functionality ------------- diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index d8df290..098c3fa 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -124,7 +124,7 @@ if ($uid): if (empty($srcinfo_raw)) { $srcinfo_raw = ''; if (!$error) { - $error = __("The source package does not contain any meta data. Please use `mkaurball` to create AUR source packages."); + $error = __("The source package does not contain any meta data. Please use `makepkg --source` from pacman 4.2.0 or newer to create AUR source packages."); } } @@ -413,7 +413,7 @@ html_header("Submit"); <div class="box"> <h2><?= __("Submit"); ?></h2> - <p><?= __("Upload your source packages here. Create source packages with `mkaurball`.") ?></p> + <p><?= __("Upload your source packages here. Create source packages with `makepkg --source`.") ?></p> <?php if (empty($_REQUEST['pkgsubmit']) || $error): -- 2.2.0

1 0

[aur-dev] [PATCH] Fixes incorrect SQLs on generating dummy data.
by Shinya Yamaoka 16 Dec '14

16 Dec '14

The number of columns in the SQLs doesn't match the number of rows, so an error like below occurs: ERROR 1136 (21S01) at line 50929: Column count doesn't match value count at row 1 Signed-off-by: Shinya Yamaoka <contact(a)mail.libmacro.com> --- schema/gendummydata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/gendummydata.py b/schema/gendummydata.py index bb622d1..9ad5373 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -259,7 +259,7 @@ for p in list(seen_pkgs.keys()): deptype = random.randrange(1, 5) if deptype == 4: dep += ": for " + random.choice([k for k in seen_pkgs]) - s = "INSERT INTO PackageDepends VALUES (%d, %d, '%s', NULL);\n" + s = "INSERT INTO PackageDepends(PackageID, DepTypeID, DepName) VALUES (%d, %d, '%s');\n" s = s % (seen_pkgs[p], deptype, dep) out.write(s) @@ -267,7 +267,7 @@ for p in list(seen_pkgs.keys()): for i in range(0, num_deps): rel = random.choice([k for k in seen_pkgs]) reltype = random.randrange(1, 4) - s = "INSERT INTO PackageRelations VALUES (%d, %d, '%s', NULL);\n" + s = "INSERT INTO PackageRelations(PackageID, RelTypeID, RelName) VALUES (%d, %d, '%s');\n" s = s % (seen_pkgs[p], reltype, rel) out.write(s) @@ -279,7 +279,7 @@ for p in list(seen_pkgs.keys()): p, RANDOM_TLDS[random.randrange(0,len(RANDOM_TLDS))], RANDOM_LOCS[random.randrange(0,len(RANDOM_LOCS))], src_file, genVersion()) - s = "INSERT INTO PackageSources VALUES (%d, '%s');\n" + s = "INSERT INTO PackageSources(PackageID, Source) VALUES (%d, '%s');\n" s = s % (seen_pkgs[p], src) out.write(s) -- 2.1.3

2 4

[aur-dev] [PATCH] Redirect to requests page after accepting deletions
by archlinux＠cryptocrack.de 13 Dec '14

13 Dec '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Fixes FS#43100. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgbase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 691639c..bdce516 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -106,7 +106,8 @@ if (check_token()) { } if ($ret) { - if (current_action("do_CloseRequest")) { + if (current_action("do_CloseRequest") || + (current_action("do_Delete") && $_POST['via'])) { /* Redirect back to package request page on success. */ header('Location: ' . get_pkgreq_route()); exit(); -- 2.1.3

1 0

[aur-dev] [PATCH] Show user name in title on the account details page
by archlinux＠cryptocrack.de 13 Dec '14

13 Dec '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Suggested-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/account.php | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index f5ca304..c1a1cd7 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -8,15 +8,27 @@ include_once('acctfuncs.inc.php'); # access Account specific functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(__('Accounts')); +$action = in_request("Action"); + +$need_userinfo = array( + "DisplayAccount", "DeleteAccount", "AccountInfo", "UpdateAccount" +); + +if (in_array($action, $need_userinfo)) { + $row = account_details(in_request("ID"), in_request("U")); +} + +if ($action == "AccountInfo") { + html_header(__('Account') . ' ' . $row['Username']); +} else { + html_header(__('Accounts')); +} # Main page processing here # echo "<div class=\"box\">\n"; echo " <h2>".__("Accounts")."</h2>\n"; -$action = in_request("Action"); - if (isset($_COOKIE["AURSID"])) { if ($action == "SearchAccounts") { @@ -39,7 +51,6 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "DisplayAccount") { # the user has clicked 'edit', display the account details in a form # - $row = account_details(in_request("ID"), in_request("U")); if (empty($row)) { print __("Could not retrieve information for the specified user."); } else { @@ -57,15 +68,13 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "DeleteAccount") { /* Details for account being deleted. */ - $acctinfo = account_details(in_request('ID'), in_request('U')); - - if (can_edit_account($acctinfo)) { - $UID = $acctinfo['ID']; + if (can_edit_account($row)) { + $UID = $row['ID']; if (in_request('confirm_Delete') && check_token()) { user_delete($UID); header('Location: /'); } else { - $username = $acctinfo['Username']; + $username = $row['Username']; include("account_delete.php"); } } else { @@ -74,7 +83,6 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "AccountInfo") { # no editing, just looking up user info # - $row = account_details(in_request("ID"), in_request("U")); if (empty($row)) { print __("Could not retrieve information for the specified user."); } else { @@ -83,10 +91,8 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "UpdateAccount") { /* Details for account being updated */ - $acctinfo = account_details(in_request('ID'), in_request('U')); - /* Verify user permissions and that the request is a valid POST */ - if (can_edit_account($acctinfo) && check_token()) { + if (can_edit_account($row) && check_token()) { /* Update the details for the existing account */ process_account_form("edit", "UpdateAccount", in_request("U"), in_request("T"), in_request("S"), -- 2.1.3

1 0