- Pacman-dev - lists.archlinux.org

[pacman-dev] Makepkg should set environment variables of dependencies before continuing build()
by Eric Fernandez 31 Dec '12

31 Dec '12

Hi, I would like to submit a problem regarding environment variables when installing make dependencies specified in a PKGBUILD. This is a follow-up of a problem I reported in https://bbs.archlinux.org/viewtopic.php?pid=1211773. This happens when a dependency has an /etc/profile.d shell script which sets one or more environment variables. If this dependency is installed for the first time on a system, these environment variables are not available when the build() fonction is run. This is an issue when these environment variables are required within the PKGBUILD script. As a workaround, maintainers run the profile script of the dependencies directly in in build(). However this may be difficult, especially in case of a meta package with multiple choices. For instance, if makedepends contains a meta package such as "java-environment", and Java has never been installed before, the user will be asked if he wants to install either openjdk6 or jdk7-openjdk. If the build() fonction requires the JAVA_HOME environment variable, which contains the path to java, the maintainer has to source the corresponding /etc/profile.d shell script, but its name is different in jdk6 and jdk7! Thus PKGBUILD maintainers have used various "tricks", such as (see opencascade in AUR): if [ -z $JAVA_HOME ]; then [ -e /etc/profile.d/openjdk6.sh ] && source /etc/profile.d/openjdk6.sh [ -e /etc/profile.d/jdk.sh ] && source /etc/profile.d/jdk.sh fi or (see java-mecab in AUR): if [ -f /etc/profile.d/openjdk6.sh ]; then source /etc/profile.d/openjdk6.sh elif [ -f /etc/profile.d/jdk.sh ]; then source /etc/profile.d/jdk.sh fi As you can see, the goal is the same, but the syntax is different and awkward. There is no official or normalised way to do this. I propose to correct this by making the environment variables immediately available in build() when a package is installed as a dependency. It would be logical that when makepkg installs dependencies, the whole package files but also the environment variables set by this package are available. This would make a PKGBUILD less error-prone by: - undifferenciating if a makedepends is installed for the first time or not - removing the need to source the correct profile shell script, making the task difficult in case of a meta package - making the maintenance of the PKGBUILD easier (what happens when jdk8 is available, and the profile script name has changed again?) Note that "source /etc/profile" in build() is not a good solution, as it runs all profile.d scripts and if one script fails, then the build process is aborted. It is better to fix makepkg upstream. I had a look at the code, and do not understand why run_pacman does not set the variables, but maybe it is a problem of variable space? Eric

2 7

[pacman-dev] [PATCH] Use a defined constant in delta.c for num_matches
by Dan McGee 27 Dec '12

27 Dec '12

This allows compiling in both clang and gcc without running into oddities regarding const vs. defined constant values. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/delta.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 26ae5d5..48c8e91 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -270,6 +270,8 @@ alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) /** @} */ +#define NUM_MATCHES 6 + /** Parses the string representation of a alpm_delta_t object. * This function assumes that the string is in the correct format. * This format is as follows: @@ -281,9 +283,8 @@ alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) alpm_delta_t *_alpm_delta_parse(alpm_handle_t *handle, const char *line) { alpm_delta_t *delta; - const int num_matches = 6; size_t len; - regmatch_t pmatch[num_matches]; + regmatch_t pmatch[NUM_MATCHES]; char filesize[32]; /* this is so we only have to compile the pattern once */ @@ -296,7 +297,7 @@ alpm_delta_t *_alpm_delta_parse(alpm_handle_t *handle, const char *line) handle->delta_regex_compiled = 1; } - if(regexec(&handle->delta_regex, line, num_matches, pmatch, 0) != 0) { + if(regexec(&handle->delta_regex, line, NUM_MATCHES, pmatch, 0) != 0) { /* delta line is invalid, return NULL */ return NULL; } @@ -326,6 +327,8 @@ alpm_delta_t *_alpm_delta_parse(alpm_handle_t *handle, const char *line) return delta; } +#undef NUM_MATCHES + void _alpm_delta_free(alpm_delta_t *delta) { FREE(delta->delta); -- 1.8.0.2

1 0

[pacman-dev] [PATCH] util/pactree: correctly free the deps list in walk_deps()
by Dan McGee 27 Dec '12

27 Dec '12

If we are reversed, then we were correctly freeing both the list and the contained data. However, we were leaking a list in the case of a non-reversed traversal. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util/pactree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 0c1710f..9125f58 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -472,7 +472,7 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r depth->next = &d; /* last dep, cut off the limb here */ if(last){ - if(depth->prev){ + if(depth->prev) { depth->prev->next = &d; d.prev = depth->prev; depth = &d; @@ -488,6 +488,8 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth, int r if(rev) { FREELIST(deps); + } else { + alpm_list_free(deps); } } -- 1.8.0.2

1 0

Re: [pacman-dev] mailman test
by BA lanfest 22 Dec '12

22 Dec '12

nest 1

1 1

Re: [pacman-dev] mailman test
by BA lanfest 22 Dec '12

22 Dec '12

sorry for the spam, testing

1 0

[pacman-dev] mailman test
by BA lanfest 22 Dec '12

22 Dec '12

testing

1 0

[pacman-dev] [PATCH 1/4] pacdiff: color filename and mention what we found
by Florian Pritz 19 Dec '12

19 Dec '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- contrib/pacdiff.sh.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index bfafda2..5797fef 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -62,7 +62,15 @@ fi # see http://mywiki.wooledge.org/BashFAQ/020 while IFS= read -u 3 -r -d '' pacfile; do file="${pacfile%.pac*}" - echo "File: $file" + file_type="pac${pacfile##*.pac}" + + case "$file_type" in + pacnew) printf "\e[0;32m%s\e[0m" "$file_type";; + pacorig) printf "\e[0;33m%s\e[0m" "$file_type";; + pacsave) printf "\e[0;34m%s\e[0m" "$file_type";; + esac + + printf " found for \e[0;35m%s\e[0m\n" "$file" if [ ! -f "$file" ]; then echo " $file does not exist" rm -i "$pacfile" -- 1.8.0.2

2 4

[pacman-dev] [PATCH 1/4] Remove Cygwin support
by Allan McRae 16 Dec '12

16 Dec '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 5 ----- src/pacman/pacman.c | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index faa0792..122f387 100644 --- a/configure.ac +++ b/configure.ac @@ -309,10 +309,6 @@ case "${host_os}" in SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" ;; - cygwin*) - host_os_cygwin=yes - AC_DEFINE([CYGWIN], [1], [Define if host OS is cygwin]) - ;; darwin*) host_os_darwin=yes INODECMD="/usr/bin/stat -f '%i %n'" @@ -324,7 +320,6 @@ case "${host_os}" in ;; esac -AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 29a489b..e3293a0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -758,8 +758,7 @@ int main(int argc, char *argv[]) size_t i; struct sigaction new_action, old_action; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; -#if defined(HAVE_GETEUID) && !defined(CYGWIN) - /* geteuid undefined in CYGWIN */ +#if defined(HAVE_GETEUID) uid_t myuid = geteuid(); #endif @@ -881,7 +880,7 @@ int main(int argc, char *argv[]) config->logmask &= ~ALPM_LOG_WARNING; } -#if defined(HAVE_GETEUID) && !defined(CYGWIN) +#if defined(HAVE_GETEUID) /* check if we have sufficient permission for the requested operation */ if(myuid > 0 && needs_root()) { pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); -- 1.8.0.2

2 3

[pacman-dev] [PATCH 1/2] Log if dbs are up to date, synced, or failed to sync
by Olivier Brunel 16 Dec '12

16 Dec '12

Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- This simply adds information about what was actually done, I left the "synchronizing" message in case it's used by external tools (e.g. pacmatic). src/pacman/sync.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 532a667..f8fce7f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -331,12 +331,18 @@ static int sync_synctree(int level, alpm_list_t *syncs) int ret = alpm_db_update((level < 2 ? 0 : 1), db); if(ret < 0) { + alpm_logaction(config->handle, "failed to update %s (%s)\n", + alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); pm_printf(ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); } else if(ret == 1) { + alpm_logaction(config->handle, "%s is up to date\n", + alpm_db_get_name(db)); printf(_(" %s is up to date\n"), alpm_db_get_name(db)); success++; } else { + alpm_logaction(config->handle, "synchronized %s\n", + alpm_db_get_name(db)); success++; } } -- 1.8.0.2

3 9

[pacman-dev] [PATCH] Added a -n option to repo-add to only add new packages (v2)
by dangets＠gmail.com 16 Dec '12

16 Dec '12

From: Danny George <dangets(a)gmail.com> Packages are already in the pkg db were given a warning, and then readded anyway. With -n specified, the warning is printed, but skips readding it. Updated man page and slight tweak per suggestion Allan McRae Signed-off-by: Danny George <dangets(a)gmail.com> --- doc/repo-add.8.txt | 4 ++++ scripts/repo-add.sh.in | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt index 79b5a7e..91f3ac6 100644 --- a/doc/repo-add.8.txt +++ b/doc/repo-add.8.txt @@ -68,6 +68,10 @@ repo-add Options specified packages. This is useful for creating databases listing all files in a given sync repository for tools that may use this information. +*-n, \--new*:: + Only add packages that are not already in the database. Warnings will be + printed upon detection of existing packages, but they will not be re-added. + See Also -------- linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5a3bf23..3e18a1a 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -30,6 +30,7 @@ declare -r confdir='@sysconfdir@' QUIET=0 DELTA=0 +ONLYADDNEW=0 WITHFILES=0 SIGN=0 VERIFY=0 @@ -55,6 +56,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "\n" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" + printf -- "$(gettext " -n, --new only add packages that are not already in the database\n")" printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" @@ -290,6 +292,9 @@ db_write_entry() { if [[ -d $tmpdir/tree/$pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" + if (( ONLYADDNEW )); then + return 0; + fi else if (( DELTA )); then pkgentry=$(find_pkgentry "$pkgname") @@ -603,6 +608,7 @@ while (( $# )); do case $1 in -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; + -n|--new) ONLYADDNEW=1;; -f|--files) WITHFILES=1;; -s|--sign) check_gpg -- 1.8.0.1

3 2