- Pacman-dev - lists.archlinux.org

[pacman-dev] [Translation] Update for Simpilifiled Chinese
by 甘露(Lu Gan) 16 Jul '08

16 Jul '08

Done.

1 0

[pacman-dev] [PATCH] alpm_list_remove treat NULL needle as "nothing"
by Nagy Gabor 16 Jul '08

16 Jul '08

From c44fec0058d8a69d29eeb947698bfaf165a6a080 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 16 Jul 2008 15:57:08 +0200 Subject: [PATCH] alpm_list_remove treat NULL needle as "nothing" So if you want to remove NULL needle from a list, alpm_list_remove will return with "not found". Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm_list.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 8756740..9889503 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -302,6 +302,10 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl *data = NULL; } + if(needle == NULL) { + return(haystack); + } + while(i) { if(i->data == NULL) { continue; -- 1.5.6.2

2 2

[pacman-dev] [translation] spanish pacman 3.2 and libalpm files
by Juan Pablo Gonzalez T. 16 Jul '08

16 Jul '08

This is the spanish translation for the next release. greetings to everybody! -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Juan Pablo González Tognarelli | http://lacasadeljota.blogspot.com

1 0

[pacman-dev] [PATCH] Fix a possible segfault in alpm/remove.c
by Nagy Gabor 16 Jul '08

16 Jul '08

From 7aff060a6288b250d398fb47abcb2aa26f05a508 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 16 Jul 2008 15:27:37 +0200 Subject: [PATCH] Fix a possible segfault in alpm/remove.c Before removing a package from target list (in remove_prepare_keep_needed), we should check whether we have already removed it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/remove.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 625abe6..864fafa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -120,6 +120,9 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, pmdepmissing_t *miss = (pmdepmissing_t *)i->data; void *vpkg; pmpkg_t *pkg = _alpm_pkg_find(trans->packages, miss->causingpkg); + if(pkg == NULL) { + continue; + } trans->packages = alpm_list_remove(trans->packages, pkg, _alpm_pkg_cmp, &vpkg); pkg = vpkg; -- 1.5.6.2

1 0

[pacman-dev] Segmentation fault
by Nagy Gabor 16 Jul '08

16 Jul '08

I've just tested -Qqg with the following command, and I got a big segfault (debug.log attached): # LANG=C src/pacman/pacman.static -Rus `src/pacman/pacman.static -Qqg xorg gnome` --debug > debug.log # src/pacman/pacman.static -Qqg xorg gnome xf86-input-keyboard xf86-input-mouse xorg-fonts-75dpi xorg-server xorg-xinit xterm gnome-icon-theme gnome-mime-data Bye P.S.: This error appears with current pacman-git, too.

1 0

[pacman-dev] [PATCH] GPG signature support for makepkg:
by geoffroy.carrier＠koon.fr 16 Jul '08

16 Jul '08

From: Geoffroy Carrier <geoffroy.carrier(a)koon.fr> --- This should be the last version I submit here. I should start including support in pacman soon. It will rely directly on the gpg binary, and should work a lot like git. It has a very nice embedded "lib" to launch processes. I might embed parts of it in my pacman branch, as it's generic and seems very well-written. doc/makepkg.conf.5.txt | 3 +++ etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 113ad14..b6f4385 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -92,6 +92,9 @@ Options previous package must be available in the makepkg cache directory for this to occur. + *sign*;; + Generate a PGP signature file using GnuPG. + **DISTCC_HOSTS=**"host1 ...":: If using DistCC, this is used to specify a space-delimited list of hosts running in the DistCC cluster. In addition, you will want to modify your diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 47ed0a4..7d1fbb8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -38,7 +38,7 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache !xdelta !sign) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user @@ -46,8 +46,9 @@ CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation #-- xdelta: Generate delta patch from previous to current package +#-- sign: Generate PGP signature file # -BUILDENV=(fakeroot !distcc color !ccache !xdelta) +BUILDENV=(fakeroot !distcc color !ccache !xdelta !sign) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6e2f1ad..c4d8c2e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -855,6 +855,25 @@ create_package() { fi } +create_signature() { + if [ "$(check_buildenv sign)" != "y" ]; then + return + fi + local ret = 0 + local filename = "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + msg "$(gettext "Signing package...")" + if [ ! $(type -p "gpg") ]; then + error "$(gettext "Cannot find the gpg binary! Is gnupg installed?")" + exit 1 # $E_MISSING_PROGRAM + fi + gpg --detach-sign $filename || ret = $? + if [ $ret -eq 0 ]; then + msg2 "$(gettext "Created signature file %s.")" $filename.sig + else + warning "$(gettext "Failed to sign package file.")" + fi +} + create_xdelta() { if [ "$(check_buildenv xdelta)" != "y" ]; then return @@ -1494,6 +1513,8 @@ fi msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +create_signature + install_package exit 0 #E_OK -- 1.5.5.3

4 5

[pacman-dev] pactree, view the dependency tree
by Carlo Bersani 16 Jul '08

16 Jul '08

Hello, this time I wrote a dependency tree viewer. Feel free to check it: comments are very welcome. I especially would like to know how it should behave with packages which provide another one: I wrote part of the script thinking you couldn't install two packets providing the same one, but Allan proved me wrong. At the moment the script is untested with multiple providers, but otherwise it works quite well. The design choice of passing the directory instead of the packet name was ugly in the end, but I was fighting with the scoping in bash at the time, so I preferred to let things be; I might fix it. Hope you like it. I just noticed the ascii art failed me :( -----------------------------SCRIPT---------------------------------- #!/bin/bash # here you can set the colors branch_color="\033[0;33m" #Brown leaf_color="\033[1;32m" #Light green leaf2_color="\033[0;32m" #Green # here you can set the separators separator=" " branch_tip="|--" provides="provides " ########----------------END-OF-CONFIGURABLE-PART----------------####### # pactree : a simple dependency tree viewer # # Copyright (c) 2008 Carlo "carlocci" Bersani <carlocci(a)gmail.com> # # 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/>. # # Original http://carlocci.ngi.it/arch/pactree ####################################################################### # User friendly part # ####################################################################### readonly prog_name="pactree" readonly prog_ver="0.1" _usage(){ echo "This program generates the dependency tree of a package" echo "Usage: $prog_name [OPTIONS] <installed packages>" echo echo " OPTIONS:" echo " -c, --color Enable color output" echo " -d, --depth INT Limit the shown dependencies depth" echo " -l, --linear Enable linear output" 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" } _version(){ echo "$prog_name version $prog_ver" echo "Copyright (C) 2008 locci" } # end of the friendliness ####################################################################### # grab a field from the database: $1=path/to/file, $2=field to grab # ####################################################################### _grabfield(){ for line in $(cat "$1" 2>/dev/null ); do if [ -z "$line" ]; then continue; fi; if [[ "$line" =~ %[A-Z]*% ]]; then current="$line" continue; fi; if [ "$current" = "$2" ]; then echo "$line" fi; done } ####################################################################### # Recursive function: does all of the work, pays all of the taxes # ####################################################################### _tree(){ for i in $(_grabfield "$1/depends" %DEPENDS%); do pkg_dir="$1" spaces="$2" unset dep_pkg unset dep_pkg_provided # Generate the spacer spacer="" for each in $(seq 1 $spaces); do spacer="$spacer$separator" done spacer="$spacer$branch_tip" dep_pkg="${i%%[<>=]*}" dep_dir="$(echo $pac_db/$dep_pkg-[0-9]*)" if [ ! -d "$dep_dir" ]; then # Is $dep_pkg real or provided? #START DOUBT #AWK METHOD real 0m9.378s user 0m5.066s sys 0m2.083s #black magic dep_dir=$(awk '{ if ( $1 ~ /^%.*%$/ ) flag=0 ; if (flag==1) { if ($1 ~ /^'"$dep_pkg"'[<>=]*.*/ ) print FILENAME }; if ( $1=="%PROVIDES%" ) flag=1 ;}' $(find /var/lib/pacman/local -name depends)) dep_dir="${dep_dir%/*}" dep_pkg_provided="$(_grabfield "$dep_dir/desc" %NAME%)" #BASH METHOD real 0m28.461s user 0m10.229s sys 0m12.539s # for file in $(find $pac_db -name depends); do # for line in $(_grabfield "$file" %PROVIDES%); do # if [ $line = "$dep_pkg" ]; then # dep_dir="${file%/depends}" # dep_pkg_provided="$(_grabfield "$dep_dir/desc" %NAME%)" # break # fi # done # if [ $dep_pkg_provided ]; then # break # fi # done #END DOUBT fi # Draws the tree if [ $silent -ne 1 ]; then if [ "$dep_pkg_provided" ]; then echo -e "$branch_color$spacer$leaf_color$dep_pkg_provided$leaf2_color $provides$leaf_color$dep_pkg" else echo -e "$branch_color$spacer$leaf_color$dep_pkg" fi fi if [ ! -d "$dep_dir" ]; then echo "No $dep_pkg in the database (inconsistent database?)" >&2 fi # Checks for dups and depth if [[ ! "${dep_list[@]}" =~ $dep_pkg ]] && [ $spaces -ne $max_depth ]; then dep_list=( "${dep_list[@]}" "${dep_pkg_provided:-$dep_pkg}" ) _tree "$dep_dir" $((spaces+1)) fi done } ####################################################################### # Main program: gets all of the money, pays none of the taxes # ####################################################################### # Command line parameters parser -------------------------------------- # --------------------------------------------------------------------- if [ $# -eq 0 ]; then _usage exit 1 fi options=( "$@" ) len_options=${#options[@]} for (( n=0 ; n < $len_options ; n++ )); do if [ "${options[$n]}" = "--" ]; then unset options[$n] break fi if [ "${options[$n]}" = "-h" -o "${options[$n]}" = "--help" ]; then _usage exit 0 fi if [ "${options[$n]}" = "-v" -o "${options[$n]}" = "--version" ]; then _version exit 0 fi if [ "${options[$n]}" = "-l" -o "${options[$n]}" = "--linear" ]; then unset options[$n] unset separator unset branch_tip unset provider linear=1 continue fi if [ "${options[$n]}" = "-s" -o "${options[$n]}" = "--silent" ]; then unset options[$n] silent=1 continue fi if [ "${options[$n]}" = "-u" -o "${options[$n]}" = "--unique" ]; then unset options[$n] silent=1 nodup=1 continue fi if [ "${options[$n]}" = "-c" -o "${options[$n]}" = "--color" ]; then unset options[$n] colored=1 continue fi if [ "${options[$n]}" = "-d" -o "${options[$n]}" = "--depth" ]; then unset options[$n] if [[ ${options[$((n+1))]} =~ [[:digit:]]+ ]]; then # if [ ${options[$((n+1))]} -eq ${options[$((n+1))]} 2>/dev/null ]; then max_depth="${options[$((n+1))]}" unset options[$((n+1))] ((++n)) fi continue fi done # End of the dumb command line parser --------------------------------- # Env ----------------------------------------------------------------- # --------------------------------------------------------------------- max_depth=${max_depth:--1} linear=${linear:-0} silent=${silent:-0} nodup=${nodup:-0} if [ ${colored:-0} -ne 1 ]; then unset branch_color unset leaf_color unset leaf2_color fi if [ ! -r /etc/pacman.conf ]; then echo "ERROR: unable to read /etc/pacman.conf" exit 1 else eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) fi pac_db="${DBPath:-/var/lib/pacman}/local" if [ ! -d "$pac_db" ] ; then echo "ERROR: pacman database directory ${pac_db} not found" exit 1 fi # Env End ------------------------------------------------------------- # Program starts ------------------------------------------------------ # --------------------------------------------------------------------- for pkg_name in ${options[@]} ; do pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" if [ ! -d "$pkg_dir" ] ; then echo "ERROR: package ${pkg_name} not found in pacman database" exit 1 fi dep_list=( "$pkg_name" ) [ $silent -ne 1 ] && echo -e "$branch_color$branch_tip$leaf_color$pkg_name" [ $max_depth -ne 0 ] && _tree $(echo "$pac_db/$pkg_name-[0-9]*") 1 [ $nodup -eq 1 ] && echo "${dep_list[@]}" done # Program Ends -------------------------------------------------------- # vim: set ts=2 sw=2 noet:

3 2

[pacman-dev] [PATCH] _alpm_db_add_pkgincache rework
by Nagy Gabor 16 Jul '08

16 Jul '08

From 7490b62443a0bd08a06fa3c97976a27de5b85665 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 15 Jul 2008 01:07:22 +0200 Subject: [PATCH] _alpm_db_add_pkgincache rework Commit 8240da6cb3ff95ad480efe3e1876104024398fae broke some alpm hierarchy and introduced a new memleak (trans->packages was never freed in case of add transaction, even if the transaction wasn't committed), so it is reverted now. We follow a different approach to reduce memory usage: _alpm_db_add_pkgincache doesn't duplicate the whole package before adding it to the cache, only the package name and version (INFRQ_BASE). This method needs very small extra memory (compared to the reverted method), and after transaction commit we use less memory than before (since the big 'files' fields are not copied to cache), this is useful in GUIs. Note: The old add_pkgincache was a bit broken, since pkg->origin wasn't filled in correctly. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/cache.c | 22 ++++++++++++++++++++-- lib/libalpm/trans.c | 3 +-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index b140476..032cc97 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -98,17 +98,35 @@ alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) return(db->pkgcache); } +/* "duplicate" pkg with BASE info (to spare some memory) then add it to pkgcache */ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) { + pmpkg_t *newpkg; + ALPM_LOG_FUNC; if(db == NULL || pkg == NULL) { return(-1); } + newpkg = _alpm_pkg_new(); + if(newpkg == NULL) { + return(-1); + } + newpkg->name = strdup(pkg->name); + newpkg->version = strdup(pkg->version); + if(newpkg->name == NULL || newpkg->version == NULL) { + pm_errno = PM_ERR_MEMORY; + _alpm_pkg_free(newpkg); + return(-1); + } + newpkg->origin = PKG_FROM_CACHE; + newpkg->origin_data.db = db; + newpkg->infolevel = INFRQ_BASE; + _alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n", - alpm_pkg_get_name(pkg), db->treename); - db->pkgcache = alpm_list_add_sorted(db->pkgcache, pkg, _alpm_pkg_cmp); + alpm_pkg_get_name(newpkg), db->treename); + db->pkgcache = alpm_list_add_sorted(db->pkgcache, newpkg, _alpm_pkg_cmp); _alpm_db_free_grpcache(db); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 06084ae..d6b165d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -251,8 +251,7 @@ void _alpm_trans_free(pmtrans_t *trans) if(trans->type == PM_TRANS_TYPE_SYNC) { alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_sync_free); - } else if (trans->type == PM_TRANS_TYPE_REMOVE || - trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) { + } else { alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free); } alpm_list_free(trans->packages); -- 1.5.6.2

3 2

[pacman-dev] [PATCH] Fix a wrong FREELIST usage in add.c
by Nagy Gabor 16 Jul '08

16 Jul '08

From 4b272f807e2302f1ee184abd8be63f8d02ab47f9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 15 Jul 2008 12:36:10 +0200 Subject: [PATCH] Fix a wrong FREELIST usage in add.c The dynamic pmconflict_t must be freed with _alpm_conflict_free. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6cf865a..5bf3fcd 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -137,7 +137,8 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) if(data) { *data = lp; } else { - FREELIST(lp); + alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_conflict_free); + alpm_list_free(lp); } if(inner) { _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list\n")); -- 1.5.6.2

2 1

[pacman-dev] [PATCH] Use "pacman -S dep" in makepkg's dependency resolving
by Nagy Gabor 15 Jul '08

15 Jul '08

From 9ca3c6a3ca270d3fadceb6892a5d1dacb9896759 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 8 Jul 2008 10:57:57 +0200 Subject: [PATCH] Use "pacman -S dep" in makepkg's dependency resolving This method is equivalent with pacman's resolvedeps. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- scripts/makepkg.sh.in | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b810d60..bc1f89f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -321,11 +321,6 @@ handledeps() { [ $# -eq 0 ] && return $R_DEPS_SATISFIED local deplist="$*" - local dep depstrip striplist - for dep in $deplist; do - depstrip="$(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" - striplist="$striplist $depstrip" - done if [ "$DEP_BIN" = "0" ]; then return $R_DEPS_MISSING @@ -337,9 +332,9 @@ handledeps() { local ret=0 if [ "$ASROOT" = 0 ]; then - sudo pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$? + sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? else - pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$? + pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? fi if [ $ret -ne 0 ]; then -- 1.5.6.1

2 2