- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: remove srclinks directory on error exit
by Cedric Staniewski 12 Dec '09

12 Dec '09

When makepkg exits in create_srcpackage(), the (temporary) srclinks directory is left behind. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ceaa8a6..b618881 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -118,6 +118,7 @@ trap_exit() { echo error "$@" fi + [[ -n $srclinks ]] && rm -rf "$srclinks" exit 1 } -- 1.6.5.3

3 5

[pacman-dev] [PATCH] Skip devel_check() when repackaging
by Nezmer 12 Dec '09

12 Dec '09

Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ceaa8a6..0e18e3f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1265,7 +1265,7 @@ devel_check() { # Do not update pkgver if --holdver is set, when building a source package, # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) - if (( HOLDVER || SOURCEONLY )) \ + if (( HOLDVER || SOURCEONLY || REPKG )) \ || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then return fi -- 1.6.5.5

2 1

[pacman-dev] makepkg in a constrained environment
by Ciprian Dorin, Craciun 11 Dec '09

11 Dec '09

Hello all! For some time I was struggling in creating (for myself) a "sterile" environment for package building purposes. (I want to build some custom packages for a custom lightweight distribution.) And in what follows I would like to share my experience with pacman / makepkg developers in such a "sterile" environment. By "sterile" I mean the following: * clean, uncontaminated packages: freshly installed by pacman from a repository without my intervention; (if I would use my ArchLinux installation, some packages (compiler, libraries, etc.) would be configured to my like, and thus it could create a non-repeatable build); * minimal package installation base: only the packages that have been clearly declared as dependencies in PKGBUILD should be installed (of course with their dependencies); * I need the assurance that configure and make scripts of different packages pick up the right build tool-chains (for example for cross-compiling); As such, I've decided of the following: * prepare a UML (User Mode Linux) kernel, that shall provide me with a clean build Linux environment; (this could of course be replaced with a Vserver instance;) * prepare a (static linked) BusyBox with all the tools built in; (this shall be installed outside of the normal PATH, to be sure it's not picked up by the configure and make scripts;) * prepare a (static linked) Bash (installed outside the normal PATH); * when running makepkg, I'll set the PATH=/.workbench/tools/busybox/bin:/.workbench/tools/bash/bin; * but when inside the PKGBUILD I'll reset the PATH=/usr/local/bin:/usr/bin:/bin:etc.... Now my experiences with makepkg in such an environment: * it seems it works without too much fuss with the commands provided by busybox, except; * if one has declared of using only MD5 sums (most of the packages do this), it insists on using `openssl dgst` to create them; * it insists on using file tool to identify the file type; * it insists on using bsdtar to untar the tar archives; * it breaks if it's not able to chown the source tree; (this happens as inside UML I'm root, but outside UML the file system is owned by a normal user (the root filesystem of UML is exported by using hostfs)); So, as you can see nothing that can't be solved with some minor corrections. As such, if the community is interested I could provide some patches that allow makepkg to: * use md5sum instead of openssl for MD5 checksums; * use normal tar if bsdtar is not available; * base the file-type decision on file (if available), or on extension (if file is not available); * ignore errors for chown of source tree; (of course with a warning;) * provide a way to customize the path of the pacman tool; (maybe this has already been done); Also it would be nice (though painful) to allow the customization of paths for all external (non Bash functions) tools. For example: instead of calling mv, one should call "$mv", which should default to mv="${MV:-$( which mv )}" (that is if the variable MV is not defined then fallback on using the mv tool found in the PATH). So would the developers be interested in such patches? Any comments? Any ideas? Thanks, Ciprian.

6 9

[pacman-dev] [PATCH 1/2] print installed packages
by Xavier Chantry 10 Dec '09

10 Dec '09

Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/sync.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f101f9..896d028 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -274,6 +274,21 @@ static int sync_synctree(int level, alpm_list_t *syncs) return(success > 0); } +static void print_installed(pmpkg_t *pkg) +{ + const char *pkgname = alpm_pkg_get_name(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + pmpkg_t *lpkg = alpm_db_get_pkg(db_local, pkgname); + if(lpkg) { + const char *lpkgver = alpm_pkg_get_version(lpkg); + if(strcmp(lpkgver,pkgver) == 0) { + printf(" [%s]", _("installed")); + } else { + printf(_(" [%s: %s]"), _("installed"), lpkgver); + } + } +} + /* search the sync dbs for a matching package */ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) { @@ -330,6 +345,8 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf(")"); } + print_installed(pkg); + /* we need a newline and initial indent first */ printf("\n "); indentprint(alpm_pkg_get_desc(pkg), 4); @@ -514,9 +531,12 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { pmpkg_t *pkg = alpm_list_getdata(j); + if (!config->quiet) { - printf("%s %s %s\n", alpm_db_get_name(db), alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf("%s %s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + print_installed(pkg); + printf("\n"); } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.6.4.2

3 6

[pacman-dev] pacman -Sy with no network = weird result
by Xavier 09 Dec '09

09 Dec '09

Here is a quick and lazy bug report so that I do not forget :) LANG=C sudo pacman -Sy :: Synchronizing package databases... error: failed to update testing (library not initialized) error: failed to update core (library not initialized) error: failed to update extra (library not initialized) error: failed to update community-testing (library not initialized) error: failed to update community (library not initialized) error: failed to synchronize any databases The error and the output is quite confusing.

3 3

[pacman-dev] [PATCH] docs: set text width to 72 in vim directive
by Cedric Staniewski 09 Dec '09

09 Dec '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- doc/PKGBUILD.5.txt | 2 +- doc/footer.txt | 2 +- doc/libalpm.3.txt | 2 +- doc/makepkg.8.txt | 2 +- doc/makepkg.conf.5.txt | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 2 +- doc/repo-add.8.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2d6589b..3fae95f 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// PKGBUILD(5) =========== diff --git a/doc/footer.txt b/doc/footer.txt index 8290f3c..806e071 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// See the pacman website at http://www.archlinux.org/pacman/[] for current diff --git a/doc/libalpm.3.txt b/doc/libalpm.3.txt index b7a892c..83dca68 100644 --- a/doc/libalpm.3.txt +++ b/doc/libalpm.3.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// libalpm(3) ========== diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 18ee6ed..be41751 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// makepkg(8) ========== diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 704dccc..88c4cbb 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// makepkg.conf(5) =============== diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 7f92ec7..9907281 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// pacman(8) ========= diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 89c22a1..9852fc7 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// pacman.conf(5) ============== diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 81bf837..4d5258a 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -1,5 +1,5 @@ ///// -vim:set ts=4 sw=4 syntax=asciidoc noet: +vim:set ts=4 sw=4 tw=72 syntax=asciidoc noet: ///// repo-add(8) ========== -- 1.6.5.3

3 3

[pacman-dev] [PATCH 1/3] fix a few warnings reported by clang
by Xavier Chantry 05 Dec '09

05 Dec '09

- remove unused variables - some more sanity checks - safer printf Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/add.c | 2 ++ lib/libalpm/be_files.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/package.c | 3 +-- src/pacman/callback.c | 4 +++- src/pacman/pacman.c | 2 +- src/pacman/util.c | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ebcd6a5..dc565ac 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -483,6 +483,8 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, ALPM_LOG_FUNC; + ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", _alpm_db_path(db), alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 7fc20b8..f685019 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -140,8 +140,8 @@ static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist) entry[len+1] = '\0'; *dirlist = alpm_list_add(*dirlist, entry); } + closedir(dbdir); } - closedir(dbdir); *dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp); return(0); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e934c01..85db83b 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -408,7 +408,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, ALPM_LOG_FUNC; - if(db == NULL || upgrade == NULL) { + if(db == NULL || upgrade == NULL || trans == NULL) { return(NULL); } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 83a2fb8..10220af 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -459,7 +459,6 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg) struct archive *archive = NULL; struct archive_entry *entry; const char *pkgfile = pkg->origin_data.file; - int ret = ARCHIVE_OK; if((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE, NULL); @@ -473,7 +472,7 @@ void SYMEXPORT *alpm_pkg_changelog_open(pmpkg_t *pkg) RET_ERR(PM_ERR_PKG_OPEN, NULL); } - while((ret = archive_read_next_header(archive, &entry)) == ARCHIVE_OK) { + while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { const char *entry_name = archive_entry_pathname(entry); if(strcmp(entry_name, ".CHANGELOG") == 0) { diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 858bfdf..15f5423 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -365,6 +365,8 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, case PM_TRANS_PROGRESS_CONFLICTS_START: opr = _("checking for file conflicts"); break; + default: + return; } /* find # of digits in package counts to scale output */ @@ -504,7 +506,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) gettimeofday(&initial_time, NULL); xfered_last = (off_t)0; rate_last = 0.0; - timediff = get_update_timediff(1); + get_update_timediff(1); } } else if(file_xfered == file_total) { /* compute final values */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index ff6ef5c..3dccd48 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -217,7 +217,7 @@ static void setarch(const char *arch) static void cleanup(int ret) { /* free alpm library resources */ if(alpm_release() == -1) { - pm_printf(PM_LOG_ERROR, alpm_strerrorlast()); + pm_printf(PM_LOG_ERROR, "%s\n", alpm_strerrorlast()); } /* free memory */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 115b367..d395f3d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -219,7 +219,7 @@ void indentprint(const char *str, int indent) p = wcstr; cidx = indent; - if(!p) { + if(!p || !len) { return; } -- 1.6.5.4

1 2

[pacman-dev] inside PKGBUILD customizable makepkg PURGE_TARGETS
by Ciprian Dorin, Craciun 03 Dec '09

03 Dec '09

Hello all! Again I have a proposal to enhance makepkg PURGE_TARGETS handling. I think that enabling customizing PURGE_TARGETS inside PKGBUILD would be a benefit in the following context: * I have a software package that contains: an application, a static library, a dynamic library, and some development files; * I want to create separate packages: something-bin, something-lib (shared library), something-dev (include and static library), and maybe something-doc; What I have to do today (maybe there is a different way, please correct me): I create a `something-lib_package` function in which I make a normal install, but then I delete all unneeded files. Wouldn't it be better if: a) I was able to define `pkg_purge_targets` also in PKGBUILD, overriding PURGE_TARGETS in makepkg.conf, and, b) allow to have `something-lib_pkg_purge_targets` that allows different purge targets for each "sub-package" overriding those from PKGBUILD or makepkg.conf; Comments? Ideas? Corrections? Thanks, Ciprian. P.S.: If needed I could provide a patch that implements this. P.P.S.: This has nothing to do with my previous proposal about globstar patterns in PURGE_TARGETS.

3 5

[pacman-dev] [PATCH] makepkg: check for references to build root in package
by Allan McRae 03 Dec '09

03 Dec '09

Add a check that the package does not contain references to the folder it was built in. Fixes FS#14751 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 820d81f..a5b8f87 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -971,6 +971,12 @@ check_package() { warning "$(gettext "Invalid backup entry : %s")" "$file" fi done + + # check for references to the build directory + grep -R "${srcdir}" "${pkgdir}" &>/dev/null + if [ $? -eq 0 ]; then + warning "$(gettext "Package contains reference to %s")" "\$srcdir" + fi } create_package() { -- 1.6.5.1

5 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-102-gf2c9e51
by dan＠archlinux.org 01 Dec '09

01 Dec '09

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 f2c9e51eb00edb2f3123bd150fd9944c765426e0 (commit) via 82443e00597b0db5a7eadea4886e22b373ac373b (commit) via 93862bd7cb91129cece07391c00ab9e6f81111d0 (commit) via 6c8f817040acb74bbf696e75a302280d5f07c98a (commit) from 96b34308fe6aed5ef002c3769639ad33dac923c7 (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 f2c9e51eb00edb2f3123bd150fd9944c765426e0 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Oct 22 14:40:03 2009 +1000 makepkg: allow specifying subsets of packages to build This allows makepkg to only build a specified subset of packages from a split PKGBUILD. This is very useful in combination with the -R flag or when bumping the pkgrel of a single package. Fixes FS#15956. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82443e00597b0db5a7eadea4886e22b373ac373b Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Nov 18 23:29:07 2009 +0100 makepkg: move pacman calls to a function Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 93862bd7cb91129cece07391c00ab9e6f81111d0 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Nov 2 23:31:15 2009 -0500 makepkg: Place packages symlinks in build dir when PKGDEST is used When PKGDEST is used, symlinks to the packages will be put in the build directory. This combines the convenience of a global package cache with the ease of having a package (i.e. a symlink) in the build directory for testing and installation purpose. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> [Allan: add comment documenting clean-up addition] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6c8f817040acb74bbf696e75a302280d5f07c98a Author: Isaac Good <pacman(a)isaac.otherinbox.com> Date: Tue Nov 17 14:16:48 2009 -0500 Replace an ugly while [ with a for (( loop Signed-off-by: Isaac Good <pacman(a)isaac.otherinbox.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 4 ++ scripts/makepkg.sh.in | 94 +++++++++++++++++++++++++++++++------------------ 2 files changed, 64 insertions(+), 34 deletions(-) hooks/post-receive -- The official pacman repository

1 0