September 2010 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add functionality to the web interface to enable packages to be proposed for deletion and deletion proposals to be cancelled.
by Peter Lewis 27 Sep '10

27 Sep '10

--- web/html/packages.php | 4 ++++ web/template/actions_form.php | 12 +++++++++++- web/template/pkg_search_results.php | 4 ++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 472f6a2..48924b6 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -45,6 +45,10 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $output = pkg_vote($atype, $ids, True); } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { $output = pkg_vote($atype, $ids, False); +} elseif ($_POST['action'] == "do_ProposeDeletion" || isset($_POST['do_ProposeDeletion'])) { + $output = pkg_propose_deletion($atype, $ids, True); +} elseif ($_POST['action'] == "do_UnProposeDeletion" || isset($_POST['do_UnProposeDeletion'])) { + $output = pkg_propose_deletion($atype, $ids, False); } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { if (isset($_POST['confirm_Delete'])) { $output = pkg_delete($atype, $ids); diff --git a/web/template/actions_form.php b/web/template/actions_form.php index d1559f5..006f9ef 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -43,7 +43,17 @@ if ($row["MaintainerUID"] == 0) { echo "<input type='submit' class='button' name='do_Disown'"; echo " value='".__("Disown Packages")."'>\n"; } - + +if ($row["DeletionProposed"] == 0) { + echo "<input type='submit' class='button' name='do_ProposeDeletion'"; + echo " value='".__("Propose for deletion")."'>\n"; +} else if ($atype == "Trusted User" || $atype == "Developer") { + echo "<input type='submit' class='button' name='do_UnProposeDeletion'"; + echo " value='".__("Cancel deletion proposal")."'>\n"; +} else { + echo __("Deletion proposed"); +} + if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Delete'"; echo " value='".__("Delete Packages")."'>\n"; diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index bb898df..f2ce5c0 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -107,6 +107,10 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php endif; ?> <option value='do_Notify'><?php print __("Notify") ?></option> <option value='do_UnNotify'><?php print __("UnNotify") ?></option> + <option value='do_ProposeDeletion'><?php print __("Propose Deletion") ?></option> + <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> + <option value='do_UnProposeDeletion'><?php print __("Cancel Deletion Proposal") ?></option> + <?php endif; ?> </select> <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <input type='checkbox' name='confirm_Delete' value='1' /> <?php print __("Confirm") ?> -- 1.7.3

1 0

[aur-dev] [PATCH] Add function pkg_propose_deletion to web/lib/pkgfuncs.inc, which manages whether or not a package is currently proposed for deletion and emails the maintainer and aur-general when a deletion is proposed.
by Peter Lewis 27 Sep '10

27 Sep '10

--- web/lib/pkgfuncs.inc | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5605daa..386662c 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -678,6 +678,101 @@ function pkg_flag ($atype, $ids, $action = True) { } /** + * Propose packages for deletion and cancel proposals + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to propose / cancel proposals for + * @param boolean $action True proposes deletion, false cancels proposal. + * Proposes by default. + * + * @return string Translated success or error messages + */ +function pkg_propose_deletion ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can propose packages for deletion."); + } else { + return __("You must be logged in before you can cancel deletion proposals."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to propose."); + } else { + return __("You did not select any packages to cancel proposals for."); + } + } + + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to propose."); + } else { + return __("You did not select any packages to cancel proposals for."); + } + } + } + + $dbh = db_connect(); + + $first = 1; + foreach ($ids as $pid) { + if ($first) { + $first = 0; + $propose = $pid; + } else { + $propose .= ", " . $pid; + } + } + + $ood = $action ? 1 : 0; + $q = "UPDATE Packages SET DeletionProposed = " . $ood; + $q.= " WHERE ID IN (" . $propose . ")"; + + if (!$action) { + echo "Undeleting!!!!"; + } + + db_query($q, $dbh); + + if ($action) { + # Notify maintainer and aur-general of proposal by email + $f_name = username_from_sid($_COOKIE['AURSID']); + $f_email = email_from_sid($_COOKIE['AURSID']); + $f_uid = uid_from_sid($_COOKIE['AURSID']); + $q = "SELECT Packages.Name, Users.Email, Packages.ID "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID IN (" . $propose .") "; + $q.= "AND Users.ID = Packages.MaintainerUID "; + $q.= "AND Users.ID != " . $f_uid; + $result = db_query($q, $dbh); + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + # construct email - maintainer + $body = "Your package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1]. You may view your package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail($row['Email'], "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + + # construct email - aur-general + $body = "The AUR package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1]. You may view the package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail('aur-general(a)archlinux.org', "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + + } + } + } + + if ($action) { + return __("The selected packages have been proposed for deletion."); + } else { + return __("The deletion proposals have been cancelled for the selection packages."); + } +} + +/** * Delete packages * * @param string $atype Account type, output of account_from_sid -- 1.7.3

1 0

[aur-dev] [PATCH] Add database column DeletionProposed to Packages table, indicating whether or not the package is currently proposed for deletion.
by Peter Lewis 27 Sep '10

27 Sep '10

--- support/schema/aur-schema.sql | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 250d405..8d49e15 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -120,6 +120,7 @@ CREATE TABLE Packages ( LocationID TINYINT UNSIGNED NOT NULL DEFAULT 1, NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0, OutOfDate TINYINT UNSIGNED DEFAULT 0, + DeletionProposed TINYINT UNSIGNED DEFAULT 0, SubmittedTS BIGINT UNSIGNED NOT NULL, ModifiedTS BIGINT UNSIGNED NOT NULL, SubmitterUID INTEGER UNSIGNED NOT NULL DEFAULT 0, -- who submitted it? -- 1.7.3

1 0

[aur-dev] Handling deletion through the web interface.
by Peter Lewis 27 Sep '10

27 Sep '10

Hi folks, As I said in my TU application, I want to get involved in trying to grease the wheels of the AUR a little. So, I'm proposing as a first step that we allow (prefer? require?) deletion requests to be handled through the web interface. The main aim of this is to try to standardise the process and information available in the messages (and therefore archived on aur-general) concerning AUR deletion requests. For example, messages like this are now somewhat meaningless (no offence to the author or anyone else intended): Subject: [aur-general] Delete and orphan request Hi, can somebody delete the following packages: 1) http://aur.archlinux.org/packages.php?ID=38923 - my mistake, error in package name, replacement here http://aur.archlinux.org/packages.php?ID=39067 2) http://aur.archlinux.org/packages.php?ID=17379 and http://aur.archlinux.org/packages.php?ID=36306 - they duplicate this package http://aur.archlinux.org/packages.php?ID=5790 3) http://aur.archlinux.org/packages.php?ID=28544 - this is version from previous developer of Onscripter-en 4) http://aur.archlinux.org/packages.php?ID=8242 - already included in community etc. etc. The basic idea is this: 1) Any user can click a button to propose a package for deletion. This flags that package as having been proposed, and triggers an email to aur-general and the package maintainer, containing the name of the package and a link to it. 2) TUs and others can discuss the deletion request on aur-general as before. 3) When a decision is made, a TU can then either delete the package, or else cancel the deletion proposal, also on the web interface. Once a package is proposed for deletion, no-one else can also propose it (until / unless the request is cancelled by a TU), so aur-general doesn't get more than one email. I'll forward the patches to this list for review. This is just the first bit of this implementation (it's pretty basic). Still to do (IMO) is: - Include a form for the proposer of the deletion to write a few words about why it should be deleted. - Place information about a package's current "proposed for deletion" status in prominent places on the web interface. - Also email everyone who has asked to be notified about the package. Cheers, Pete. PS. Note that it also requires a small database schema change.

2 2

[aur-dev] Hello all
by Manuel Tortosa 24 Sep '10

24 Sep '10

Hello all, i'm Manuel Tortosa, from the Chakra Project and i work in the Chakra Webpage developement ( i'm the pacman Catalan translator :P ) As you know we forked AUR to fit the Chakra needs, using your code. I did some changes to the source code and this means it's impossible to keep our implementation synced upstream but i plan to add some new features to our AUR installation and i already added some, even if it's not possible to mix both implementations i'm interested in provide you any new feature i add to the code suitable for both needs, in the form of patches maded directly to the AUR source code. Later you can decide to apply these patches features or not ;) As example i added syntax highlighting via GeShi to the pkgbuild view, this is how AUR shows a packagebuild, when you click in the pkgbuild link in packages.php (Tarball :: Files :: PKGBUILD): http://aur.archlinux.org/packages/gxneur-svn/gxneur-svn/PKGBUILD This is how Ccr shows a pkgbuild: http://chakra- project.org/ccr/pkgbuildview.php?pkgbuild=packages/yum/yum/PKGBUILD where can i send these patches? All the paches will be prepared using the AUR source code and template agnostic to fit the ARCH look even if this means double work for me. Thanks a lot for your work. Keep Arch rolling!

2 1

[aur-dev] Status of the password recovery patch
by Duru Can Celasun 20 Sep '10

20 Sep '10

Hi, 11 months ago someone wrote a password recovery patch[1] for AUR and it got committed[2] into the git repo in a few weeks. Is there a reason why this is not pushed into the live site? What is the status of this patch? [1] http://bugs.archlinux.org/task/3061 [2] http://projects.archlinux.org/aur.git/commit/?id=861cbf493591ec876f71ba200a… -- D. Can Celasun

5 4

[aur-dev] [PATCH 3/3] Add functionality to the web interface to enable packages to be proposed for deletion and deletion proposals to be cancelled.
by Peter Lewis 12 Sep '10

12 Sep '10

--- web/html/packages.php | 4 ++++ web/template/actions_form.php | 12 +++++++++++- web/template/pkg_search_results.php | 4 ++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 472f6a2..48924b6 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -45,6 +45,10 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { $output = pkg_vote($atype, $ids, True); } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { $output = pkg_vote($atype, $ids, False); +} elseif ($_POST['action'] == "do_ProposeDeletion" || isset($_POST['do_ProposeDeletion'])) { + $output = pkg_propose_deletion($atype, $ids, True); +} elseif ($_POST['action'] == "do_UnProposeDeletion" || isset($_POST['do_UnProposeDeletion'])) { + $output = pkg_propose_deletion($atype, $ids, False); } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { if (isset($_POST['confirm_Delete'])) { $output = pkg_delete($atype, $ids); diff --git a/web/template/actions_form.php b/web/template/actions_form.php index d1559f5..006f9ef 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -43,7 +43,17 @@ if ($row["MaintainerUID"] == 0) { echo "<input type='submit' class='button' name='do_Disown'"; echo " value='".__("Disown Packages")."'>\n"; } - + +if ($row["DeletionProposed"] == 0) { + echo "<input type='submit' class='button' name='do_ProposeDeletion'"; + echo " value='".__("Propose for deletion")."'>\n"; +} else if ($atype == "Trusted User" || $atype == "Developer") { + echo "<input type='submit' class='button' name='do_UnProposeDeletion'"; + echo " value='".__("Cancel deletion proposal")."'>\n"; +} else { + echo __("Deletion proposed"); +} + if ($atype == "Trusted User" || $atype == "Developer") { echo "<input type='submit' class='button' name='do_Delete'"; echo " value='".__("Delete Packages")."'>\n"; diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index bb898df..f2ce5c0 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -107,6 +107,10 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { <?php endif; ?> <option value='do_Notify'><?php print __("Notify") ?></option> <option value='do_UnNotify'><?php print __("UnNotify") ?></option> + <option value='do_ProposeDeletion'><?php print __("Propose Deletion") ?></option> + <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> + <option value='do_UnProposeDeletion'><?php print __("Cancel Deletion Proposal") ?></option> + <?php endif; ?> </select> <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <input type='checkbox' name='confirm_Delete' value='1' /> <?php print __("Confirm") ?> -- 1.7.2.3

1 0

[aur-dev] [PATCH 2/3] Add function pkg_propose_deletion to web/lib/pkgfuncs.inc, which manages whether or not a package is currently proposed for deletion and emails the maintainer and aur-general when a deletion is proposed.
by Peter Lewis 12 Sep '10

12 Sep '10

--- web/lib/pkgfuncs.inc | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5605daa..386662c 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -678,6 +678,101 @@ function pkg_flag ($atype, $ids, $action = True) { } /** + * Propose packages for deletion and cancel proposals + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to propose / cancel proposals for + * @param boolean $action True proposes deletion, false cancels proposal. + * Proposes by default. + * + * @return string Translated success or error messages + */ +function pkg_propose_deletion ($atype, $ids, $action = True) { + if (!$atype) { + if ($action) { + return __("You must be logged in before you can propose packages for deletion."); + } else { + return __("You must be logged in before you can cancel deletion proposals."); + } + } + + if (empty($ids)) { + if ($action) { + return __("You did not select any packages to propose."); + } else { + return __("You did not select any packages to cancel proposals for."); + } + } + + foreach ($ids as $pid) { + if (!is_numeric($pid)) { + if ($action) { + return __("You did not select any packages to propose."); + } else { + return __("You did not select any packages to cancel proposals for."); + } + } + } + + $dbh = db_connect(); + + $first = 1; + foreach ($ids as $pid) { + if ($first) { + $first = 0; + $propose = $pid; + } else { + $propose .= ", " . $pid; + } + } + + $ood = $action ? 1 : 0; + $q = "UPDATE Packages SET DeletionProposed = " . $ood; + $q.= " WHERE ID IN (" . $propose . ")"; + + db_query($q, $dbh); + + if ($action) { + # Notify maintainer and aur-general of proposal by email + $f_name = username_from_sid($_COOKIE['AURSID']); + $f_email = email_from_sid($_COOKIE['AURSID']); + $f_uid = uid_from_sid($_COOKIE['AURSID']); + $q = "SELECT Packages.Name, Users.Email, Packages.ID "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID IN (" . $propose .") "; + $q.= "AND Users.ID = Packages.MaintainerUID "; + $q.= "AND Users.ID != " . $f_uid; + $result = db_query($q, $dbh); + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + # construct email - maintainer + $body = "Your package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1]. You may view your package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail($row['Email'], "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + + # construct email - aur-general + $body = "The AUR package " . $row['Name'] . " has been proposed for deletion by " . $f_name . " [1]. You may view the package at:\nhttp://aur.archlinux.org/packages.php?ID=" . $row['ID'] . "\n\n[1] - http://aur.archlinux.org/account.php?Action=AccountInfo&ID=" . $f_uid; + $body = wordwrap($body, 70); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail('aur-general(a)archlinux.org', "AUR Package Deletion Proposal for ".$row['Name'], $body, $headers); + + } + } + } + + if ($action) { + return __("The selected packages have been proposed for deletion."); + } else { + return __("The deletion proposals have been cancelled for the selection packages."); + } +} + +/** * Delete packages * * @param string $atype Account type, output of account_from_sid -- 1.7.2.3

1 0

[aur-dev] [PATCH 1/3] Add database column DeletionProposed to Packages table, indicating whether or not the package is currently proposed for deletion.
by Peter Lewis 12 Sep '10

12 Sep '10

--- support/schema/aur-schema.sql | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 250d405..8d49e15 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -120,6 +120,7 @@ CREATE TABLE Packages ( LocationID TINYINT UNSIGNED NOT NULL DEFAULT 1, NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0, OutOfDate TINYINT UNSIGNED DEFAULT 0, + DeletionProposed TINYINT UNSIGNED DEFAULT 0, SubmittedTS BIGINT UNSIGNED NOT NULL, ModifiedTS BIGINT UNSIGNED NOT NULL, SubmitterUID INTEGER UNSIGNED NOT NULL DEFAULT 0, -- who submitted it? -- 1.7.2.3

1 0

[aur-dev] Bugs in two PKGBUILDs
by Aljosha Papsch 09 Sep '10

09 Sep '10

Hi, I've found two bugs in PKBUILDs: fs2_open-svn: line 31: makepkg can't delete the specified directory. Removing the line solves the problem. tbp: line 11: a = is missing (variable definition)

3 2