- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] UPGRADING: Mention the upload directory transform script
by Lukas Fleischer 11 Aug '11

11 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/UPGRADING b/UPGRADING index b0185a1..331870e 100644 --- a/UPGRADING +++ b/UPGRADING @@ -19,6 +19,9 @@ ALTER TABLE PackageDepends ADD INDEX (DepName); 5. Merge "web/lib/config.inc.php.proto" with "web/lib/config.inc.php". +6. Run the upload directory transform script ("scripts/uploadbuckets.sh") and +rotate the converted directory structure into place. + From 1.8.1 to 1.8.2 ------------------- -- 1.7.6

3 17

[aur-dev] [PATCH 1/3] aur.inc.php: allow all functions using DB to take handle as arg
by Dan McGee 11 Aug '11

11 Aug '11

This prevents needless calls to db_connect() if we already have a reference to a handle we can pass into a function. Although the current underlying implementation using mysql_connect() will return the same connection if all parameters are the same, this might not be true if we switch to a more modern (e.g. PDO) interface. In the face of safe transactions, it is extremely important all actions are being taken over the same connection to the database. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/aur.inc.php | 74 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 49 insertions(+), 25 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 55cc8a9..0927604 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -17,7 +17,7 @@ include_once("cachefuncs.inc.php"); # see if the visitor is already logged in # -function check_sid() { +function check_sid($dbh=NULL) { global $_COOKIE; global $LOGIN_TIMEOUT; @@ -25,7 +25,9 @@ function check_sid() { $failed = 0; # the visitor is logged in, try and update the session # - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT LastUpdateTS, UNIX_TIMESTAMP() FROM Sessions "; $q.= "WHERE SessionID = '" . mysql_real_escape_string($_COOKIE["AURSID"]) . "'"; $result = db_query($q, $dbh); @@ -97,11 +99,13 @@ function new_sid() { # obtain the username if given their Users.ID # -function username_from_id($id="") { +function username_from_id($id="", $dbh=NULL) { if (!$id) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Username FROM Users WHERE ID = " . mysql_real_escape_string($id); $result = db_query($q, $dbh); if (!$result) { @@ -115,11 +119,13 @@ function username_from_id($id="") { # obtain the username if given their current SID # -function username_from_sid($sid="") { +function username_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Username "; $q.= "FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -135,11 +141,13 @@ function username_from_sid($sid="") { # obtain the email address if given their current SID # -function email_from_sid($sid="") { +function email_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Email "; $q.= "FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -156,11 +164,13 @@ function email_from_sid($sid="") { # obtain the account type if given their current SID # Return either "", "User", "Trusted User", "Developer" # -function account_from_sid($sid="") { +function account_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT AccountType "; $q.= "FROM Users, AccountTypes, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -177,11 +187,13 @@ function account_from_sid($sid="") { # obtain the Users.ID if given their current SID # -function uid_from_sid($sid="") { +function uid_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Users.ID "; $q.= "FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -251,7 +263,7 @@ function db_query($query="", $db_handle="") { # set up the visitor's language # -function set_lang() { +function set_lang($dbh=NULL) { global $LANG; global $SUPPORTED_LANGS; global $PERSISTENT_COOKIE_TIMEOUT; @@ -272,7 +284,9 @@ function set_lang() { } elseif (isset($_COOKIE["AURSID"])) { # No language but a session; use default lang preference # - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT LangPreference FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; $q.= "AND Sessions.SessionID = '"; @@ -332,15 +346,17 @@ function html_footer($ver="") { # check to see if the user can submit a package # -function can_submit_pkg($name="", $sid="") { +function can_submit_pkg($name="", $sid="", $dbh=NULL) { if (!$name || !$sid) {return 0;} - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT MaintainerUID "; $q.= "FROM Packages WHERE Name = '".mysql_real_escape_string($name)."'"; $result = db_query($q, $dbh); if (mysql_num_rows($result) == 0) {return 1;} $row = mysql_fetch_row($result); - $my_uid = uid_from_sid($sid); + $my_uid = uid_from_sid($sid, $dbh); if ($row[0] === NULL || $row[0] == $my_uid) { return 1; @@ -401,12 +417,14 @@ function chmod_group($path) { # obtain the uid given a Users.Username # -function uid_from_username($username="") +function uid_from_username($username="", $dbh=NULL) { if (!$username) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT ID FROM Users WHERE Username = '".mysql_real_escape_string($username) ."'"; $result = db_query($q, $dbh); @@ -420,12 +438,14 @@ function uid_from_username($username="") # obtain the uid given a Users.Email # -function uid_from_email($email="") +function uid_from_email($email="", $dbh=NULL) { if (!$email) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT ID FROM Users WHERE Email = '".mysql_real_escape_string($email) ."'"; $result = db_query($q, $dbh); @@ -479,9 +499,11 @@ function mkurl($append) { return substr($out, 5); } -function get_salt($user_id) +function get_salt($user_id, $dbh=NULL) { - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $salt_q = "SELECT Salt FROM Users WHERE ID = " . $user_id; $result = db_query($salt_q, $dbh); if ($result) { @@ -491,9 +513,11 @@ function get_salt($user_id) return; } -function save_salt($user_id, $passwd) +function save_salt($user_id, $passwd, $dbh=NULL) { - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $salt = generate_salt(); $hash = salted_hash($passwd, $salt); $salting_q = "UPDATE Users SET Salt = '" . $salt . "', " . -- 1.7.6

3 13

[aur-dev] [PATCH 1/3] Rename package_exists() to pkgid_from_name()
by Lukas Fleischer 11 Aug '11

11 Aug '11

Describe what this function actually does: Return the ID of a package with a given name and return NULL if such a package doesn't exist. The function name is chosen in a fashion similar to other functions from "pkgfuncs.inc.php" (pkgname_from_id(), pkgnotify_from_sid(), ...). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/cleanup | 2 +- web/html/pkgsubmit.php | 4 ++-- web/lib/pkgfuncs.inc.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cleanup b/scripts/cleanup index 4fc9ea2..b920c8e 100755 --- a/scripts/cleanup +++ b/scripts/cleanup @@ -25,7 +25,7 @@ exec('ls ' . INCOMING_DIR, $files); $count = 0; foreach ($files as $pkgname) { - if (!package_exists($pkgname)) { + if (!pkgid_from_name($pkgname)) { echo 'Removing ' . INCOMING_DIR . "$pkgname\n"; system('rm -r ' . INCOMING_DIR . $pkgname); $count++; diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 793f8ca..2e95a56 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -261,7 +261,7 @@ if ($uid): if (!$error) { # First, see if this package already exists, and if it can be overwritten - $pkg_exists = package_exists($pkg_name); + $pkg_id = pkgid_from_name($pkg_name); if (can_submit_pkg($pkg_name, $_COOKIE["AURSID"])) { if (file_exists($incoming_pkgdir)) { # Blow away the existing file/dir and contents @@ -277,7 +277,7 @@ if ($uid): if (!$error) { # Check if package name is blacklisted. - if (!$pkg_exists && pkgname_is_blacklisted($pkg_name)) { + if (!$pkg_id && pkgname_is_blacklisted($pkg_name)) { if (!canSubmitBlacklisted(account_from_sid($_COOKIE["AURSID"]))) { $error = __( "%s is on the package blacklist, please check if it's available in the official repos.", $pkg_name); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8cd1c61..bb5a592 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -90,7 +90,7 @@ function pkgCategories() { # check to see if the package name exists # -function package_exists($name="") { +function pkgid_from_name($name="") { if (!$name) {return NULL;} $dbh = db_connect(); $q = "SELECT ID FROM Packages "; -- 1.7.6

2 14

[aur-dev] [PATCH] Add a upload directory tranform script
by Dan McGee 10 Aug '11

10 Aug '11

This goes with the previous patch that moves uploads into segmented subdirectories. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/uploadbuckets.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) create mode 100755 scripts/uploadbuckets.sh diff --git a/scripts/uploadbuckets.sh b/scripts/uploadbuckets.sh new file mode 100755 index 0000000..1bb1a90 --- /dev/null +++ b/scripts/uploadbuckets.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +DRYRUN=1 + +source="$1" +dest="$2" + +if [[ -z $source || -z $dest ]]; then + echo 'usage: uploadbuckets.sh <source> <dest>' + exit 1 +fi + +if [[ ! -d $source ]]; then + echo 'error: source is not a directory' + exit 1 +fi + +if [[ -e $dest && ! -d $dest ]]; then + echo 'error: dest is not a directory' + exit 1 +fi + +if [[ ! -d $dest ]]; then + mkdir $dest +fi + +for package in "$source"/*; do + pkgname="${package##*/}" + newfolder="$dest/${pkgname:0:2}" + if [[ ! -d "$newfolder" ]]; then + if [[ DRYRUN -gt 0 ]]; then + echo mkdir -p "$newfolder" + else + mkdir -p "$newfolder" + fi + fi + if [[ DRYRUN -gt 0 ]]; then + echo mv "$source/$pkgname" "$newfolder/$pkgname" + else + mv "$source/$pkgname" "$newfolder/$pkgname" + fi +done -- 1.7.6

5 8

[aur-dev] [PATCH 1/3] scripts/cleanup: use native PHP only
by Dan McGee 09 Aug '11

09 Aug '11

No need to shell out to the system here. Also fix the script so it actually works. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/cleanup | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/cleanup b/scripts/cleanup index 4fc9ea2..f287350 100755 --- a/scripts/cleanup +++ b/scripts/cleanup @@ -16,21 +16,23 @@ if (empty($dir)) { } set_include_path(get_include_path() . PATH_SEPARATOR . "$dir/lib"); -include("config.inc"); -include("aur.inc"); -include("pkgfuncs.inc"); - -exec('ls ' . INCOMING_DIR, $files); +include("config.inc.php"); +include("aur.inc.php"); +include("pkgfuncs.inc.php"); $count = 0; +$files = scandir(INCOMING_DIR); foreach ($files as $pkgname) { - if (!package_exists($pkgname)) { - echo 'Removing ' . INCOMING_DIR . "$pkgname\n"; - system('rm -r ' . INCOMING_DIR . $pkgname); + if ($pkgname == '.' || $pkgname == '..') { + continue; + } + $fullpath = INCOMING_DIR . $pkgname; + if (!package_exists($pkgname) && is_dir($fullpath)) { + echo 'Removing ' . $fullpath . "\n"; + rm_tree($fullpath); $count++; } } echo "\nRemoved $count directories.\n"; - -- 1.7.6

3 10

[aur-dev] Doubt in a TODO
by Tiago Sousa 01 Jul '11

01 Jul '11

Hello. I am working on the TODO on aur/support/scripts/newpackage-notify. my ideia is to do a dictionary to save all of the languages and we will know the language in use looking into /etc/locale.gen . i already have a script to do that. My doubt is could the message be saved into the dictionary using tiple quote string? Tiago Sousa

2 2

[aur-dev] [PATCH] Wrap comments in <pre> tags, fixes FS#14391
by Manuel Tortosa 01 Jul '11

01 Jul '11

Exactly this, wrap the comments in <pre> tags allowing patches or at least better build output formatting. Greez

4 4

[aur-dev] [PATCH] Convert the language selection bar in a select form
by Manuel Tortosa 29 Jun '11

29 Jun '11

Subject says all. Greez. Manuel

2 3

[aur-dev] [PATCH] Fix empty depends database insert
by Manuel Tortosa 29 Jun '11

29 Jun '11

In pkgsubmit.php in this part: foreach ($depends as $dep) { $deppkgname = preg_replace("/(<|<=|=|>=|>).*/", "", $dep); $depcondition = str_replace($deppkgname, "", $dep); if ($deppkgname == "#") { break; } $q = sprintf("INSERT INTO PackageDepends (PackageID, DepName, DepCondition) VALUES (%d, '%s', '%s')", $packageID, mysql_real_escape_string($deppkgname), mysql_real_escape_string($depcondition)); db_query($q, $dbh); } This will pass through the loop at least once in case of pkgdesc=(), adding an empty pkgdepends entry to the database. Easy to avoid by the fact $depends = explode(" ", $new_pkgbuild['depends']); returns false. Best Regards.

2 1

[aur-dev] [PATCH 1/3] aurblup: blacklist processing query changes
by Dan McGee 28 Jun '11

28 Jun '11

* Do all list building and freeing outside of the transaction to keep it as short as possible. * Remove ability to blacklist without transactions as we now only support InnoDB/transactional engines with proper relations. * No need to turn autocommit off; BEGIN TRANSACTION operates regardless of this setting. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/aurblup/aurblup.c | 23 +++++------------------ scripts/aurblup/config.h.proto | 3 --- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/scripts/aurblup/aurblup.c b/scripts/aurblup/aurblup.c index fea7ffc..1f7aefc 100644 --- a/scripts/aurblup/aurblup.c +++ b/scripts/aurblup/aurblup.c @@ -122,19 +122,11 @@ blacklist_sync(alpm_list_t *pkgs_cur, alpm_list_t *pkgs_new) { alpm_list_t *pkgs_add, *pkgs_rem, *p; -#if MYSQL_USE_TRANSACTIONS - if (mysql_autocommit(c, 0)) - mysql_die("failed to turn MySQL autocommit off: %s\n"); + pkgs_add = alpm_list_diff(pkgs_new, pkgs_cur, (alpm_list_fn_cmp)strcmp); + pkgs_rem = alpm_list_diff(pkgs_cur, pkgs_new, (alpm_list_fn_cmp)strcmp); if (mysql_query(c, "START TRANSACTION;")) mysql_die("failed to start MySQL transaction: %s\n"); -#else - if (mysql_query(c, "LOCK TABLES PackageBlacklist WRITE;")) - mysql_die("failed to lock MySQL table: %s\n"); -#endif - - pkgs_add = alpm_list_diff(pkgs_new, pkgs_cur, (alpm_list_fn_cmp)strcmp); - pkgs_rem = alpm_list_diff(pkgs_cur, pkgs_new, (alpm_list_fn_cmp)strcmp); for (p = pkgs_add; p; p = alpm_list_next(p)) blacklist_add(alpm_list_getdata(p)); @@ -142,16 +134,11 @@ blacklist_sync(alpm_list_t *pkgs_cur, alpm_list_t *pkgs_new) for (p = pkgs_rem; p; p = alpm_list_next(p)) blacklist_remove(alpm_list_getdata(p)); - alpm_list_free(pkgs_add); - alpm_list_free(pkgs_rem); - -#if MYSQL_USE_TRANSACTIONS if (mysql_query(c, "COMMIT;")) mysql_die("failed to commit MySQL transaction: %s\n"); -#else - if (mysql_query(c, "UNLOCK TABLES;")) - mysql_die("failed to unlock MySQL tables: %s\n"); -#endif + + alpm_list_free(pkgs_add); + alpm_list_free(pkgs_rem); } alpm_list_t * diff --git a/scripts/aurblup/config.h.proto b/scripts/aurblup/config.h.proto index fc1a87b..daf1744 100644 --- a/scripts/aurblup/config.h.proto +++ b/scripts/aurblup/config.h.proto @@ -6,9 +6,6 @@ #define CONFIG_KEY_PASSWD "AUR_db_pass" #define CONFIG_KEY_DB "AUR_db_name" -/* unset this to use "LOCK TABLE" instead of transactions */ -#define MYSQL_USE_TRANSACTIONS 1 - /* libalpm options */ #define ALPM_DBPATH "/var/lib/aurblup/" #define ALPM_MIRROR "ftp://mirrors.kernel.org/archlinux/%s/os/i686" -- 1.7.5.2

2 4