- Aur-dev - lists.archlinux.org

Re: [aur-dev] AUR 4 and licensing
by David Manouchehri 13 Apr '15

13 Apr '15

> Showing it during a push would be flawed because then it's too late for them not to agree to it. A Git pre-commit hook on the server side should be fine. On the web side of the AUR, a list of accepted ToS users should be kept, and then on every push check to see if they've been added. Reminding users about the GPL on a push probably isn't a bad idea either. I can't remember how to get the current commiter's email address, but the hook would probably look something like this. ``` if [ ! -f /tmp/userlist_accepted/$git_email ]; then printf "Please visit https://aur.archlinux.org/ and accept the terms of service first.\n" exit 1 done printf "All content posted to the AUR must be licensed under GPLv3.\n" ``` If maintaining another list of private email addresses is too much of a pain, just hash them and the list could be public without any privacy concerns (assuming it isn't md5sum or something equally weak).

5 10

Re: [aur-dev] AUR 4 and licensing
by David Manouchehri 12 Apr '15

12 Apr '15

> Alas that wouldn?t work since with AUR 4.0.0 you will use git to upload packages, and can also use git to create them. You still need to create an account on the AUR website before you can use git+ssh to upload a package I believe. Having a Terms of Service Agreement on registration stating that all content uploaded under GPLv3 would likely work.

2 1

[aur-dev] lib32-gtk3 block and no AUR User Guidelines presidence
by Curtis Lee Bolin 11 Apr '15

11 Apr '15

The maintainer of lib32-gtk3, alucryd, recently updated the version to 3.16.1 although it's dependencies are in testing. So now anyone wanting to install something depending on lib32-gtk3 would now be forced to enable the testing repository. In alucryd's comments with another user he seems to be under the impression all users already have lib32-gtk3 installed, and he isn't forcing anyone to update. He is forgetting all of the people that are installing something for the first time that depends on lib32-gtk. They are completely blocked without adding the testing repository. I reviewed the AUR User Guidelines and can find nothing to prevent this type of lapse in logic. This isn't the first time I have seen this issue. Since there isn't a separate testing AUR, can something be added to the AUR User Guidelines maybe stating packages that require the testing repository must have "-testing" added to the name or whatever would best resolve this problem. Thank You For Your Time, Curtis Lee Bolin

4 3

[aur-dev] [PATCH 1/2] Allow users to delete their own packages
by Lukas Fleischer 04 Mar '15

04 Mar '15

Allow users to remove their own package bases for a short period of time after initial submission (defaults to one day). Implements FS#43648. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- conf/config.proto | 1 + web/lib/pkgbasefuncs.inc.php | 5 +++-- web/lib/pkgreqfuncs.inc.php | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index b4a381d..95194a7 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -25,6 +25,7 @@ max_rpc_results = 5000 aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 auto_orphan_age = 15552000 +auto_delete_age = 86400 [auth] key-prefixes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5741b01..6f9ef85 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -436,11 +436,12 @@ function pkgbase_unflag($base_ids) { * @param array $base_ids Array of package base IDs to delete * @param int $merge_base_id Package base to merge the deleted ones into * @param int $via Package request to close upon deletion + * @param bool $grant Allow anyone to delete the package base * * @return array Tuple of success/failure indicator and error message */ -function pkgbase_delete ($base_ids, $merge_base_id, $via) { - if (!has_credential(CRED_PKGBASE_DELETE)) { +function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) { + if (!$grant && !has_credential(CRED_PKGBASE_DELETE)) { return array(false, __("You do not have permission to delete packages.")); } diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index a5d6be8..0fab447 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -184,6 +184,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { " Request for " . $row['Name'], $body, $headers); $auto_orphan_age = config_get('options', 'auto_orphan_age'); + $auto_delete_age = config_get('options', 'auto_delete_age'); $details = pkgbase_get_details($base_id); if ($type == 'orphan' && $details['OutOfDateTS'] > 0 && time() - $details['OutOfDateTS'] >= $auto_orphan_age && @@ -201,6 +202,19 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $q = "UPDATE PackageBases SET MaintainerUID = NULL "; $q.= "WHERE ID = " . $base_id; $dbh->exec($q); + } else if ($type == 'deletion' && $details['MaintainerUID'] == $uid && + $details['SubmittedTS'] > 0 && $auto_delete_age > 0 && + time() - $details['SubmittedTS'] <= $auto_delete_age) { + /* + * Close package request. NOTE: This needs to happen *before* + * the actual deletion operation. Otherwise, the former + * maintainer will not be included in the Cc list of the + * request notification email. + */ + pkgreq_close($request_id, "accepted", + "Deletion of a fresh package requested by its " . + "current maintainer.", true); + pkgbase_delete(array($base_id), NULL, NULL, true); } return array(true, __("Added request successfully.")); -- 2.3.1

1 1

[aur-dev] Remove category support
by Hugo Osvaldo Barrera 28 Feb '15

28 Feb '15

Hi, I've seen mention of removing the categories from the AUR several times in aur-general, and someone mentioned that, while they serve no real purpose, nobody has sent patches either. Well, I gave this a try to see how well I could do and this *seems* to work fine, though more granualar testing may be required (I'll do this if the patch seems ok, and if its goal is deemed acceptable). Feedback is, naturally, greatly appreciated. Cheers, -- Hugo Osvaldo Barrera A: Because we read from top to bottom, left to right. Q: Why should I start my reply below the quoted text?

6 10

[aur-dev] ./configure --prefix Conventions
by Jashandeep Sohi 11 Feb '15

11 Feb '15

Hi, I was browsing some PKGBUILD on AUR and it seems there are two ways of running the autoconf configure script. One, is the more frequent `./configure --prefix=/usr` and the other is `./configure --prefix=$pkgdir/usr`. I was wondering if one is more correct than the other? Are there any downsides to using the second one? Thanks, Jashandeep Sohi

4 3

[aur-dev] yaourt search filtering
by Jude DaShiell 09 Feb '15

09 Feb '15

Can something be put into a yaourt search such that outdated packages either are hidden or are shown under a group heading of outdated packages? jude <jdashiel(a)shellworld.net> Twitter: @JudeDaShiell

3 3

[aur-dev] [PATCH] Update .gitignore
by Lukas Fleischer 04 Feb '15

04 Feb '15

* Remove user-specific configuration. * Update with latest changes to the configuration file and templates. * Order entries alphabetically. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- .gitignore | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ed22497..590e1ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,8 @@ -.htaccess -robots.txt -*.swp -web/lib/config.inc -web/lib/config.inc.php -*.DS_Store -web/html/xml/*.xml +conf/config dummy-data.sql* -web/locale/*/ po/*.mo po/*.po~ po/POTFILES +scripts/git-integration/__pycache__/ +scripts/git-integration/templates/ +web/locale/*/ -- 2.2.2

1 0

[aur-dev] [PATCH/RFC] Rename the AUR software to aurweb
by Lukas Fleischer 04 Feb '15

04 Feb '15

Rename the project to help differentiate between the software providing access to the Arch User Repository and the collection of source packages itself. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- AUTHORS | 2 +- INSTALL | 4 +- README | 26 ++++++------ TRANSLATING | 32 +++++++-------- web/README | 104 ------------------------------------------------ web/html/css/aur.css | 74 ---------------------------------- web/html/css/aurweb.css | 75 ++++++++++++++++++++++++++++++++++ web/html/home.php | 4 +- web/html/index.php | 2 +- web/template/footer.php | 4 +- web/template/header.php | 2 +- 11 files changed, 113 insertions(+), 216 deletions(-) delete mode 100644 web/README delete mode 100644 web/html/css/aur.css create mode 100644 web/html/css/aurweb.css diff --git a/AUTHORS b/AUTHORS index 6581e81..582ccca 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,7 +7,7 @@ Current Maintainers Contributors ------------ -Use `git shortlog -s` for a list of AUR contributors. +Use `git shortlog -s` for a list of aurweb contributors. Translations ------------ diff --git a/INSTALL b/INSTALL index cbb9f44..62db77d 100644 --- a/INSTALL +++ b/INSTALL @@ -37,9 +37,9 @@ Setup on Arch Linux: Include conf/extra/httpd-vhosts.conf -4) Clone the AUR project (using the MYUSER from above) +4) Clone the aurweb project (using the MYUSER from above) $ cd - $ git clone git://projects.archlinux.org/aur.git + $ git clone git://projects.archlinux.org/aurweb.git 5) Configure PHP Make sure you have mysql and json enabled in PHP. diff --git a/README b/README index 6e7c414..fb3af67 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ -Arch User Repository (AUR) -========================== +aurweb +====== -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 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. +aurweb is a framework for hosting 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 ------------- @@ -25,7 +25,7 @@ Directory Layout ---------------- po:: - Translation files for strings in the AUR web interface. + Translation files for strings in the aurweb interface. scripts:: aurblup package blacklist tool. Scripts for AUR maintenance. @@ -42,9 +42,9 @@ Links * The official repository is hosted at git://projects.archlinux.org/aur.git -- see HACKING for information on submitting patches. -* Discovered bugs can be submitted to the AUR bug tracker: +* Discovered bugs can be submitted to the aurweb bug tracker: https://bugs.archlinux.org/index.php?project=2 -* Questions, comments, and patches related to the AUR can be sent to the AUR - development mailing list: aur-dev(a)archlinux.org -- mailing list archives: - https://mailman.archlinux.org/mailman/listinfo/aur-dev +* Questions, comments, and patches related to aurweb can be sent to the aurweb + development mailing list: aurweb-dev(a)archlinux.org -- mailing list archives: + https://mailman.archlinux.org/mailman/listinfo/aurweb-dev diff --git a/TRANSLATING b/TRANSLATING index 27855f6..e450640 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -1,31 +1,31 @@ -AUR Translation -================ +aurweb Translation +================== -This document describes how to create and maintain AUR translations. It was -originally derived from https://wiki.archlinux.org/index.php/AUR_Translation +This document describes how to create and maintain aurweb translations. It was +originally derived from https://wiki.archlinux.org/index.php/aurweb_Translation -Creating an AUR translation requires a Transifex (http://www.transifex.com/) -account. You will need to register with a translation team on the AUR project -page (http://www.transifex.com/projects/p/aur/) +Creating an aurweb translation requires a Transifex (http://www.transifex.com/) +account. You will need to register with a translation team on the aurweb +project page (http://www.transifex.com/projects/p/aurweb/) Creating a New Translation ---------------------------- +-------------------------- Before beginning, please sign up for an Transifex account and request the -addition of a new translation team for the AUR project. Also, please do not +addition of a new translation team for the aurweb project. Also, please do not translate if you are unwilling to maintain or find someone to maintain the -translation. This is due to the fact that the AUR is a rapidly evolving project +translation. This is due to the fact that aurweb is a rapidly evolving project and there are constantly new strings to be translated. If the translations get too out of sync with the released versions, there will be too many untranslated strings for the translation to be usable, and it may have to be disabled. -1. Check out the AUR source using git: +1. Check out the aurweb source using git: -$ git clone git://projects.archlinux.org/aur.git aur-git +$ git clone git://projects.archlinux.org/aurweb.git aurweb-git -2. Go into the "po/" directory in the AUR source and run msginit(1) to create a - initial translation file from our translation catalog: +2. Go into the "po/" directory in the aurweb source and run msginit(1) to + create a initial translation file from our translation catalog: $ cd aur-git $ git checkout master @@ -37,7 +37,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot $ poedit <locale>.po -5. If you have a working AUR setup, add a line for the new translation in +5. If you have a working aurweb setup, add a line for the new translation in "web/lib/config.inc.php.proto" and test if everything looks right. 6. Upload the newly created ".po" file to Transifex. If you don't like the web @@ -45,7 +45,7 @@ $ poedit <locale>.po Updating an Existing Translation ---------------------------------- +-------------------------------- 1. Download current translation files from Transifex. You can also do this using transifex-client which is available through the AUR: diff --git a/web/README b/web/README deleted file mode 100644 index 96aade5..0000000 --- a/web/README +++ /dev/null @@ -1,104 +0,0 @@ -============== -AUR Web Interface -============== - -Terms and Definitions: -================ -AUR - Arch User Repository - Repository made up of a collection of build scripts that are - created and submitted by the Arch community. - -TU - Trusted User - A user that can add binary packages to the [community] - repository and administer AUR. - -[unsupported] - The collection of package build files hosted via the AUR website. - -File Hierachy -========= - -Directory Layout: -------------------- -./html - DocumentRoot for AUR, where the PHP scripts live. -./html/css - CSS for AUR appearance -./html/css/navbar - CSS for Arch navigation bar appearance -./html/images - Any AUR images live here. -./lib - Supporting PHP include files. Access denied to Apache. -./locale -./template - Where most of the html markup resides and minimal - amount of PHP scripting. -./template/stats - -./html Files: -------------- -account.php - - PHP script to handle registering for a new account. It prompts - the visitor for account information: desired username, E-mail, - password, real name, IRC nick, and default language. The info is - recorded in the Users table. - - A logged-in user can change any of their own account information. If a - TU or Developer is logged into the system, they can search for and - edit accounts. A TU can change an account to a TU or User account. A - Developer can also change an account to the Developer type. TUs and - Developers are able to suspend accounts. If an account is suspended, - all packages are orphaned (the MaintainerUID field in the Packages - table is set to NULL). - -addvote.php - - A form to submit proposals relating to the AUR. Only accessible to TUs - and Developers. Can be used to vote on a potential new TU, or any - other proposal that needs a vote. Length of the vote can be specified. - -index.php - - Main page for the AUR. Provides links to all other pages in the AUR. - Gives a brief synopsis of what the AUR is and where to go for more - information. - -logout.php - - Logs out a logged-in user. Clears the session id from the Sessions - table and unsets the cookie. - -packages.php - - Page used to search the package database. Supports searching by name, - category, maintainer, popularity, etc. Also provides the ability to go - to a package page which has specific information for that package. - A specific package page includes the name, description, votes, etc. - As well as the ability to perform actions on the packages, such as - flagging or leaving a comment on the package. - -passreset.php - - A page for a user to enter their e-mail and receive a reset e-mail to - replace the forgotten password. - -pkgsubmit.php - - Page for users to upload a new package. Only allows upload of a - tarball that has been compressed with gzip. Tarball must contain the - PKGBUILD, scriptlets, and any other files necessary to build the - package from source. The user can select a category for the package. - The page makes appropriate entries into the database for tracking the - newly added source package and associated information. - -rpc.php - - A frontend for tools to obtain raw information from the AUR. Features - the ability to search for a package, return information on a package, - return information on multiple packages, and search for a specific - package maintainer. Functionality through HTTP GET. - -rss.php - - Generates RDF Site Summary (RSS) feed with the latest packages updated - in the AUR. Lists most recent 20 packages. Includes package name, link - to package page, package description, time of update, source listing, - maintainer name. - -tu.php - - Page only available to TUs and Developers. Shows ongoing votes for - proposals and past votes for proposals. Current votes can be voted on - with a "Yes" vote, "No" vote, or an "Abstain" vote. Developers and TUs - can only vote once. Cannot vote on a proposal about themselves. - -voters.php - - Page only available to TUs and Developers. Shows list of users that - voted for a specific package. Each username links to the user's - account information page. diff --git a/web/html/css/aur.css b/web/html/css/aur.css deleted file mode 100644 index 654116a..0000000 --- a/web/html/css/aur.css +++ /dev/null @@ -1,74 +0,0 @@ -/* AUR-specific customizations to "archweb.css". */ -#archnavbar.anb-aur ul li#anb-aur a { - color: white !important; -} - -#lang_sub { - float: right; -} - -.pkglist-nav .page { - margin: 0 .25em; -} - -#pkg-updates td.pkg-new { - padding: 0 .5em; -} - -#pkg-stats td.stat-desc { - white-space: normal; -} - -#actionlist form { - margin: 0; - padding: 0; -} - -.arch-bio-entry ul { - list-style: none; - padding: 0; -} - -#pkg-updates table { - table-layout: fixed; - width:100%; -} - -#pkg-updates td.pkg-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -#pkg-updates td.pkg-new { - width: 16px; -} - -#pkg-updates td.pkg-date { - text-align:right; -} - -.text-button { - background: transparent; - border: none !important; - margin: 0 !important; - padding: 0 !important; - font: normal 100% sans-serif; - text-decoration: none; - color: #07b; - cursor: pointer; -} - -.text-button:hover { - text-decoration: underline; - color: #666; -} - -.text-button::-moz-focus-inner { - padding: 0; - border: none; -} - -.comment-deleted { - color: #999; -} diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css new file mode 100644 index 0000000..551b3c7 --- /dev/null +++ b/web/html/css/aurweb.css @@ -0,0 +1,75 @@ +/* aurweb-specific customizations to archweb.css */ + +#archnavbar.anb-aur ul li#anb-aur a { + color: white !important; +} + +#lang_sub { + float: right; +} + +.pkglist-nav .page { + margin: 0 .25em; +} + +#pkg-updates td.pkg-new { + padding: 0 .5em; +} + +#pkg-stats td.stat-desc { + white-space: normal; +} + +#actionlist form { + margin: 0; + padding: 0; +} + +.arch-bio-entry ul { + list-style: none; + padding: 0; +} + +#pkg-updates table { + table-layout: fixed; + width:100%; +} + +#pkg-updates td.pkg-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#pkg-updates td.pkg-new { + width: 16px; +} + +#pkg-updates td.pkg-date { + text-align:right; +} + +.text-button { + background: transparent; + border: none !important; + margin: 0 !important; + padding: 0 !important; + font: normal 100% sans-serif; + text-decoration: none; + color: #07b; + cursor: pointer; +} + +.text-button:hover { + text-decoration: underline; + color: #666; +} + +.text-button::-moz-focus-inner { + padding: 0; + border: none; +} + +.comment-deleted { + color: #999; +} diff --git a/web/html/home.php b/web/html/home.php index 556e21b..e075bb3 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -45,12 +45,12 @@ html_header( __("Home") ); <p> <?php echo __( - 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR, use the %saur-dev%s mailing list.', + 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR web interface, use the %saurweb-dev%s mailing list.', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>', '<var>', '</var>', - '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aurweb-dev">', '</a>' ); ?> diff --git a/web/html/index.php b/web/html/index.php index 95989f5..3e499ef 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -140,7 +140,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } else { switch ($path) { case "/css/archweb.css": - case "/css/aur.css": + case "/css/aurweb.css": case "/css/archnavbar/archnavbar.css": header("Content-Type: text/css"); readfile("./$path"); diff --git a/web/template/footer.php b/web/template/footer.php index 806d3be..1b451b3 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,9 +3,9 @@ <div id="footer"> <?php if ($ver): ?> - <p>AUR <?= htmlspecialchars($ver) ?></p> + <p>aurweb <?= htmlspecialchars($ver) ?></p> <?php endif; ?> - <p>Copyright © 2004-<?= date("Y") ?> AUR Development Team.</p> + <p>Copyright © 2004-<?= date("Y") ?> aurweb Development Team.</p> <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> diff --git a/web/template/header.php b/web/template/header.php index 6167fb7..8fa44f1 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -6,7 +6,7 @@ <head> <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title> <link rel='stylesheet' type='text/css' href='/css/archweb.css' /> - <link rel='stylesheet' type='text/css' href='/css/aur.css' /> + <link rel='stylesheet' type='text/css' href='/css/aurweb.css' /> <link rel='shortcut icon' href='/images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -- 2.2.2

1 1

[aur-dev] Renaming the AUR
by Lukas Fleischer 30 Jan '15

30 Jan '15

Hi, Currently, we use the term "AUR" for both the collection of user-supplied source packages and the software that helps with accessing and modifying these packages which causes quite some misunderstandings. Earlier, it was suggested to use "[unsupported]" for the collection of packages and "AUR" for the software but I don't really like that terminology (makes the source package repository look like a repository of binary packages and calls the software "repository"). Here is what I suggest: Keep using the term "AUR" for the collection of packages and rename the software to "aurweb" (borrowing from archweb). What would need to be changed: * The name of the aur.git repository would become aurweb.git. * Several references in the AUR(web) source code need to be fixed, the header will still refer to the Arch User Repository. * Some uses of "AUR" in the Arch wiki need to be brought in line with the new terminology. Any other suggestions for a name? Is there anything I missed? I already changed the name of the AUR project to "AUR web interface" on Flyspray. Maybe that helps with reducing the number of AUR package bug reports in the tracker. Regards, Lukas

3 3