- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Add two new pactests for --dbonly
by Dan McGee 05 May '10

05 May '10

It caught me by surprise that: 1. These weren't being tested at all 2. The --dbonly combined with -U not only "works" but is also completely undocumented. It also has some weird behavior on install vs. upgrade that may need addressing. Add some tests which will hopefully provoke some discussion. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- pactest/tests/database010.py | 17 +++++++++++++++++ pactest/tests/database011.py | 17 +++++++++++++++++ pactest/tests/database012.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/database010.py create mode 100644 pactest/tests/database011.py create mode 100644 pactest/tests/database012.py diff --git a/pactest/tests/database010.py b/pactest/tests/database010.py new file mode 100644 index 0000000..662dc1b --- /dev/null +++ b/pactest/tests/database010.py @@ -0,0 +1,17 @@ +# TODO: these are labeled as database packages because they sure seem to me to +# be database-type operations. In their current implementation however they are +# calling -U and -R rather than -D. Obviously the tests will need to be updated +# if this changes. +self.description = "Remove a package with --dbonly, no files touched" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", p) + +self.args = "-R --dbonly %s" % p.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) diff --git a/pactest/tests/database011.py b/pactest/tests/database011.py new file mode 100644 index 0000000..7d475d9 --- /dev/null +++ b/pactest/tests/database011.py @@ -0,0 +1,17 @@ +# TODO: these are labeled as database packages because they sure seem to me to +# be database-type operations. In their current implementation however they are +# calling -U and -R rather than -D. Obviously the tests will need to be updated +# if this changes. +self.description = "Install a package with --dbonly, no files touched" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U --dbonly %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("!FILE_EXIST=%s" % f) diff --git a/pactest/tests/database012.py b/pactest/tests/database012.py new file mode 100644 index 0000000..a1f8698 --- /dev/null +++ b/pactest/tests/database012.py @@ -0,0 +1,31 @@ +# TODO: these are labeled as database packages because they sure seem to me to +# be database-type operations. In their current implementation however they are +# calling -U and -R rather than -D. Obviously the tests will need to be updated +# if this changes. +self.description = "Upgrade a package with --dbonly, no files touched" + +lp = pmpkg("dummy") +lp.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "2.0-1") +p.files = ["bin/dummy", + "bin/dummy2", + "usr/man/man1/dummy.1"] +self.addpkg(p) + +self.args = "-U --dbonly %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +self.addrule("PKG_VERSION=dummy|2.0-1") +for f in lp.files: + self.addrule("!FILE_EXIST=%s" % f) +# TODO: I honestly think the above should NOT delete the original files, it +# should upgrade the DB entry without touching anything on the file system. +# E.g. this test should be the same as: +# pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz +#for f in lp.files: +# self.addrule("FILE_EXIST=%s" % f) +self.addrule("!FILE_EXIST=bin/dummy2") -- 1.7.1

1 1

[pacman-dev] [PATCH 1/4] Move vercmp code into a separate file
by Dan McGee 05 May '10

05 May '10

This will facilitate using this object file on its own in the vercmp tool which will be done in a future commit. The net impact on the generated binaries should not be noticeable after this commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/Makefile.am | 3 +- lib/libalpm/package.c | 171 ---------------------------------------- lib/libalpm/version.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 172 deletions(-) create mode 100644 lib/libalpm/version.c diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 871855e..3473a73 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -43,7 +43,8 @@ libalpm_la_SOURCES = \ remove.h remove.c \ sync.h sync.c \ trans.h trans.c \ - util.h util.c + util.h util.c \ + version.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_LIBADD = $(LTLIBINTL) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ed6d71d..becbc60 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -604,177 +604,6 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) return(reqs); } -/** Compare two version strings and determine which one is 'newer'. - * Returns a value comparable to the way strcmp works. Returns 1 - * if a is newer than b, 0 if a and b are the same version, or -1 - * if b is newer than a. - * - * This function has been adopted from the rpmvercmp function located - * at lib/rpmvercmp.c, and was most recently updated against rpm - * version 4.4.2.3. Small modifications have been made to make it more - * consistent with the libalpm coding style. - * - * Keep in mind that the pkgrel is only compared if it is available - * on both versions handed to this function. For example, comparing - * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield - * -1 as expected. This is mainly for supporting versioned dependencies - * that do not include the pkgrel. - */ -int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) -{ - char oldch1, oldch2; - char *str1, *str2; - char *ptr1, *ptr2; - char *one, *two; - int rc; - int isnum; - int ret = 0; - - ALPM_LOG_FUNC; - - /* libalpm added code. ensure our strings are not null */ - if(!a) { - if(!b) return(0); - return(-1); - } - if(!b) return(1); - - /* easy comparison to see if versions are identical */ - if(strcmp(a, b) == 0) return(0); - - str1 = strdup(a); - str2 = strdup(b); - - one = str1; - two = str2; - - /* loop through each version segment of str1 and str2 and compare them */ - while(*one && *two) { - while(*one && !isalnum((int)*one)) one++; - while(*two && !isalnum((int)*two)) two++; - - /* If we ran to the end of either, we are finished with the loop */ - if(!(*one && *two)) break; - - ptr1 = one; - ptr2 = two; - - /* grab first completely alpha or completely numeric segment */ - /* leave one and two pointing to the start of the alpha or numeric */ - /* segment and walk ptr1 and ptr2 to end of segment */ - if(isdigit((int)*ptr1)) { - while(*ptr1 && isdigit((int)*ptr1)) ptr1++; - while(*ptr2 && isdigit((int)*ptr2)) ptr2++; - isnum = 1; - } else { - while(*ptr1 && isalpha((int)*ptr1)) ptr1++; - while(*ptr2 && isalpha((int)*ptr2)) ptr2++; - isnum = 0; - } - - /* save character at the end of the alpha or numeric segment */ - /* so that they can be restored after the comparison */ - oldch1 = *ptr1; - *ptr1 = '\0'; - oldch2 = *ptr2; - *ptr2 = '\0'; - - /* this cannot happen, as we previously tested to make sure that */ - /* the first string has a non-null segment */ - if (one == ptr1) { - ret = -1; /* arbitrary */ - goto cleanup; - } - - /* take care of the case where the two version segments are */ - /* different types: one numeric, the other alpha (i.e. empty) */ - /* numeric segments are always newer than alpha segments */ - /* XXX See patch #60884 (and details) from bugzilla #50977. */ - if (two == ptr2) { - ret = isnum ? 1 : -1; - goto cleanup; - } - - if (isnum) { - /* this used to be done by converting the digit segments */ - /* to ints using atoi() - it's changed because long */ - /* digit segments can overflow an int - this should fix that. */ - - /* throw away any leading zeros - it's a number, right? */ - while (*one == '0') one++; - while (*two == '0') two++; - - /* whichever number has more digits wins */ - if (strlen(one) > strlen(two)) { - ret = 1; - goto cleanup; - } - if (strlen(two) > strlen(one)) { - ret = -1; - goto cleanup; - } - } - - /* strcmp will return which one is greater - even if the two */ - /* segments are alpha or if they are numeric. don't return */ - /* if they are equal because there might be more segments to */ - /* compare */ - rc = strcmp(one, two); - if (rc) { - ret = rc < 1 ? -1 : 1; - goto cleanup; - } - - /* restore character that was replaced by null above */ - *ptr1 = oldch1; - one = ptr1; - *ptr2 = oldch2; - two = ptr2; - - /* libalpm added code. check if version strings have hit the pkgrel - * portion. depending on which strings have hit, take correct action. - * this is all based on the premise that we only have one dash in - * the version string, and it separates pkgver from pkgrel. */ - if(*ptr1 == '-' && *ptr2 == '-') { - /* no-op, continue comparing since we are equivalent throughout */ - } else if(*ptr1 == '-') { - /* ptr1 has hit the pkgrel and ptr2 has not. continue version - * comparison after stripping the pkgrel from ptr1. */ - *ptr1 = '\0'; - } else if(*ptr2 == '-') { - /* ptr2 has hit the pkgrel and ptr1 has not. continue version - * comparison after stripping the pkgrel from ptr2. */ - *ptr2 = '\0'; - } - } - - /* this catches the case where all numeric and alpha segments have */ - /* compared identically but the segment separating characters were */ - /* different */ - if ((!*one) && (!*two)) { - ret = 0; - goto cleanup; - } - - /* the final showdown. we never want a remaining alpha string to - * beat an empty string. the logic is a bit weird, but: - * - if one is empty and two is not an alpha, two is newer. - * - if one is an alpha, two is newer. - * - otherwise one is newer. - * */ - if ( ( !*one && !isalpha((int)*two) ) - || isalpha((int)*one) ) { - ret = -1; - } else { - ret = 1; - } - -cleanup: - free(str1); - free(str2); - return(ret); -} - /** @} */ pmpkg_t *_alpm_pkg_new(void) diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c new file mode 100644 index 0000000..1c838f4 --- /dev/null +++ b/lib/libalpm/version.c @@ -0,0 +1,198 @@ +/* + * Copyright (c) 2006-2010 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <string.h> +#include <ctype.h> + +/* libalpm */ +#include "log.h" +#include "util.h" + +/** Compare two version strings and determine which one is 'newer'. + * Returns a value comparable to the way strcmp works. Returns 1 + * if a is newer than b, 0 if a and b are the same version, or -1 + * if b is newer than a. + * + * This function has been adopted from the rpmvercmp function located + * at lib/rpmvercmp.c, and was most recently updated against rpm + * version 4.4.2.3. Small modifications have been made to make it more + * consistent with the libalpm coding style. + * + * Keep in mind that the pkgrel is only compared if it is available + * on both versions handed to this function. For example, comparing + * 1.5-1 and 1.5 will yield 0; comparing 1.5-1 and 1.5-2 will yield + * -1 as expected. This is mainly for supporting versioned dependencies + * that do not include the pkgrel. + */ +int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b) +{ + char oldch1, oldch2; + char *str1, *str2; + char *ptr1, *ptr2; + char *one, *two; + int rc; + int isnum; + int ret = 0; + + ALPM_LOG_FUNC; + + /* libalpm added code. ensure our strings are not null */ + if(!a) { + if(!b) return(0); + return(-1); + } + if(!b) return(1); + + /* easy comparison to see if versions are identical */ + if(strcmp(a, b) == 0) return(0); + + str1 = strdup(a); + str2 = strdup(b); + + one = str1; + two = str2; + + /* loop through each version segment of str1 and str2 and compare them */ + while(*one && *two) { + while(*one && !isalnum((int)*one)) one++; + while(*two && !isalnum((int)*two)) two++; + + /* If we ran to the end of either, we are finished with the loop */ + if(!(*one && *two)) break; + + ptr1 = one; + ptr2 = two; + + /* grab first completely alpha or completely numeric segment */ + /* leave one and two pointing to the start of the alpha or numeric */ + /* segment and walk ptr1 and ptr2 to end of segment */ + if(isdigit((int)*ptr1)) { + while(*ptr1 && isdigit((int)*ptr1)) ptr1++; + while(*ptr2 && isdigit((int)*ptr2)) ptr2++; + isnum = 1; + } else { + while(*ptr1 && isalpha((int)*ptr1)) ptr1++; + while(*ptr2 && isalpha((int)*ptr2)) ptr2++; + isnum = 0; + } + + /* save character at the end of the alpha or numeric segment */ + /* so that they can be restored after the comparison */ + oldch1 = *ptr1; + *ptr1 = '\0'; + oldch2 = *ptr2; + *ptr2 = '\0'; + + /* this cannot happen, as we previously tested to make sure that */ + /* the first string has a non-null segment */ + if (one == ptr1) { + ret = -1; /* arbitrary */ + goto cleanup; + } + + /* take care of the case where the two version segments are */ + /* different types: one numeric, the other alpha (i.e. empty) */ + /* numeric segments are always newer than alpha segments */ + /* XXX See patch #60884 (and details) from bugzilla #50977. */ + if (two == ptr2) { + ret = isnum ? 1 : -1; + goto cleanup; + } + + if (isnum) { + /* this used to be done by converting the digit segments */ + /* to ints using atoi() - it's changed because long */ + /* digit segments can overflow an int - this should fix that. */ + + /* throw away any leading zeros - it's a number, right? */ + while (*one == '0') one++; + while (*two == '0') two++; + + /* whichever number has more digits wins */ + if (strlen(one) > strlen(two)) { + ret = 1; + goto cleanup; + } + if (strlen(two) > strlen(one)) { + ret = -1; + goto cleanup; + } + } + + /* strcmp will return which one is greater - even if the two */ + /* segments are alpha or if they are numeric. don't return */ + /* if they are equal because there might be more segments to */ + /* compare */ + rc = strcmp(one, two); + if (rc) { + ret = rc < 1 ? -1 : 1; + goto cleanup; + } + + /* restore character that was replaced by null above */ + *ptr1 = oldch1; + one = ptr1; + *ptr2 = oldch2; + two = ptr2; + + /* libalpm added code. check if version strings have hit the pkgrel + * portion. depending on which strings have hit, take correct action. + * this is all based on the premise that we only have one dash in + * the version string, and it separates pkgver from pkgrel. */ + if(*ptr1 == '-' && *ptr2 == '-') { + /* no-op, continue comparing since we are equivalent throughout */ + } else if(*ptr1 == '-') { + /* ptr1 has hit the pkgrel and ptr2 has not. continue version + * comparison after stripping the pkgrel from ptr1. */ + *ptr1 = '\0'; + } else if(*ptr2 == '-') { + /* ptr2 has hit the pkgrel and ptr1 has not. continue version + * comparison after stripping the pkgrel from ptr2. */ + *ptr2 = '\0'; + } + } + + /* this catches the case where all numeric and alpha segments have */ + /* compared identically but the segment separating characters were */ + /* different */ + if ((!*one) && (!*two)) { + ret = 0; + goto cleanup; + } + + /* the final showdown. we never want a remaining alpha string to + * beat an empty string. the logic is a bit weird, but: + * - if one is empty and two is not an alpha, two is newer. + * - if one is an alpha, two is newer. + * - otherwise one is newer. + * */ + if ( ( !*one && !isalpha((int)*two) ) + || isalpha((int)*one) ) { + ret = -1; + } else { + ret = 1; + } + +cleanup: + free(str1); + free(str2); + return(ret); +} + +/* vim: set ts=2 sw=2 noet: */ -- 1.7.1

3 6

[pacman-dev] An interesting error
by Roman Kyrylych 02 May '10

02 May '10

I've just got this when updating my linode server: $ sudo pacman -Syyu :: Synchronizing package databases... error: failed retrieving file 'testing.db.tar.gz' from ftp.archlinux.org : No address record testing 13.4K 733.6K/s 00:00:00 [#####################] 100% error: failed retrieving file 'core.db.tar.gz' from ftp.archlinux.org : No address record core 36.1K 1303.4K/s 00:00:00 [#####################] 100% error: failed retrieving file 'extra.db.tar.gz' from ftp.archlinux.org : No address record extra 449.8K 4.7M/s 00:00:00 [#####################] 100% error: failed retrieving file 'community-testing.db.tar.gz' from ftp.archlinux.org : No address record community-testing 1.2K 20.1M/s 00:00:00 [#####################] 100% error: failed retrieving file 'community.db.tar.gz' from ftp.archlinux.org : No address record community 373.4K 4.6M/s 00:00:00 [#####################] 100% :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... Targets (4): kernel26-firmware-2.6.33.3-2 kernel26-2.6.33.3-2 psmisc-22.11-1 tzdata-2010i-1 Total Download Size: 32.46 MB Total Installed Size: 114.00 MB Proceed with installation? [Y/n] n [roman@codeplace ~]$ sudo pacman -Su :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... Targets (4): kernel26-firmware-2.6.33.3-2 kernel26-2.6.33.3-2 psmisc-22.11-1 tzdata-2010i-1 Total Download Size: 32.46 MB Total Installed Size: 114.00 MB Proceed with installation? [Y/n] :: Retrieving packages from testing... error: failed retrieving file 'kernel26-firmware-2.6.33.3-2-x86_64.pkg.tar.gz' from ftp.archlinux.org : File unavailable (e.g., file not found, no access) kernel26-firmware-2... 1048.8K 664.4K/s 00:00:02 [#####################] 100% error: failed retrieving file 'kernel26-2.6.33.3-2-x86_64.pkg.tar.gz' from ftp.archlinux.org : File unavailable (e.g., file not found, no access) kernel26-2.6.33.3-2... 31.2M 5.1M/s 00:00:06 [#####################] 100% psmisc-22.11-1-x86_... 76.9K 153.5K/s 00:00:01 [#####################] 100% tzdata-2010i-1-x86_... 178.7K 90.6K/s 00:00:02 [#####################] 100% Can anyone explain what exactly happens here? -- Roman Kyrylych (Роман Кирилич)

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-157-g90aca75
by dan＠archlinux.org 26 Apr '10

26 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 90aca75cb92c12419f2998cf54caa8ef5fe59f99 (commit) via 753599b5046392477449ed550cd99c41631145ed (commit) via 652762488a1fbe70b073588dc5f88412ff952fb7 (commit) via 6995aed9aeae1e95d9de3b2f539f904dbde4e165 (commit) via 7608dd74d73b66595ad34c861491fc86be335e8c (commit) via 88254d762d68f93b2be04e686abbc126e2afcf11 (commit) via 7965345d435870a47073fffafa2a429744aa2deb (commit) from 21abae98cbd382d8fab4427109776d983cd07c9f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 90aca75cb92c12419f2998cf54caa8ef5fe59f99 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 29 15:17:22 2010 +1000 makepkg: BSD find compatibility fix Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 753599b5046392477449ed550cd99c41631145ed Author: Christophe Chapuis <chris.chapuis(a)gmail.com> Date: Tue Apr 20 16:21:00 2010 +1000 contrib/pactree: generate reverse dependency trees Add an option to show the tree of packages which depend on a given package Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 652762488a1fbe70b073588dc5f88412ff952fb7 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Apr 24 16:48:14 2010 +0200 New pactests for the phonon/qt issue Original-work-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6995aed9aeae1e95d9de3b2f539f904dbde4e165 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Apr 14 16:22:43 2010 +1000 makepkg: deprecate repackaging without a package function File permissions are not guaranteed to stay the same on exit from fakeroot, so repackaging may result in files with different permissions. This is avoided when using a package() function (or split packages) as the packaging step is rerun. Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: touched up message for translation purposes] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7608dd74d73b66595ad34c861491fc86be335e8c Author: Serge Ziryukin <ftrvxmtrx(a)gmail.com> Date: Sun Apr 25 19:48:03 2010 +0300 check for valid optarg before using strdup Signed-off-by: Serge Ziryukin <ftrvxmtrx(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 88254d762d68f93b2be04e686abbc126e2afcf11 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Mar 15 23:54:00 2010 +0100 Show --print and --print-format options with -Rh, -Sh and -Uh only http://mailman.archlinux.org/pipermail/pacman-dev/2010-March/010519.html Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7965345d435870a47073fffafa2a429744aa2deb Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Nov 14 20:26:37 2009 +0100 More consistent printing of off_t and time_t time_t : %ld off_t : %jd and cast to intmax_t Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pactree | 31 ++++++++++++++++++++++++++----- lib/libalpm/be_files.c | 6 +++--- lib/libalpm/delta.c | 2 +- lib/libalpm/dload.c | 6 +++--- pactest/tests/sync405.py | 26 ++++++++++++++++++++++++++ pactest/tests/sync406.py | 31 +++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 22 ++++++++++++++++------ src/pacman/pacman.c | 13 ++++++++++--- 8 files changed, 116 insertions(+), 21 deletions(-) create mode 100644 pactest/tests/sync405.py create mode 100644 pactest/tests/sync406.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: handle multiple install and changelog files
by Allan McRae 26 Apr '10

26 Apr '10

The presence of all install and changelog files (multiple files may be used with package splitting) is checked for in check_sanity(). All install and changelog files are copied to the source location when using --source. The check for install and changelog file presence is removed in create_srcpackage() as this is redundant to the checks performed in check_sanity(). Moved install and changelog handling in create_srcpackage() to after source array files, as this is more logical and readily allows for the following. A check is made when creating a source package that a symlink to an install file has not already been added. This can occur if the install file is used multiple times or if it is listed in the source array. Fixes FS#18831, FS#18394 and partially fixes FS#16004 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I could split these into a set of smaller changes but they overlap to such a great extent it seems redundant. Also, the patch remains fairly small. scripts/makepkg.sh.in | 71 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b306620..8ae41ea 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1095,24 +1095,6 @@ create_srcpackage() { msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" - if [[ -n $install ]]; then - if [[ -f $install ]]; then - msg2 "$(gettext "Adding install script...")" - ln -s "${startdir}/$install" "${srclinks}/${pkgbase}/" - else - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" - fi - fi - - if [[ -n $changelog ]]; then - if [[ -f $changelog ]]; then - msg2 "$(gettext "Adding package changelog...")" - ln -s "${startdir}/$changelog" "${srclinks}/${pkgbase}/" - else - error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" - fi - fi - local netfile for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") @@ -1125,6 +1107,32 @@ create_srcpackage() { fi done + local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) + if [[ -n $install_files ]]; then + local file + for file in ${install_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then + msg2 "$(gettext "Adding install script (%s)...")" "$file" + ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" + fi + done + fi + + local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) + if [[ -n $changelog_files ]]; then + local file + for file in ${changelog_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then + msg2 "$(gettext "Adding package changelog (%s)...")" "$file" + ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" + fi + done + fi + local TAR_OPT case "$SRCEXT" in *tar.gz) TAR_OPT="z" ;; @@ -1242,14 +1250,29 @@ check_sanity() { fi done - if [[ $install && ! -f $install ]]; then - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" - return 1 + local install_files=( $(grep "^[[:space:]]*install=" "$BUILDSCRIPT" | sed "s/install=//") ) + if [[ -n $install_files ]]; then + local file + for file in ${install_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f $file ]]; then + error "$(gettext "Install scriptlet (%s) does not exist.")" "$file" + return 1 + fi + done fi - if [[ -n $changelog && ! -f $changelog ]]; then - error "$(gettext "Changelog file (%s) does not exist.")" "$changelog" - return 1 + local changelog_files=( $(grep "^[[:space:]]*changelog=" "$BUILDSCRIPT" | sed "s/changelog=//") ) + if [[ -n $changelog_files ]]; then + for file in ${changelog_files[@]}; do + # evaluate any bash variables used + eval file=${file} + if [[ ! -f $file ]]; then + error "$(gettext "Changelog file (%s) does not exist.")" "$file" + return 1 + fi + done fi local valid_options=1 -- 1.7.0.6

1 0

[pacman-dev] [PATCH 1/2] check for valid optarg before using strdup
by Serge Ziryukin 26 Apr '10

26 Apr '10

Signed-off-by: Serge Ziryukin <ftrvxmtrx(a)gmail.com> --- src/pacman/pacman.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d32d4d1..206cdcf 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -489,6 +489,7 @@ static int parseargs(int argc, char *argv[]) setarch(optarg); break; case OP_PRINTFORMAT: + check_optarg(); config->print_format = strdup(optarg); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; -- 1.7.0.6

2 3

[pacman-dev] [PATCH] New pactests for the phonon/qt issue
by Nagy Gabor 24 Apr '10

24 Apr '10

Original work by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync405.py | 26 ++++++++++++++++++++++++++ pactest/tests/sync406.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync405.py create mode 100644 pactest/tests/sync406.py diff --git a/pactest/tests/sync405.py b/pactest/tests/sync405.py new file mode 100644 index 0000000..d170cec --- /dev/null +++ b/pactest/tests/sync405.py @@ -0,0 +1,26 @@ +self.description = "phonon/qt issue" + +sp1 = pmpkg("kdelibs") +sp1.depends = ["phonon"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("qt", "4.6.1-1") +self.addpkg2db("sync", sp2) + +sp3 = pmpkg("phonon") +self.addpkg2db("sync", sp3) + +lp = pmpkg("qt", "4.5.3-1") +lp.provides = ["phonon"] +lp.conflicts = ["phonon"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=kdelibs") +self.addrule("PKG_EXIST=qt") +self.addrule("PKG_EXIST=phonon") +self.addrule("PKG_VERSION=qt|4.6.1-1") + +self.expectfailure = True diff --git a/pactest/tests/sync406.py b/pactest/tests/sync406.py new file mode 100644 index 0000000..c15862f --- /dev/null +++ b/pactest/tests/sync406.py @@ -0,0 +1,31 @@ +self.description = "phonon/qt issue (2)" + +sp1 = pmpkg("kdelibs") +sp1.depends = ["phonon"] +self.addpkg2db("sync", sp1); + +sp2 = pmpkg("qt", "4.6.1-1") +self.addpkg2db("sync", sp2) + +sp3 = pmpkg("phonon") +self.addpkg2db("sync", sp3) + +sp4 = pmpkg("kdeapp") +sp4.depends = ["qt>=4.6"] +self.addpkg2db("sync", sp4) + +lp = pmpkg("qt", "4.5.3-1") +lp.provides = ["phonon"] +lp.conflicts = ["phonon"] +self.addpkg2db("local", lp) + +self.args = "-S %s" % " ".join([p.name for p in sp1, sp4]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=kdelibs") +self.addrule("PKG_EXIST=qt") +self.addrule("PKG_EXIST=phonon") +self.addrule("PKG_EXIST=kdeapp") +self.addrule("PKG_VERSION=qt|4.6.1-1") + +self.expectfailure = True -- 1.7.0.5

1 0

[pacman-dev] [PATCH] makepkg: deprecate repackaging without a package function
by Allan McRae 23 Apr '10

23 Apr '10

File permissions are not guaranteed to stay the same on exit from fakeroot, so repackaging may result in files with different permissions. This is avioded when using a package() function (or split packages) as the packaging step is rerun. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This extents the earier patch sent to the list and now deprecates the rebuilding of packages without package() functions. scripts/makepkg.sh.in | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b2b449c..b306620 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1847,9 +1847,14 @@ fi if (( INFAKEROOT )); then if (( ! SPLITPKG )); then if (( ! PKGFUNC )); then - if (( BUILDFUNC && ! REPKG )); then - run_build - tidy_install + if (( ! REPKG )); then + if (( BUILDFUNC )); then + run_build + tidy_install + fi + else + warning "$(gettext "Repackaging without the use of a package() function is deprecated")" + plain "$(gettext "as it may not preserve file permissions.")" fi else run_package @@ -1975,8 +1980,13 @@ else if (( PKGFUNC )); then run_package tidy_install - elif (( ! REPKG )); then - tidy_install + else + if (( ! REPKG )); then + tidy_install + else + warning "$(gettext "Repackaging without the use of a package() function is deprecated")" + plain "$(gettext "as it may not preserve file permissions.")" + fi fi create_package else -- 1.7.0.5

1 0

[pacman-dev] [PATCH] contrib/pactree: generate reverse dependency trees
by Allan McRae 20 Apr '10

20 Apr '10

From: Christophe Chapuis <chris.chapuis(a)gmail.com> Add an option to show the tree of packages which depend on a given package Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Just a git diff from Christophe's original patch. I adjusted the patch slightly so that the original was the first path in the if/else statements. Also bumped pkgver a larger version. contrib/pactree | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/contrib/pactree b/contrib/pactree index df53671..73bece3 100755 --- a/contrib/pactree +++ b/contrib/pactree @@ -41,7 +41,7 @@ arrow1_color="chocolate4" #color of the normal arrow arrow2_color="grey" #color of the "provided by" headless arrow readonly prog_name="pactree" -readonly prog_ver="0.2" +readonly prog_ver="0.3" _usage(){ echo "This program generates the dependency tree of an installed package" @@ -52,13 +52,14 @@ _usage(){ echo " -d, --depth INT Limit the shown dependencies depth" echo " -g, --graph Use graphviz to make an image of the tree" echo " -l, --linear Enable linear output" + echo " -r, --reversed Show reversed dependancies" echo " -s, --silent Shh, let me hear those errors!" echo " -u, --unique Print the dependency list with no duplicates" echo echo " -h, --help Print this help message" echo " -v, --version Print the program name and version" echo - echo "Example: $prog_name -c -d 2 readline" + echo "Example: $prog_name -c -d2 readline" } _version(){ @@ -140,7 +141,16 @@ _tree(){ if [[ ! " ${dep_list[@]} " =~ " $pkg_name " ]] && [ $spaces -ne $max_depth ]; then dep_list=( "${dep_list[@]}" "$pkg_name" ) - for dep_pkg in $(_grabfield "$pkg_dir/depends" %DEPENDS%); do + if [ $reversed_dep -eq 0 ]; then + deps_pkg="$(_grabfield "$pkg_dir/depends" %DEPENDS%)" + else + reqs_pkg_dir="$(_finddep "$pkg_name" %DEPENDS% depends)" + unset deps_pkg + for req_pkg_dir in $reqs_pkg_dir; do + deps_pkg=$(echo "$deps_pkg" "$(_grabfield "$req_pkg_dir/desc" %NAME%)") + done + fi + for dep_pkg in $deps_pkg; do spaces=$2 #Bash scoping ;_; if [ $graphviz -eq 1 ]; then echo "\"$1\" -> \"${dep_pkg%%[<>=]*}\" [color=$arrow1_color];" @@ -208,6 +218,12 @@ for (( n=0 ; n < $len_options ; n++ )); do continue fi + if [ "${options[$n]}" = "-r" -o "${options[$n]}" = "--reversed" ]; then + unset options[$n] + reversed_dep=1 + continue + fi + if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then max_depth="${options[$n]#-d}" @@ -229,6 +245,7 @@ linear=${linear:-0} silent=${silent:-0} nodup=${nodup:-0} graphviz=${graphviz:-0} +reversed_dep=${reversed_dep:-0} if [ $colored -ne 1 ]; then unset branch1_color @@ -292,8 +309,12 @@ if [ $graphviz -eq 1 ]; then root_pkgs="${options[@]}" # Uncomment for the "generated by pactree" node in graphviz #advert="xyz [height=0.07, fontsize=8.0, label=\"GENERATED WITH PACTREE\",shape=box,color="black",style=filled,fontcolor="white"];\n" - - echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.deps.$gformat" + if [ $reversed_dep -eq 0 ]; then + file_extension="deps.$gformat" + else + file_extension="reqs.$gformat" + fi + echo -e "digraph G { START [color=$start_color, style=filled];\n node [style=filled, color=$nodes_color];\n$(_main)\n$advert}" | dot -T$gformat -o "${root_pkgs// /_}.$file_extension" else _main fi -- 1.7.0.5

1 0

[pacman-dev] VCS-PKGBUILDs
by David Campbell 18 Apr '10

18 Apr '10

Does anyone find it odd that the non-VCS PKGBUILDs explicitly check to make sure the sources have not changed and that the PKGBUILD someone uses is actually going to build the package the maintainer wrote it for, yet, VCS PKGBUILDs don't? VCS sources may change frequently, but this does not make them more secure and requiring of less scrutiny than non-VCS packages. If anything, they probably should be more scrutinized, since it would be more likely for someone to make a troublesome commit than a troublesome official release. There is also the issue that by automatically grabbing new sources without completely updating the PKGBUILD, many PKGBUILD fields may be incorrect, not just the pkgver. If the license a package is released under changes, the PKGBUILD won't care, etc.. Rather than making an often failed attempt to automatically update the pkgver and ignoring the rest of the PKGBUILD fields, why not have VCS PKGBUILDs behave more like all the other PKGBUILDs. When PKGBUILD sources change, a maintainer should have to update the PKGBUILD and PKGBUILDs which try to build using sources that don't match the PKGBUILD should fail. Figuring out the best way to check sources for all VCSs may require some creativity, but at least git would be really simple: check the hash for the last commit. Also, instead of using the date for the pkgver field of a VCS PKGBUILD, have the pkgver reflect the most recent release that the given development package is based off of. Then, use a commit field to show how many commits ahead of that release a package is. These fields would make it more clear what exactly the PKGBUILD is a PKGBUILD for. If there is no release to use commits since, the field could be left blank. This avoids ambiguity caused by different sources of a development project being released on the same day as well as issues with the sometimes significant difference between when a commit is authored and actually committed. -- David Campbell

4 5