- Aur-dev - lists.archlinux.org

[aur-dev] CVS freeze and move to SVN/official tools
by Aaron Griffin 15 Jul '09

15 Jul '09

Hey guys, I'd like to put a freeze on community CVS later today. Sadly, CVS doesn't respect files set to RO, so there's not too much I can do server-side. I'm going to do the SVN conversion in approx 8 hours or so, maybe sooner, if I get some time while at work. In the meantime, this document should explain the usage of the offical tools and svn: http://wiki.archlinux.org/index.php/DeveloperWiki:HOWTO_Be_A_Packager Let me know if there are any questions. Sorry for the long delay on this one. Cheers, Aaron

2 1

[aur-dev] Updated AUR translation of zh_CN
by Mod_Gao 10 Jul '09

10 Jul '09

Attachment is a mostly completed AUR translation of zh_CN, done by me and another one(see file), i don't know how to do a git patch or it got some failure (i already read documents but still don't know), so here is the file directly. all string about "proposal" are not translated because never see this string before. Is this OK? thx!

3 2

[aur-dev] [patch] russian translation minor fixes
by Sergej Pupykin 10 Jul '09

10 Jul '09

Hi, Here is small fixes for RU translation.

2 1

[aur-dev] [PATCH] Add confirmation to package deletion from packages page
by Callan Barrett 10 Jul '09

10 Jul '09

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lib/pkgfuncs.inc | 4 ++++ web/template/actions_form.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index a4a2dfc..80775a2 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -649,6 +649,10 @@ function pkg_delete ($atype, $ids) { return __("You must be logged in before you can disown packages."); } + if ($_POST['form_type'] == 'bar' && empty($_POST['confirm_del'])) { + return __("You need to confirm the deletion of this package."); + } + if (empty($ids)) { return __("You did not select any packages to delete."); } diff --git a/web/template/actions_form.php b/web/template/actions_form.php index de77645..c8a9964 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -1,5 +1,6 @@ <div class="pgbox"> <form action="packages.php?ID=<?php echo $row['ID'] ?>" method="post"> + <input type="hidden" name="form_type" value="bar"> <input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1'> <input type='hidden' name='ID' value="<?php echo $row['ID'] ?>"> <?php @@ -46,7 +47,8 @@ if ($row["MaintainerUID"] == 0) { if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Delete'"; - echo " value='".__("Delete Packages")."'>\n"; + echo " value='".__("Delete Packages")."'>"; + echo " <input type='checkbox' name='confirm_del'> <span class='f5'>" . __("Confirm delete?") . "</span>"; } ?> -- 1.6.0.4

2 1

[aur-dev] Using curl to upload to the AUR
by Xyne 05 Jul '09

05 Jul '09

I am not sure if this is related to the recent move to a new server but I am no longer able to use curl to upload to the AUR (via aurploader). I can't see anything different in the package submit form but attempting to upload a package now returns this page: <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>417 - Expectation Failed</title> </head> <body> <h1>417 - Expectation Failed</h1> </body> </html> As the aurploader code has not changed in months, this must be due either to a change in curl or in the AUR. I am still able to login using aurploader and retrieve the page with the submit form. Googling suggests that this is a lighttpd server error. I will keep trying to find a workaround for curl if this is the case, but could someone please check it it's possible to resolve this serverside? Thanks. Xyne

3 3

[aur-dev] [PATCH] Add a logging function and logging fixins through the code
by Callan Barrett 01 Jul '09

01 Jul '09

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 2 ++ web/lib/acctfuncs.inc | 2 ++ web/lib/aur.inc | 36 ++++++++++++++++++++++++++++++++++++ web/lib/config.inc.proto | 2 ++ web/lib/pkgfuncs.inc | 8 ++++++++ web/template/pkg_comment_form.php | 2 ++ 6 files changed, 52 insertions(+), 0 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index a3394af..04c1542 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -369,6 +369,7 @@ if ($_COOKIE["AURSID"]): } } + if (LOGGING) { logit(2, username_from_sid($_COOKIE['AURSID']), pkgname_from_id($pdata['ID'])); } header('Location: packages.php?ID=' . $pdata['ID']); } else { @@ -419,6 +420,7 @@ if ($_COOKIE["AURSID"]): } pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID)); + if (LOGGING) { logit(1, username_from_sid($_COOKIE['AURSID']), pkgname_from_id($packageID)); } header('Location: packages.php?ID=' . $packageID); diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index 9ed4f22..661b081 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -290,6 +290,8 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", } else { # account created/modified, tell them so. # + if (LOGGING) { logit(4, username_from_sid($U)); } + print __("The account, %h%s%h, has been successfully created.", "<b>", $U, "</b>"); print "<p>\n"; diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 517abe3..6a07d69 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -437,3 +437,39 @@ function mkurl($append) { return substr($out, 5); } + +/** + * Log whatever you like to a table + * + * Basic function so we can get some stats about stuff, we'll just dump + * everything into a table and make up some numbers for different actions + * + * Some Numbers®: + * 1 = upload new package + * 2 = update package + * 3 = delete package + * 4 = register account + * 5 = comment somewhere + * 6 = I dunno lol (I had search here for some reason) + * (maybe we don't need to log this much, I'll make some numbers up anyway) + * 7 = vote/unvote + * 8 = flag/unflag + * 9 = adopt/disown + * + * @param int $action Put your magic number here that represents whatever + * action you're logging + * @param string $who Optional string to log who did the action, normal username + * not the ID + * @param string $pkg Optional string of what package an action happened to, + * actual package names not IDs + */ +function logit($action, $who='', $pkg='') +{ + $dbh = db_connect(); + $q = sprintf("INSERT INTO Log (`action`, `when`, `who`, `pkg`) VALUES (%d, UNIX_TIMESTAMP(), '%s', '%s')", + $action, + mysql_real_escape_string($who), + mysql_real_escape_string($pkg) + ); + db_query($q, $dbh); +} diff --git a/web/lib/config.inc.proto b/web/lib/config.inc.proto index 89b4fe5..6b2b73a 100644 --- a/web/lib/config.inc.proto +++ b/web/lib/config.inc.proto @@ -39,3 +39,5 @@ $SUPPORTED_LANGS = array( # Idle seconds before timeout $LOGIN_TIMEOUT = 7200; +# Shall we log everything? +define("LOGGING", FALSE); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 80775a2..699d6e3 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -599,6 +599,8 @@ function pkg_flag ($atype, $ids, $action = True) { } else { $flag .= ", " . $pid; } + + if (LOGGING) { logit(8, username_from_sid($_COOKIE['AURSID']), pkgname_from_id($pid)); } } $ood = $action ? 1 : 0; @@ -699,6 +701,8 @@ function pkg_delete ($atype, $ids) { # These are the packages that are safe to delete foreach ($ids_to_delete as $id) { + if (LOGGING) { logit(3, username_from_sid($_COOKIE['AURSID']), pkgname_from_id($id)); } + $q = "DELETE FROM PackageVotes WHERE PackageID = " . $id; $result = db_query($q, $dbh); @@ -757,6 +761,8 @@ function pkg_adopt ($atype, $ids, $action = True) { } else { $pkg .= ", ".$pid; } + + if (LOGGING) { logit(9, username_from_sid($_COOKIE['AURSID']), pkgname_from_id($pid)); } } $field = "MaintainerUID"; @@ -840,6 +846,8 @@ function pkg_vote ($atype, $ids, $action = True) { } } } + + if (LOGGING) { logit(7, username_from_sid($_COOKIE['AURSID']), pkgname_from_id($pid)); } } # only vote for packages the user hasn't already voted for diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 70570da..213cc81 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -11,6 +11,8 @@ if (isset($_REQUEST['comment'])) { $q.= 'UNIX_TIMESTAMP())'; db_query($q, $dbh); + if (LOGGING) { logit(5, username_from_sid($_COOKIE['AURSID']), pkgname_from_id(intval($_REQUEST['ID']))); } + # Send email notifications $q = 'SELECT CommentNotify.*, Users.Email '; $q.= 'FROM CommentNotify, Users '; -- 1.6.0.4

3 5

[aur-dev] Moving the AUR/community
by Aaron Griffin 25 Jun '09

25 Jun '09

Hey all, This is part informational, and part not. We have a donated server from SevenL networks that has sat mostly unused up until now. What we would like to do is more the AUR and community on to that machine, so that TUs can get real (limited) shell accounts and the people managing this side of the project get a bit more control. As far as I know, things are almost ready to go, but what we need to do is setup a good time to "freeze" the AUR and community so we can switch over the DNS and change checkout locations. Once this is complete, we can move forward with switching community to SVN and using the official dbscripts for managing the repo. This way you guys can get your own testing repo too! Sooo... the list, as I see it: * Decide on a date and time for the move * Get SSH keys from all TUs * Switch DNS over * Disable the AUR/community on gerolde Anything I'm missing? Suggestions as to a good date?

2 1

[aur-dev] AUR Search
by Andrei Thorp 24 Jun '09

24 Jun '09

Hello there! Today, I'd like to be all complainy about the AUR search feature. I haven't really looked around, but are there plans to improve it? Or is the solution just "use google with site://"? It seems to be kind of bad at finding stuff. Some examples: - Can't search by description (well, it does search by description by default, but it's not in the advanced options anywhere) - Can't really do any decent multi-word searches afaik. To take an example from the other argument thread, try searching for "java gstreamer". It finds neither gstreamer-java nor java-gstreamer. It actually finds nothing at all. - Similarly, wildcards seem to not work. "java*gstreamer" has no results. - It seems to not even do exact matches first. For example, search for my package, "sup". There is a package in AUR that's exactly named "sup", but if you search for that, you get 658 results, sorted alphabetically! - Which reminds me, what about sorting by relevance somehow? Perhaps sort by a weighting of votes, age, downloads, etc. I'm sorry if I'm bringing this up as someone's already writing improvements for AUR and this is just a waste of time :) Anyway, thanks! Note: This is a forward of an e-mail that I sent to Arch-General previously. -- Andrei Thorp, Developer: Xandros Corp. (http://www.xandros.com) Anybody who doesn't cut his speed at the sight of a police car is probably parked.

2 1

[aur-dev] [patch] TU page submit button i18n and russian translation update
by Sergej Pupykin 18 Jun '09

18 Jun '09

Hi, Here are two patches: - Submit button i18n on add voting page - Russian translation small update

2 1

[aur-dev] [PATCH] Turn on package notification by default for new packages
by Callan Barrett 18 Jun '09

18 Jun '09

Version using package functions Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 78d6e50..450e9b6 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -328,6 +328,7 @@ if ($_COOKIE["AURSID"]): header('Location: packages.php?ID=' . $pdata['ID']); } else { + $uid = uid_from_sid($_COOKIE["AURSID"]); # This is a brand new package $q = sprintf("INSERT INTO Packages (Name, License, Version, CategoryID, Description, URL, LocationID, SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) VALUES ('%s', '%s', '%s-%s', %d, '%s', '%s', 2, UNIX_TIMESTAMP(), %d, %d, '%s', '%s')", @@ -338,8 +339,8 @@ if ($_COOKIE["AURSID"]): mysql_real_escape_string($_REQUEST['category']), mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), - uid_from_sid($_COOKIE["AURSID"]), - uid_from_sid($_COOKIE["AURSID"]), + $uid, + $uid, mysql_real_escape_string(INCOMING_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz"), mysql_real_escape_string(URL_DIR . $pkg_name . "/" . $pkg_name . ".tar.gz")); @@ -370,6 +371,8 @@ if ($_COOKIE["AURSID"]): $q .= $packageID . ", '" . mysql_real_escape_string($src) . "')"; db_query($q, $dbh); } + + pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($packageID)); header('Location: packages.php?ID=' . $packageID); -- 1.6.0.2

2 1