December 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Ensure a terminating newline from scriptlet output
by Simon Gomizelj 02 Jan '13

02 Jan '13

Prevent scriptlets from clobbering pacman.log because they don't end their outputs with a newline. --- lib/libalpm/util.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 033058a..4bafb3f 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -555,24 +555,35 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) exit(1); } else { /* this code runs for the parent only (wait on the child) */ - int status; - FILE *pipe_file; + int status, need_newline = 0; CLOSE(pipefd[1]); - pipe_file = fdopen(pipefd[0], "r"); - if(pipe_file == NULL) { - CLOSE(pipefd[0]); - retval = 1; - } else { - while(!feof(pipe_file)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe_file) == NULL) - break; - alpm_logaction(handle, "%s", line); - EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); + for(;;) { + char line[BUFSIZ]; + int nbytes_r = read(pipefd[0], line, BUFSIZ); + + if(nbytes_r == 0) { + break; + } else if(nbytes_r == -1) { + if (errno != EINTR) { + _alpm_log(handle, ALPM_LOG_ERROR, _("call to read failed (%s)\n"), strerror(errno)); + CLOSE(pipefd[0]); + retval = 1; + goto cleanup; + } + continue; } - fclose(pipe_file); + + /* we'll need to manually add a newline if the read data doesn't end with one already */ + need_newline = line[nbytes_r - 1] != '\n'; + + alpm_logaction(handle, "%s", line); + EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); } + CLOSE(pipefd[0]); + + if (need_newline) + alpm_logaction(handle, "\n"); while(waitpid(pid, &status, 0) == -1) { if(errno != EINTR) { -- 1.8.0.2

2 2

[pacman-dev] [PATCH v2 1/5] pacdiff: color filename and mention what we found
by Florian Pritz 02 Jan '13

02 Jan '13

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Now uses tput to get the color codes. contrib/pacdiff.sh.in | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index bfafda2..4c6277d 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -24,6 +24,22 @@ diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 +if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + YELLOW="${BOLD}$(tput setaf 3)" + PURPLE="${BOLD}$(tput setaf 5)" +else + ALL_OFF="\e[1;0m" + BOLD="\e[1;1m" + BLUE="${BOLD}\e[1;34m" + GREEN="${BOLD}\e[1;32m" + YELLOW="${BOLD}\e[1;33m" + PURPLE="${BOLD}\e[1;35m" +fi + usage() { echo "$myname : a simple pacnew/pacorig/pacsave updater" echo "Usage : $myname [-l]" @@ -62,7 +78,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 "$GREEN%s$ALL_OFF" "$file_type";; + pacorig) printf "$YELLOW%s$ALL_OFF" "$file_type";; + pacsave) printf "$BLUE%s$ALL_OFF" "$file_type";; + esac + + printf " found for $PURPLE%s$ALL_OFF\n" "$file" if [ ! -f "$file" ]; then echo " $file does not exist" rm -i "$pacfile" -- 1.8.0.2

3 11

[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