- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Fix the check for references to srcdir/pkgdir in BSDs
by Nezmer 02 Feb '11

02 Feb '11

At least in FreeBSD, find always returns 0 If It finds stuff (imagine that). It doesn't care about the exit status of whatever is passed to -exec. This patch makes the checks compatible with this behaviour. Using xargs and not using grep directly because packages with too many files would cause grep to complain about argument list being too long. This should also fix the false positive in packages with no files. Signed-off-by: Nezmer <git(a)nezmer.info> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b1b1b75..72b8035 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1000,10 +1000,10 @@ check_package() { done # check for references to the build and package directory - if find "${pkgdir}" -type f -exec grep -q -I "${srcdir}" {} +; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$srcdir" fi - if find "${pkgdir}" -type f -exec grep -q -I "${pkgdir}" {} +; then + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdir}" ; then warning "$(gettext "Package contains reference to %s")" "\$pkgdir" fi -- 1.7.3.5

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-311-g87240da
by dan＠archlinux.org 01 Feb '11

01 Feb '11

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 87240dae6d4631a812ee81ed53c1622dd164bfcf (commit) from 111e07d0be44b76b910c6a004421ede4f6f6fb49 (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 87240dae6d4631a812ee81ed53c1622dd164bfcf Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 1 09:59:12 2011 -0600 Fix locale.h/setlocale inclusion with --disable-nls Noted in FS#22697. When I factored out _alpm_parsedate() into a common function, I didn't move the <locale.h> include properly, causing a build failure when NLS is disabled and this header isn't automatically included everywhere. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 2 -- lib/libalpm/be_package.c | 1 - lib/libalpm/be_sync.c | 1 - lib/libalpm/util.c | 5 +++-- 4 files changed, 3 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove existing pkg/ dir only if it's not empty.
by Esa Määttä 01 Feb '11

01 Feb '11

This allows symbolic linking of the pkg directory. Without this patch the symbolic link to an another directory would be removed as existing pkg/ directory. Signed-off-by: Esa Määttä <esa.maatta(a)iki.fi> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b1b1b75..bd2739b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2056,8 +2056,8 @@ if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else - # check for existing pkg directory; don't remove if we are repackaging - if [[ -d $pkgdir ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then + # check for existing non empty pkg directory; don't remove if we are repackaging + if [[ -n $(ls -A "$pkgdir" 2>/dev/null) ]] && (( ! REPKG || PKGFUNC || SPLITPKG )); then msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi -- 1.7.4

2 1

[pacman-dev] [PATCH] makepkg: fix indention to follow style guide
by Cedric Staniewski 01 Feb '11

01 Feb '11

--- Just spaces -> tabs scripts/makepkg.sh.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b1b1b75..0a90b89 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1171,14 +1171,14 @@ create_srcpackage() { exit 1 # TODO: error code fi - if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then - ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" - ret=$? - fi - - if (( ret )); then - warning "$(gettext "Failed to create symlink to source package file.")" - fi + if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then + ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + ret=$? + fi + + if (( ret )); then + warning "$(gettext "Failed to create symlink to source package file.")" + fi cd "${startdir}" rm -rf "${srclinks}" -- 1.7.4

1 0

[pacman-dev] sodeps: makepkg patches
by Florian Pritz 01 Feb '11

01 Feb '11

The -d/-dd patches are in master now so I'll start a new thread for the makepkg patches only. I've tested them with readline and they work fine. The final PKGINFO contains entries like these: depend = libc.so=6-64 provides = libreadline.so=6-64 Git repo is here http://git.server-speed.net/users/flo/pacman/?h=sodeps

4 7

[pacman-dev] Hooks in pacman
by Daniel Mendler 01 Feb '11

01 Feb '11

Hi, I added simple hooks support to pacman yesterday. Unfortunately I have not seen before that Sascha Kruse is already working on it. My concept is simpler and similar to the scriptlets. You might want to take a look at it even though. And another topic: I have seen that Allan is working on gpg-support. How far is this from deployment? Daniel

5 6

[pacman-dev] Namcap 2.8 release and future plans
by Rémy Oudompheng 31 Jan '11

31 Jan '11

Hello, I would like to release namcap 2.8 : it contains several new rules, and several bug fixes. * the git repo : http://projects.archlinux.org/users/remy/namcap.git/ * the source tarball : http://dev.archlinux.org/~remy/namcap-2.8.tar.gz * the package : http://dev.archlinux.org/~remy/namcap-2.8-1-any.pkg.tar.xz A notable addition here is the appearance of a test suite. Feel free to make any comments. I don't think I'll do many fixes on the 2.x branch. My plans for namcap 3 : * use Python 3 * parse split packages : PKGBUILDs are parsed in a "pkginfo" structure, I'd like to parse split packages into a tuple (pkgbase, list of pkginfo's), does this look ok to you ? * use a class hierarchy for rules : AbstractRule : defines very basic functions (get_name, get_description) PkgBuildRule, PkgInfoRule, TarballRule : derived classes applying to a PKGBUILD, to only one package in a split PKGBUILD, to a tarball this allows putting many rules in a single file and loading them using calls to isinstance() or issubclass() functions. * optionally : implement dan's idea of turning rules into callbacks. I have doubts about the benefit of such a transformation, but several of our tarballs are quite big and such an optimisation would be valuable. Such a callback would be implemented in the following way : define an generator/coroutine that yields files in a tarball (it would be useful to read raw tar.xz tarballs, for example by reading the pipe out of an xz process). Then the main loop of namcap iterates over this generator and feeds files to all relevant rules (TarballRule calass), which should implement a method called e.g. read_file(). The rules should gather information about the tarball in one pass. Then call some method called post_process? analyze? finalize? for all these rules: in this method, the rules use all the gathered information, e.g. the output of readelf -d, to compute the result and return it. -- Rémy.

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-310-g111e07d
by dan＠archlinux.org 31 Jan '11

31 Jan '11

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 111e07d0be44b76b910c6a004421ede4f6f6fb49 (commit) via b6ec9019d77c41edd86094a867fbb3970c6b4ebe (commit) via b8d01dace84a379d9104ae35f98c94b96103b6bc (commit) via 09f9f2433173477c0b0d269203e0f40df0907aa9 (commit) via 986edb8bd4308b73ef225a554f13a07c232ead91 (commit) via d6a9436143920f794d785423ac35eb351d791776 (commit) via 2d5ec02d7c82bdef1a9fb0565dcb67564968a8c0 (commit) via ed1aef7bc5caac95358c4827f162a845230051a2 (commit) via 2e1b5c96a639e4196c018dff0ad05ba0027f303c (commit) from e263cf7231c5d6ec41a15cd6230dbd794b58287a (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 111e07d0be44b76b910c6a004421ede4f6f6fb49 Author: Florian Pritz <bluewind(a)xssn.at> Date: Fri Oct 1 16:42:09 2010 +0200 make -d less strict; add -dd option -d skips checking the version of a dependency. -dd skips the whole dependency check. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Florian Pritz <bluewind(a)server-speed.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6ec9019d77c41edd86094a867fbb3970c6b4ebe Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu Oct 14 11:28:25 2010 +0200 alpm/depcmp: new NODEPVERSION flag This flag allows to disable version checking in dependency resolving code. depcmp_tolerant respects the NODEPVERSION flag but we still keep the original strict depcmp. The idea is to reduce the impact of the NODEPVERSION flag by using it in fewer places. I replaced almost all depcmp calls by depcmp_tolerant in deps.c (except in the public find_satisfier used by deptest / pacman -T), but I kept depcmp in sync.c and conflict.c Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8d01dace84a379d9104ae35f98c94b96103b6bc Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 10 19:51:07 2010 +0200 add pactests for -Sdd Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 09f9f2433173477c0b0d269203e0f40df0907aa9 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 12:10:05 2011 -0600 Allow both cleanmethod values to be specified at the same time No reason to disallow this- it allows keeping even more packages around in the cache. Test cases included for this case and to ensure the default behavior is preserved. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 986edb8bd4308b73ef225a554f13a07c232ead91 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 11:30:01 2011 -0600 Style cleanups in clean cache code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6a9436143920f794d785423ac35eb351d791776 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 11:26:48 2011 -0600 Add three clean cache tests The first two are rather standard tests of our two available clean options, and the third is attempting to test a reported bug (and failing to make the given case fail). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2d5ec02d7c82bdef1a9fb0565dcb67564968a8c0 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 11:25:56 2011 -0600 pactest: allow checking for cache file existence This will allow some tests to be added for cache cleaning. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed1aef7bc5caac95358c4827f162a845230051a2 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Jan 30 13:09:11 2011 +0100 libalpm: fix db_update documentation return codes were mixed up Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2e1b5c96a639e4196c018dff0ad05ba0027f303c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 29 13:34:51 2011 -0600 Call count() once in callback Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 7 +- doc/pacman.conf.5.txt | 6 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/be_sync.c | 25 ++++---- lib/libalpm/deps.c | 43 +++++++++++--- lib/libalpm/deps.h | 1 + src/pacman/callback.c | 5 +- src/pacman/conf.h | 4 +- src/pacman/pacman.c | 30 +++++++--- src/pacman/sync.c | 92 +++++++++++++++-------------- test/pacman/pmrule.py | 7 ++ test/pacman/pmtest.py | 19 ++++++- test/pacman/tests/clean001.py | 26 ++++++++ test/pacman/tests/clean002.py | 26 ++++++++ test/pacman/tests/clean003.py | 16 +++++ test/pacman/tests/clean004.py | 30 ++++++++++ test/pacman/tests/clean005.py | 29 +++++++++ test/pacman/tests/sync-nodepversion01.py | 16 +++++ test/pacman/tests/sync-nodepversion02.py | 15 +++++ test/pacman/tests/sync-nodepversion03.py | 15 +++++ test/pacman/tests/sync-nodepversion04.py | 15 +++++ test/pacman/tests/sync-nodepversion05.py | 19 ++++++ test/pacman/tests/sync-nodepversion06.py | 19 ++++++ test/pacman/tests/sync045.py | 4 +- test/pacman/tests/upgrade072.py | 2 +- 25 files changed, 385 insertions(+), 88 deletions(-) create mode 100644 test/pacman/tests/clean001.py create mode 100644 test/pacman/tests/clean002.py create mode 100644 test/pacman/tests/clean003.py create mode 100644 test/pacman/tests/clean004.py create mode 100644 test/pacman/tests/clean005.py create mode 100644 test/pacman/tests/sync-nodepversion01.py create mode 100644 test/pacman/tests/sync-nodepversion02.py create mode 100644 test/pacman/tests/sync-nodepversion03.py create mode 100644 test/pacman/tests/sync-nodepversion04.py create mode 100644 test/pacman/tests/sync-nodepversion05.py create mode 100644 test/pacman/tests/sync-nodepversion06.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] sodeps (yes, again)
by Florian Pritz 31 Jan '11

31 Jan '11

So some months ago Xavier posted a link to his patches for pacman (-Sdd). Back then Allan didn't have enough time to take a look. Later I asked him directly and he told me to let Dan review them. Dan told me he would like to hear Allan's opinion first. I'll try again and please someone just review them. I've cherry-picked them to one central location [1] and I'll also post them in this thread for easier quoting. In case you don't want to include sodeps support in pacman I'll accept that, but *please* tell me so I don't waste my time trying to get answers. [1] http://git.server-speed.net/users/flo/pacman/log/?h=sodeps -- Florian Pritz -- {flo,bluewind}(a)server-speed.net

7 41

[pacman-dev] [PATCH 1/3] Remove unused argument trans from function _alpm_runscriptlet
by Daniel Mendler 30 Jan '11

30 Jan '11

Signed-off-by: Daniel Mendler <mail(a)daniel-mendler.de> --- lib/libalpm/add.c | 8 ++++---- lib/libalpm/remove.c | 4 ++-- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 2cfa23b..c37198c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -517,7 +517,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle->root, newpkg->origin_data.file, - "pre_upgrade", newpkg->version, oldpkg->version, trans); + "pre_upgrade", newpkg->version, oldpkg->version); } } else { is_upgrade = 0; @@ -529,7 +529,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, /* pre_install scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle->root, newpkg->origin_data.file, - "pre_install", newpkg->version, NULL, trans); + "pre_install", newpkg->version, NULL); } } @@ -698,10 +698,10 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, if(is_upgrade) { _alpm_runscriptlet(handle->root, scriptlet, "post_upgrade", alpm_pkg_get_version(newpkg), - oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans); + oldpkg ? alpm_pkg_get_version(oldpkg) : NULL); } else { _alpm_runscriptlet(handle->root, scriptlet, "post_install", - alpm_pkg_get_version(newpkg), NULL, trans); + alpm_pkg_get_version(newpkg), NULL); } } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 5def92a..0641e43 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -390,7 +390,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle->root, scriptlet, "pre_remove", - alpm_pkg_get_version(info), NULL, trans); + alpm_pkg_get_version(info), NULL); } if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { @@ -435,7 +435,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { _alpm_runscriptlet(handle->root, scriptlet, "post_remove", - alpm_pkg_get_version(info), NULL, trans); + alpm_pkg_get_version(info), NULL); } /* remove the package from the database */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 804ab7a..5b06505 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -339,7 +339,7 @@ static int grep(const char *fn, const char *needle) int _alpm_runscriptlet(const char *root, const char *installfn, const char *script, const char *ver, - const char *oldver, pmtrans_t *trans) + const char *oldver) { char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index ce2dc52..afe0ed7 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -74,7 +74,7 @@ int _alpm_trans_init(pmtrans_t *trans, pmtransflag_t flags, alpm_trans_cb_progress progress); int _alpm_runscriptlet(const char *root, const char *installfn, const char *script, const char *ver, - const char *oldver, pmtrans_t *trans); + const char *oldver); #endif /* _ALPM_TRANS_H */ -- 1.7.3.5

1 2