- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Linkify user homepage URLs
by Johannes Löthberg 25 Jun '16

25 Jun '16

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/template/account_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/account_details.php b/web/template/account_details.php index 0ac85a5..8b76382 100644 --- a/web/template/account_details.php +++ b/web/template/account_details.php @@ -43,7 +43,7 @@ </tr> <tr> <th><?= __("Homepage") . ":" ?></th> - <td><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></td> + <td><a href="<?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?>" rel="nofollow"><?= htmlspecialchars($row["Homepage"], ENT_QUOTES) ?></a></td> </tr> <tr> <th><?= __("IRC Nick") . ":" ?></th> -- 2.9.0

2 1

Re: [aur-dev] [aur-general] Perl-Moose dependency failure.
by Florian Pritz 10 Jun '16

10 Jun '16

On 10.06.2016 21:59, John D Jones III via aur-general wrote: > On 06/10/16 13:45, Florian Pritz via aur-general wrote: >> On 10.06.2016 21:08, John D Jones III via aur-general wrote: >> Any reason you don't just call it perl-list-utils? That way it could be >> used to always get the most recent version of that distribution and not >> just 1.45. >> >> Florian >> > Well, that's because the parent module, Scalar::List::Utils is marked as > a provides in the core repo perl pkgbuild, so it will error out saying > that the module is 'blacklisted' from AUR otherwise I'd be all over it. Alright. For perl I'd actually prefer this solution given that core perl has a dedicated directory (core_perl) vs. CPAN modules that go into vendor_perl. @Lukas: Could we have exceptions to the blacklist for any provides by perl? Florian

1 0

[aur-dev] [PATCH] Update README
by Lukas Fleischer 09 Jun '16

09 Jun '16

Reword most parts of the README file, add information on new features and update the directory layout. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- README | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/README b/README index 1988186..5ab84ab 100644 --- a/README +++ b/README @@ -1,40 +1,42 @@ aurweb ====== -aurweb is a framework for hosting the Arch User Repository (AUR), a collection +aurweb is a hosting platform for the Arch User Repository (AUR), a collection of packaging scripts that are created and submitted by the Arch Linux -community. The scripts contained in the repository (PKGBUILDs) can be built -using makepkg and installed via the Arch Linux package manager pacman. The -aurweb project aims to provide the necessary web interface, database schema, -and scripts for a multi-lingual community-driven repository. - -Functionality -------------- - -* Users may submit source packages that contain a PKGBUILD. -* User accounts with varying permission levels (User, Trusted User, Developer). -* Ability to search for specific submitted packages. -* Display package information by parsing meta-data provided with the packages. -* Users can make comments on package information page. -* Mark packages as out-of-date. -* Vote for well-done and popular user submitted packages. -* Trusted User and Developer can search for and modify accounts. +community. The scripts contained in the repository can be built using `makepkg` +and installed using the Arch Linux package manager `pacman`. + +The aurweb project includes + +* A web interface to search for packaging scripts and display package details. +* A SSH/Git interface to submit and update packages and package meta data. +* Community features such as comments, votes, package flagging and requests. +* Editing/deletion of packages and accounts by Trusted Users and Developers. * Area for Trusted Users to post AUR-related proposals and vote on them. Directory Layout ---------------- +conf:: + Configuration and configuration templates. + doc:: - aurweb documentation. + Project documentation. + +git-interface:: + Scripts that make up the Git and SSH interface. po:: Translation files for strings in the aurweb interface. +schema:: + Schema for the SQL database. Script for dummy data generation. + scripts:: - aurblup package blacklist tool. Scripts for AUR maintenance. + Scripts for AUR maintenance. -support:: - Schema for SQL database. Script for dummy data generation. +upgrading:: + Instructions for upgrading setups from one release to another. web:: Web interface for the AUR. @@ -43,9 +45,9 @@ Links ----- * The repository is hosted at git://git.archlinux.org/aurweb.git -- see - doc/CodingGuidelines for information on submitting patches. + doc/CodingGuidelines for information on the patch submission process. -* Discovered bugs can be submitted to the aurweb bug tracker: +* Bugs can (and should) be submitted to the aurweb bug tracker: https://bugs.archlinux.org/index.php?project=2 * Questions, comments, and patches related to aurweb can be sent to the AUR -- 2.8.3

1 0

[aur-dev] [PATCH] Update Arch Linux projects subdomain
by Lukas Fleischer 09 Jun '16

09 Jun '16

The projects.archlinux.org subdomain was moved to git.archlinux.org. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 2 +- README | 2 +- doc/i18n.txt | 2 +- web/template/footer.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 8b0cd29..dab48cc 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Setup on Arch Linux 1) Clone the AUR project: $ cd /srv/http/ - $ git clone git://projects.archlinux.org/aurweb.git + $ git clone git://git.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: diff --git a/README b/README index 71e8481..1988186 100644 --- a/README +++ b/README @@ -42,7 +42,7 @@ web:: Links ----- -* The repository is hosted at git://projects.archlinux.org/aurweb.git -- see +* The repository is hosted at git://git.archlinux.org/aurweb.git -- see doc/CodingGuidelines for information on submitting patches. * Discovered bugs can be submitted to the aurweb bug tracker: diff --git a/doc/i18n.txt b/doc/i18n.txt index d5b6764..a1c21fe 100644 --- a/doc/i18n.txt +++ b/doc/i18n.txt @@ -21,7 +21,7 @@ strings for the translation to be usable, and it may have to be disabled. 1. Check out the aurweb source using git: -$ git clone git://projects.archlinux.org/aurweb.git aurweb-git +$ git clone git://git.archlinux.org/aurweb.git aurweb-git 2. Go into the "po/" directory in the aurweb source and run msginit(1) to create a initial translation file from our translation catalog: diff --git a/web/template/footer.php b/web/template/footer.php index f5dc2d0..572dbb2 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,7 +3,7 @@ <div id="footer"> <?php if ($ver): ?> - <p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p> + <p>aurweb <a href="https://git.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p> <?php endif; ?> <p><?= __('Copyright %s 2004-%d aurweb Development Team.', '©', date('Y')) ?></p> <p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p> -- 2.8.3

1 0

[aur-dev] [PATCH] pkgbasefuncs.inc.php: Remove debug statement
by Lukas Fleischer 09 Jun '16

09 Jun '16

Remove a leftover var_dump() invocation that was introduced in commit 5fb7a74 (Replace categories with keywords, 2015-06-13). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5d10cce..b082784 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -1062,7 +1062,6 @@ function pkgbase_set_keywords($base_id, $keywords) { $i = 0; foreach ($keywords as $keyword) { $q = sprintf("INSERT INTO PackageKeywords (PackageBaseID, Keyword) VALUES (%d, %s)", $base_id, $dbh->quote($keyword)); - var_dump($q); $dbh->exec($q); $i++; -- 2.8.3

1 0

Re: [aur-dev] Making the AUR package list more useful
by Dave Reisner 26 May '16

26 May '16

On Apr 29, 2016 02:50, "Lukas Fleischer" <lfleischer(a)archlinux.org> wrote: > > Recently, there were a couple of feature requests to make the AUR > package search more powerful. While I do not plan on adding more > patterns or regular expressions to the RPC interface itself, my idea is > that more tools should be using the package name list. However, there > seem to be two issues with that: What are your reasons for not wanting to extend the RPC interface? Splitting the API in this way is cumbersome for clients. We now are supposed to download and maintain data which is essentially an index (which ought to be internal to the server to allow strong consistency). You're also asking clients of a read-only interface to become stateful, which isn't something that really interests me. > 1. The list is outdated. Right now, it is updated every two hours. I > do not think there is a good reason for those long intervals. > Reducing it to, say, ten minutes should be totally fine. Or maybe > even trigger list generation whenever a package is created or deleted > (which is clearly a lot more work, though). Thoughts? Or, change the storage for the name list such that updates can be fast. Turns out, you already have such a thing, you'd just need an index on the Packages and PackageBases tables. > 2. Transferring the whole package name list is inefficient. Even if we > use gzip compression here, the whole list is several hundreds of > kilobytes large. We need to retransfer the full list, even if only a > single package is added. Maybe we can do better than pacman here. My > idea is to add zsync support to the lists such that only relevant > parts are downloaded (for those who do not know: zsync is like rsync > but it works via HTTP as well and does not require any special > software on the server side). I did not experiment with how much > bandwidth we can actually save using this yet. Maybe the block size > needs to be adjusted. Are there any opinions or other suggestions on > this topic? I'm not understanding why any of this is considered a good direction for the API. What are the reasons for wanting the whole list of package names on the client side? Are there use cases other than search? > Regards, > Lukas

3 8

[aur-dev] [PATCH] Add request type hints
by Lukas Fleischer 23 May '16

23 May '16

Add a text that explains when the currently selected request type should be used. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgreq_form.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/web/template/pkgreq_form.php b/web/template/pkgreq_form.php index 4fd7851..639326e 100644 --- a/web/template/pkgreq_form.php +++ b/web/template/pkgreq_form.php @@ -16,7 +16,7 @@ <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <p> <label for="id_type"><?= __("Request type") ?>:</label> - <select name="type" id="id_type" onchange="showHideMergeSection()"> + <select name="type" id="id_type" onchange="showHideMergeSection(); showHideRequestHints()"> <option value="deletion"><?= __('Deletion') ?></option> <option value="merge"><?= __('Merge') ?></option> <?php if (pkgbase_maintainer_uid($base_id)): ?> @@ -35,8 +35,16 @@ } } + function showHideRequestHints() { + $('#deletion_hint').hide(); + $('#merge_hint').hide(); + $('#orphan_hint').hide(); + $('#' + $('#id_type').val() + '_hint').show(); + } + $(document).ready(function() { showHideMergeSection(); + showHideRequestHints(); $('#id_merge_into').typeahead({ source: function(query, callback) { @@ -59,6 +67,15 @@ <label for="id_comments"><?= __("Comments") ?>:</label> <textarea name="comments" id="id_comments" rows="5" cols="50"></textarea> </p> + <p id="deletion_hint"> + <?= '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.' ?> + </p> + <p id="merge_hint"> + <?= '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.' ?> + </p> + <p id="orphan_hint"> + <?= '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.' ?> + </p> <p> <input type="submit" class="button" name="do_FileRequest" value="<?= __("Submit Request") ?>" /> </p> -- 2.8.2

1 0

[aur-dev] [PATCH 1/2] Add repository information to official providers
by Lukas Fleischer 17 May '16

17 May '16

When updating the list of packages provided by the official repositories, also save the repository names. --- schema/aur-schema.sql | 1 + scripts/aurblup.py | 8 ++++++-- upgrading/4.3.0.txt | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 upgrading/4.3.0.txt diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index aa5ed9d..ee58a52 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -310,6 +310,7 @@ CREATE TABLE PackageBlacklist ( CREATE TABLE OfficialProviders ( ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, Name VARCHAR(64) NOT NULL, + Repo VARCHAR(64) NOT NULL, Provides VARCHAR(64) NOT NULL, PRIMARY KEY (ID) ) ENGINE = InnoDB; diff --git a/scripts/aurblup.py b/scripts/aurblup.py index 325ef3d..9e11e43 100755 --- a/scripts/aurblup.py +++ b/scripts/aurblup.py @@ -20,6 +20,7 @@ servers = config.get('aurblup', 'servers').split(' ') blacklist = set() providers = set() +repomap = dict() h = pyalpm.Handle("/", db_path) for sync_db in sync_dbs: @@ -33,9 +34,11 @@ for sync_db in sync_dbs: blacklist.add(pkg.name) [blacklist.add(x) for x in pkg.replaces] providers.add((pkg.name, pkg.name)) + repomap[(pkg.name, pkg.name)] = repo.name for provision in pkg.provides: provisionname = re.sub(r'(<|=|>).*', '', provision) providers.add((pkg.name, provisionname)) + repomap[(pkg.name, provisionname)] = repo.name db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -54,8 +57,9 @@ cur.execute("SELECT Name, Provides FROM OfficialProviders") oldproviders = set(cur.fetchall()) for pkg, provides in providers.difference(oldproviders): - cur.execute("INSERT INTO OfficialProviders (Name, Provides) " - "VALUES (%s, %s)", [pkg, provides]) + repo = repomap[(pkg, provides)] + cur.execute("INSERT INTO OfficialProviders (Name, Repo, Provides) " + "VALUES (%s, %s, %s)", [pkg, repo, provides]) for pkg, provides in oldproviders.difference(providers): cur.execute("DELETE FROM OfficialProviders " "WHERE Name = %s AND Provides = %s", [pkg, provides]) diff --git a/upgrading/4.3.0.txt b/upgrading/4.3.0.txt new file mode 100644 index 0000000..b4d299f --- /dev/null +++ b/upgrading/4.3.0.txt @@ -0,0 +1,5 @@ +1. Add a new column to store repository information of official providers: + +---- +ALTER TABLE OfficialProviders ADD COLUMN Repo VARCHAR(64) NOT NULL; +---- -- 2.8.2

1 1

[aur-dev] pkgbase and seperate pkgver on subpackages
by Ignat Harczuk 12 May '16

12 May '16

I am the current repo maintainer for intel-parallel-studio-xe, and I was wondering if there is a way to have a package built as a pkgbase, while individually giving each package its own version number? As it was when i took over the orphaned package, the installation procedure was to do: makepkg This generated all the .pkg.tar.gz files which had different version numbers but had to be installed seperately, which is according to the instructions in the wiki. I would like to change it to make it possible to issue makepkg -i, and thus installing all the packages. But this only works when one single version number is used for the entire pkgbase, and individual version numbers for mkl/tbb will not be seen in pacman. Is there a known fix to what I try to do?

3 3

[aur-dev] Making the AUR package list more useful
by Lukas Fleischer 29 Apr '16

29 Apr '16

Recently, there were a couple of feature requests to make the AUR package search more powerful. While I do not plan on adding more patterns or regular expressions to the RPC interface itself, my idea is that more tools should be using the package name list. However, there seem to be two issues with that: 1. The list is outdated. Right now, it is updated every two hours. I do not think there is a good reason for those long intervals. Reducing it to, say, ten minutes should be totally fine. Or maybe even trigger list generation whenever a package is created or deleted (which is clearly a lot more work, though). Thoughts? 2. Transferring the whole package name list is inefficient. Even if we use gzip compression here, the whole list is several hundreds of kilobytes large. We need to retransfer the full list, even if only a single package is added. Maybe we can do better than pacman here. My idea is to add zsync support to the lists such that only relevant parts are downloaded (for those who do not know: zsync is like rsync but it works via HTTP as well and does not require any special software on the server side). I did not experiment with how much bandwidth we can actually save using this yet. Maybe the block size needs to be adjusted. Are there any opinions or other suggestions on this topic? Regards, Lukas

3 4