June 2015 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Improve INSTALL details for nginx and config.
by Leonidas Spyropoulos 17 Jun '15

17 Jun '15

Signed-off-by: Leonidas Spyropoulos <artafinde(a)gmail.com> --- INSTALL | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 9040c17..d78740a 100644 --- a/INSTALL +++ b/INSTALL @@ -6,14 +6,41 @@ Setup on Arch Linux $ cd /srv/http/ $ git clone git://projects.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: - - location ~ .* { - rewrite ^/(.*)$ /index.php/$1 last; +2) Setup a web server with PHP support and MySQL. Configure the web server + to redirect all URLs to /index.php/foo/bar/. For nginx a working setup + could be: + + http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + server { + listen 80; + server_name localhost; + error_log /var/log/nginx/aurweb.error.log notice; + location ~ ^/[^/]+\.php($|/) { + fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; + fastcgi_index index.php; + fastcgi_split_path_info ^(/[^/]+\.php)(/.*)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include fastcgi_params; + } + location ~ .* { + rewrite ^/(.*)$ /index.php/$1 last; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + } + root /srv/http/aurweb/web/html; + index index.php index.html index.htm; } -3) Copy conf/config.proto to conf/config and adjust the configuration. +3) Copy conf/config.proto to conf/config and adjust the configuration (pay + attention on disable_http_login, enable_maintenance and aur_location) 4) Create a new MySQL database and a user and import the AUR SQL schema: -- 2.4.3

3 4

[aur-dev] [PATCH 1/2] Merge user ids in CommentNotify
by Marcel Korpel 17 Jun '15

17 Jun '15

Fixes FS#27687. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/lib/pkgbasefuncs.inc.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index c8c99eb..e255cb4 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -508,6 +508,24 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) { $q.= "WHERE PackageBaseID IN (" . implode(",", $base_ids) . ")"; $dbh->exec($q); + /* Merge comment notifications */ + $q = "SELECT UserID FROM CommentNotify "; + $q.= "WHERE PackageBaseID IN (" . implode(",", $base_ids) . ")"; + $result = $dbh->query($q); + + while ($uid = $result->fetchColumn(0)) { + /* Check if a user already gets notifications from $merge_base_id */ + $q = "SELECT COUNT(*) FROM CommentNotify WHERE "; + $q .= "UserID = $uid AND PackageBaseID = " . intval($merge_base_id); + + $result_notif = $dbh->query($q); + if ($result_notif->fetchColumn() == 0) { + $q = "INSERT INTO CommentNotify (PackageBaseID, UserID) VALUES ("; + $q.= intval($merge_base_id) . ", $uid)"; + $dbh->exec($q); + } + } + /* Merge votes */ foreach ($base_ids as $base_id) { $q = "UPDATE PackageVotes "; -- 2.4.3

2 2

[aur-dev] [PATCH] reloadtestdb.sh: Use aurweb as main directory
by Marcel Korpel 16 Jun '15

16 Jun '15

By default, aurweb is cloned into the aurweb directory nowadays. --- schema/reloadtestdb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/reloadtestdb.sh b/schema/reloadtestdb.sh index ecaaaa8..e839dce 100755 --- a/schema/reloadtestdb.sh +++ b/schema/reloadtestdb.sh @@ -11,7 +11,7 @@ echo "Using database $DB_NAME, user $DB_USER, host $DB_HOST" mydir=$(pwd) if [ $(basename $mydir) != "schema" ]; then - echo "you must be in the aur/schema directory to run this script" + echo "you must be in the aurweb/schema directory to run this script" exit 1 fi -- 2.4.3

1 0

[aur-dev] [PATCH] Add aur-git/ and git-interface/git-auth.sh to gitignore.
by Leonidas Spyropoulos 16 Jun '15

16 Jun '15

Signed-off-by: Leonidas Spyropoulos <artafinde(a)gmail.com> --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 590e1ef..c41bf3e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ po/POTFILES scripts/git-integration/__pycache__/ scripts/git-integration/templates/ web/locale/*/ +aur.git/ +git-interface/git-auth.sh -- 2.4.3

1 0

[aur-dev] [PATCH] gendummydata.py: Remove CategoryID from dummy data
by Marcel Korpel 16 Jun '15

16 Jun '15

--- schema/gendummydata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/gendummydata.py b/schema/gendummydata.py index 7b18a50..9dd2f45 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -202,9 +202,9 @@ for p in list(seen_pkgs.keys()): uuid = genUID() # the submitter/user - s = ("INSERT INTO PackageBases (ID, Name, CategoryID, SubmittedTS, " - "SubmitterUID, MaintainerUID, PackagerUID) VALUES (%d, '%s', %d, %d, %d, %s, %s);\n") - s = s % (seen_pkgs[p], p, genCategory(), NOW, uuid, muid, puid) + s = ("INSERT INTO PackageBases (ID, Name, SubmittedTS, " + "SubmitterUID, MaintainerUID, PackagerUID) VALUES (%d, '%s', %d, %d, %s, %s);\n") + s = s % (seen_pkgs[p], p, NOW, uuid, muid, puid) out.write(s) s = ("INSERT INTO Packages (ID, PackageBaseID, Name, Version) VALUES " -- 2.4.3

1 0

[aur-dev] Difficulties setting up local aurweb server
by Marcel Korpel 16 Jun '15

16 Jun '15

Hi, I tried to setup an nginx server locally for testing aurweb, but I encountered several difficulties. I wanted to start with a clean setup, so first, I deleted the aur user in my system and database and the AUR database in MySQL, that were still lingering around from earlier development (using Apache). Then I installed nginx and made these changes to /etc/nginx/nginx.conf: server { listen 8888; server_name localhost; location / { root /srv/http/aurweb/web/html; index index.html index.htm; } location ~ .* { rewrite ^/(.*)$ /index.php/$1 last; } […] I want to use port 8888, as I still run Apache on port 80 (and Tomcat on 8080). When using the default configuration, so with root pointing to the nginx directory and without the location rewriting, the default welcome page appears when heading to localhost:8888. I copied conf/config.proto to conf/config and adjusted the configuration. A copy is at http://pastebin.com/D1XbnJK1 (and yes, the database password is correct). I created a new MySQL database AUR and user aur and imported the schema according to INSTALL, step 4. Everything went fine. Awful phpmyadmin showed me the newly created database. I added a new user to my system and initialized the Git repo. Also did step 7 (installed git-auth wrapper script). Then I stumbled upon the necessity of using OpenSSH 6.9: it's not in [core] and even openssh-git in the AUR let me build a version 6.8something. Oh well, I don't need an sshd just to tinker with the web interface, the dummy data will be enough, was my assumption. BTW, copying the instructions to generate and load the test data from an earlier version of INSTALL would be helpful (I've still a copy around, so I can create a patch, if needed). However, I went again to localhost:8888 but got a 500 error. When commenting out the rewrite part, I got a 403 Forbidden. I already looked in the logs, but I can only see an access.log that shows me my visits. Any clue of what I did wrong is greatly appreciated. Thanks, Marcel

4 10

[aur-dev] [PATCH] Update french translation
by Xorg 16 Jun '15

16 Jun '15

Hi. Because I'm not a member of french team on Transifex, I can't push the updated translation on Transifex. This is my first patch-send on a mailing-list, sorry if I'm wrong.

2 2

[aur-dev] [PATCH] Update french translation
by Xorg 16 Jun '15

16 Jun '15

Sorry for the fail. --- a/po/fr.po 2015-06-13 10:26:08.017665000 +0200 +++ b/po/fr.po 2015-06-16 11:03:10.436817224 +0200 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: Arch User Repository (AUR)\n" "Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" -"POT-Creation-Date: 2015-06-11 23:45+0200\n" -"PO-Revision-Date: 2015-06-11 21:46+0000\n" +"POT-Creation-Date: 2015-06-14 21:56+0200\n" +"PO-Revision-Date: 2015-06-16 10:53+0000\n" "Last-Translator: Lukas Fleischer <transifex(a)cryptocrack.de>\n" "Language-Team: French (http://www.transifex.com/projects/p/aur/language/" "fr/)\n" @@ -32,11 +32,12 @@ msgstr "Désolé, la page que vous avez demandée n’existe pas." msgid "Service Unavailable" -msgstr "" +msgstr "Service indisponible" msgid "" "Don't panic! This site is down due to maintenance. We will be back soon." msgstr "" +"Ne paniquez pas ! Le site est fermé pour maintenance. Nous serons bientôt de retour." msgid "Account" msgstr "Compte" @@ -116,7 +117,7 @@ msgstr "Soumettre" msgid "Manage Co-maintainers" -msgstr "" +msgstr "Gérer les co-mainteneurs" msgid "Home" msgstr "Accueil" @@ -156,48 +157,78 @@ "Les paquets non supportés sont produits par des utilisateurs. Toute " "utilisation des fichiers fournis se fait à vos propres risques." +msgid "Learn more..." +msgstr "En apprendre plus..." + msgid "Support" -msgstr "" +msgstr "Soutien" msgid "Package Requests" -msgstr "" +msgstr "Requêtes de paquet" #, php-format msgid "" "There are three types of requests that can be filed in the %sPackage Actions" "%s box on the package details page:" msgstr "" +"Il existe trois types de requêtes qui peuvent être soumises dans la boîte %sActions du paquet" +"%s sur la page des détails d'un paquet :" msgid "Orphan Request" -msgstr "" +msgstr "Requête de destitution" msgid "" "Request a package to be disowned, e.g. when the maintainer is inactive and " "the package has been flagged out-of-date for a long time." msgstr "" +"Demande qu'un paquet soit destitué, c'est-à-dire quand le mainteneur est inactif et " +"que le paquet a été marqué comme périmé depuis un long moment." msgid "Deletion Request" -msgstr "" +msgstr "Requête de suppression" msgid "" "Request a package to be removed from the Arch User Repository. Please do not " "use this if a package is broken and can be fixed easily. Instead, contact " "the package maintainer and file orphan request if necessary." msgstr "" +"Demande qu'un paquet soit supprimé d'AUR. Prière de ne pas " +"l'utiliser si un paquet est cassé et que le problème peut être réglé facilement. À la place, contactez " +"le mainteneur du paquet, et soumettez une requête de destitution si nécessaire." msgid "Merge Request" -msgstr "" +msgstr "Requête de fusion" msgid "" "Request a package to be merged into another one. Can be used when a package " "needs to be renamed or replaced by a split package." msgstr "" +"Demande que le paquet soit fusionné dans un autre. Peut être utilisé quand un paquet " +"a besoin d'être renommé ou bien remplacé par un paquet splitté." #, php-format msgid "" "If you want to discuss a request, you can use the %saur-requests%s mailing " "list. However, please do not use that list to file requests." msgstr "" +"Si vous voulez débattre d'une requête, vous pouvez utiliser la mailing-list %saur-requests%s. " +"Cependant, merci de ne pas utiliser cette liste pour soumettre des requêtes." + +msgid "Submitting Packages" +msgstr "Soumission de paquets" + +#, php-format +msgid "" +"Git over SSH is now used to submit packages to the AUR. See the %sSubmitting " +"packages%s section of the Arch User Repository ArchWiki page for more " +"details." +msgstr "" +"Git par-dessus SSH est maintenant utilisé pour soumettre des paquets sur AUR. Voir la section %sSoumettre " +"des paquets%s sur la page Arch User Repository du wiki pour plus de " +"détails." + +msgid "The following SSH fingerprints are used for the AUR:" +msgstr "Les empreintes SSH suivantes sont utilisées pour AUR :" msgid "Discussion" msgstr "Discussion" @@ -208,6 +239,10 @@ "structure takes place on %saur-general%s. For discussion relating to the " "development of the AUR web interface, use the %saur-dev%s mailing list." msgstr "" +"Les discussions générales en rapport avec AUR (Arch User Repository, dépôt des utilisateurs d’Arch Linux) " +"et les TU (Trusted User, utilisateurs de confiance) " +"ont lieu sur %saur-general%s. Pour les discussions en rapport " +"avec le développement de l'interface web d'AUR, utilisez la mailing-list %saur-dev.%s" msgid "Bug Reporting" msgstr "Rapports de bug" @@ -219,6 +254,9 @@ "report packaging bugs contact the package maintainer or leave a comment on " "the appropriate package page." msgstr "" +"Si vous trouvez un bug dans l'interface web d'AUR, merci de remplir un rapport de bug sur " +"le %sbug tracker%s. N’utilisez le tracker %sque%s pour les bugs de AUR. " +"Pour signaler un bug dans un paquet, contactez directement le mainteneur du paquet, ou laissez un commentaire sur la page du paquet." msgid "Package Search" msgstr "Recherche d'un paquet" @@ -304,6 +342,9 @@ "your e-mail address. If you wish to reset your password follow the link " "below, otherwise ignore this message and nothing will happen." msgstr "" +"La demande de réinitialisation de mot de passe a été envoyée au compte %s associé à " +"votre adresse e-mail. Si vous voulez réinitialiser votre mot de passe, cliquez sur le lien " +"ci-dessous, sinon ignorez ce message et aucune modification sera effectuée." msgid "Password Reset" msgstr "Réinitialisation de mot de passe" @@ -341,6 +382,8 @@ "The selected packages have not been disowned, check the confirmation " "checkbox." msgstr "" +"Les paquets sélectionnés n'ont pas été destitués, vérifiez la boîte de " +"confirmation." msgid "Cannot find package to merge votes and comments into." msgstr "" @@ -393,32 +436,37 @@ #, php-format msgid "Disown Package: %s" -msgstr "" +msgstr "Destituer le paquet : %s" #, php-format msgid "" "Use this form to disown the package base %s%s%s which includes the following " "packages: " msgstr "" +"Utilisez ce formulaire pour destituer le paquet de base %s%s%s qui inclut les paquets " +"suivants : " #, php-format msgid "" "By selecting the checkbox, you confirm that you want to disown the package " "and transfer ownership to %s%s%s." msgstr "" +"En cochant la case, vous confirmez que vous voulez destituer le paquet " +"et transférer sa propriété à %s%s%s." msgid "" "By selecting the checkbox, you confirm that you want to disown the package." msgstr "" +"En cochant la case, vous confirmez que vous voulez destituer le paquet." msgid "Confirm to disown the package" -msgstr "" +msgstr "Confirmer la destitution du paquet" msgid "Disown" msgstr "Destituer" msgid "Only Trusted Users and Developers can disown packages." -msgstr "" +msgstr "Seuls les Utilisateur de Confiance et les Développeurs peuvent destituer des paquets." msgid "Package Merging" msgstr "Fusion de paquet" @@ -454,7 +502,7 @@ msgid "Only Trusted Users and Developers can merge packages." msgstr "" -"Seuls les utilisateurs de confiance et les développeurs peuvent fusionner " +"Seuls les Utilisateur de Confiance et les Développeurs peuvent fusionner " "des paquets." msgid "File Request" @@ -538,7 +586,7 @@ msgstr "L’empreinte de clé PGP est invalide." msgid "The SSH public key is invalid." -msgstr "" +msgstr "La clé SSH publique est invalide." msgid "Cannot increase account permissions." msgstr "Ne peut pas augmenter les autorisations du compte." @@ -556,7 +604,7 @@ #, php-format msgid "The SSH public key, %s%s%s, is already in use." -msgstr "" +msgstr "La clé SSH publique, %s%s%s, est déjà utilisée." #, php-format msgid "Error trying to create account, %s%s%s." @@ -625,6 +673,10 @@ msgid "None" msgstr "Aucun" +#, php-format +msgid "View account information for %s" +msgstr "Voir les informations du compte pour %s" + msgid "Error retrieving package details." msgstr "Erreur en recherchant les détails du paquet." @@ -722,27 +774,21 @@ msgid "You are not allowed to delete this comment." msgstr "Vous n'êtes pas autorisé(e) à supprimer ce commentaire." -msgid "Missing category ID." -msgstr "ID de catégorie manquant." - -msgid "Invalid category ID." -msgstr "ID de catégorie non valide." +msgid "You are not allowed to edit the keywords of this package base." +msgstr "Vous n'êtes pas autorisé à éditer les mots-clés de ce paquet de base." -msgid "You are not allowed to change this package category." -msgstr "Vous n'êtes pas autorisé à modifier la catégorie de ce paquet." - -msgid "Package category changed." -msgstr "Catégorie du paquet changé." +msgid "The package base keywords have been updated." +msgstr "Les mots-clés du paquet de base ont été mis à jour." msgid "You are not allowed to manage co-maintainers of this package base." -msgstr "" +msgstr "Vous n'êtes pas autorisé à gérer les co-mainteneurs de ce paquet de base." #, php-format msgid "Invalid user name: %s" -msgstr "" +msgstr "Nom d'utilisateur invalide : %s" msgid "The package base co-maintainers have been updated." -msgstr "" +msgstr "Les co-mainteneurs du paquet de base ont été mis à jour." msgid "View packages details for" msgstr "Voir le paquet" @@ -781,7 +827,7 @@ #, php-format msgid "%sWARNING%s: This action cannot be undone." -msgstr "%sWARNING%s: cette action ne peut étre annulée" +msgstr "%sATTENTION%s: cette action ne peut être annulée" msgid "Confirm deletion" msgstr "Confirmer la suppression" @@ -860,9 +906,11 @@ "The following information is only required if you want to submit packages to " "the Arch User Repository." msgstr "" +"L'information suivante est requise uniquement si vous voulez soumettre des " +"paquets sur AUR" msgid "SSH Public Key" -msgstr "" +msgstr "Clé SSH publique" msgid "Update" msgstr "Mise à jour" @@ -896,18 +944,18 @@ #, php-format msgid "Manage Co-maintainers: %s" -msgstr "" +msgstr "Gérer les co-mainteneurs" #, php-format msgid "" "Use this form to add co-maintainers for %s%s%s (one user name per line):" -msgstr "" +msgstr "Utilisez ce formulaire pour ajouter des co-mainteneurs pour %s%s%s (un nom d'utilisateur par ligne) :" msgid "Users" -msgstr "" +msgstr "Utilisateurs" msgid "Save" -msgstr "" +msgstr "Sauvegarder" msgid "My Packages" msgstr "Mes paquets" @@ -931,10 +979,10 @@ msgstr "Voir le PKGBUILD" msgid "View Changes" -msgstr "" +msgstr "Voir les changements" msgid "Download snapshot" -msgstr "" +msgstr "Télécharger un instantané" msgid "Search wiki" msgstr "Rechercher sur le wiki" @@ -961,7 +1009,7 @@ msgstr "Avertir des nouveaux commentaires" msgid "Manage Co-Maintainers" -msgstr "" +msgstr "Gérer les co-mainteneurs" #, php-format msgid "%d pending request" @@ -979,21 +1027,14 @@ msgstr "Adopter ce paquet" msgid "Git Clone URL" -msgstr "" - -msgid "Category" -msgstr "Catégorie" +msgstr "URL de clone (Git)" -msgid "Change category" -msgstr "Changer de catégorie" +msgid "Keywords" +msgstr "Mots-clés" msgid "Submitter" msgstr "Contributeur" -#, php-format -msgid "View account information for %s" -msgstr "Voir les informations du compte %s" - msgid "Maintainer" msgstr "Mainteneur" @@ -1200,7 +1241,7 @@ msgstr "Nom" msgid "Popularity" -msgstr "" +msgstr "Popularité" msgid "Voted" msgstr "Voté" @@ -1217,15 +1258,9 @@ msgid "Enter search criteria" msgstr "Saisissez les critères de recherche" -msgid "Any" -msgstr "Tous" - msgid "Search by" msgstr "Rechercher par" -msgid "Keywords" -msgstr "Mots-clés" - msgid "Out of Date" msgstr "Périmé"

1 0

[aur-dev] [PATCH] Add help cursor for Popularity field hover.
by Leonidas Spyropoulos 15 Jun '15

15 Jun '15

Signed-off-by: Leonidas Spyropoulos <artafinde(a)gmail.com> --- web/html/css/aurweb.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 5394281..346f2ea 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -88,4 +88,5 @@ p.important { span.hover-help { border-bottom: 1px dotted black; + cursor:help; } -- 2.4.3

2 1

[aur-dev] [PATCH] Add help cursor for Popularity field hover.
by Leonidas Spyropoulos 15 Jun '15

15 Jun '15

Signed-off-by: Leonidas Spyropoulos <artafinde(a)gmail.com> --- web/html/css/aurweb.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 5394281..7935f94 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -88,4 +88,5 @@ p.important { span.hover-help { border-bottom: 1px dotted black; + cursor:help; } -- 2.4.3

1 1