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

[pacman-dev] [PATCH] repo-remove: remove deltas file is it becomes empty
by Florian Pritz 07 Apr '12

07 Apr '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/repo-add.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 043a0b8..147da69 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -176,6 +176,11 @@ db_remove_delta() { if grep -q "$filename" $deltas; then sed -i.backup "/$filename/d" $deltas && rm -f $deltas.backup msg2 "$(gettext "Removing existing entry '%s'...")" "$filename" + # empty deltas file contains only "%DELTAS%" + if [[ $(wc -l "$deltas" | cut -d\ -f1) = 1 ]]; then + msg2 "$(gettext "Removing empty deltas file ...")" + rm $deltas + fi return 0 fi -- 1.7.9.6

3 3

[pacman-dev] [PATCH v2 1/3] pkgdelta: rework option/argument parser
by Florian Pritz 07 Apr '12

07 Apr '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/pkgdelta.sh.in | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 5a2e6a3..0986986 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -38,11 +38,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: pkgdelta [-q] <package1> <package2>\n")" + printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" printf -- "$(gettext "\ pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" + echo + printf -- "$(gettext "Options:\n")" + printf -- " -q ""$(gettext "quiet\n")" } version() { @@ -123,32 +126,38 @@ create_xdelta() return 0 } -case "$1" in - -h|--help) usage; exit 0 ;; - -V|--version) version; exit 0 ;; - -q|--quiet) QUIET=1; shift ;; -esac - -if (( $# != 2 )); then +declare -a args + +# parse arguments +while (( $# )); do + case "$1" in + -h|--help) usage; exit 0 ;; + -V|--version) version; exit 0 ;; + -q|--quiet) QUIET=1;; + --) shift; args+=("$@"); break 2 ;; + -*) echo "invalid option -- '$1'"; usage; exit 1 ;; + *) args+=("$1");; + esac + shift +done + +if (( ${#args[@]} != 2 )); then usage exit 1 fi -if [[ ! -f $1 ]]; then - error "$(gettext "File '%s' does not exist")" "$1" - exit 0 -fi - -if [[ ! -f $2 ]]; then - error "$(gettext "File '%s' does not exist")" "$2" - exit 0 -fi +for i in "${args[@]}"; do + if [[ ! -f $i ]]; then + error "$(gettext "File '%s' does not exist")" "$i" + exit 0 + fi +done if ! type xdelta3 &>/dev/null; then error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" exit 1 fi -create_xdelta "$1" "$2" +create_xdelta "${args[@]}" # vim: set ts=2 sw=2 noet: -- 1.7.9.6

2 3

[pacman-dev] [PATCH 1/2] pkgdelta: rework option/argument parser
by Florian Pritz 06 Apr '12

06 Apr '12

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/pkgdelta.sh.in | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 5a2e6a3..806ae23 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -38,11 +38,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { printf "pkgdelta (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: pkgdelta [-q] <package1> <package2>\n")" + printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" printf -- "$(gettext "\ pkgdelta will create a delta file between two packages.\n\ This delta file can then be added to a database using repo-add.\n\n")" printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" + echo + printf -- "$(gettext "Options:\n")" + printf -- " -q ""$(gettext "quiet\n")" } version() { @@ -123,32 +126,36 @@ create_xdelta() return 0 } -case "$1" in - -h|--help) usage; exit 0 ;; - -V|--version) version; exit 0 ;; - -q|--quiet) QUIET=1; shift ;; -esac +declare -a args -if (( $# != 2 )); then +# parse arguments +while (( $# )); do + case "$1" in + -h|--help) usage; exit 0 ;; + -V|--version) version; exit 0 ;; + -q|--quiet) QUIET=1;; + *) args+=("$1");; + esac + shift +done + +if (( ${#args[@]} != 2 )); then usage exit 1 fi -if [[ ! -f $1 ]]; then - error "$(gettext "File '%s' does not exist")" "$1" - exit 0 -fi - -if [[ ! -f $2 ]]; then - error "$(gettext "File '%s' does not exist")" "$2" - exit 0 -fi +for i in "${args[@]}"; do + if [[ ! -f $i ]]; then + error "$(gettext "File '%s' does not exist")" "$i" + exit 0 + fi +done if ! type xdelta3 &>/dev/null; then error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" exit 1 fi -create_xdelta "$1" "$2" +create_xdelta "${args[0]}" "${args[1]}" # vim: set ts=2 sw=2 noet: -- 1.7.9.6

2 3

[pacman-dev] distclean and *.po
by Arokux B. 04 Apr '12

04 Apr '12

Hi, I've executed `make distclean' but there are still modified *.po files. Is there a way to revert those changes other than doing `git reset --hard HEAD', i.e. make <some>clean? Thanks

2 1

[pacman-dev] [PATCH] pacman: show groups once with -Sg
by Pierre 03 Apr '12

03 Apr '12

Only displays groups that haven't appeared yet.. Previously 'pacman -Sg' iterated over syncs, printed every group. This change does not affect '-Sgg' which still orders by sync first. To reproduce, on a current Arch Linux with [extra] and [community]: $ pacman -Sg|sort|uniq -c|sort -n [...] 1 xorg-fonts 2 vim-plugins 2 xfce4-goodies Signed-off-by: Pierre <pierre(a)spotify.com> --- src/pacman/sync.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index d782a94..7d73cc4 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -418,7 +418,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j, *k, *s = NULL; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { @@ -454,10 +454,14 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) } } else { /* print grp names only, no package names */ - printf("%s\n", grp->name); + if(!alpm_list_find_str (s, grp->name)) { + s = alpm_list_add (s, grp->name); + printf("%s\n", grp->name); + } } } } + alpm_list_free(s); } return 0; -- 1.7.9.5

2 1

[pacman-dev] [PATCH 00/11] autofool cleanup
by Dave Reisner 02 Apr '12

02 Apr '12

I've been working on sorting out some crappiness in our build system, in part evidenced by an Ubuntu user attempting to compile pacman. This sort of snowballed and I took the liberty of cleaning up a few other things as well. Basically, the changes fall into a few categories: * use pkg-config for more accurate library detection * avoid touching LDFLAGS, CFLAGS, and CPPFLAGS * move files out of the repo root The last patch is none of the above, but it's good juju anyways. I definitely won't call myself an autotools guru and will point out that what I've done here is based on what I've gleaned from some other autotools-based projects. That said, I think these changes all make sense, and the Ubuntu user was certainly happy that the configure script was doing a better job of library autodetection. Dave Reisner (11): buildsys: add pkg-config m4 macros buildsys: use pkg-config for openssl detection buildsys: use pkg-config for libarchive detection buildsys: use pkg-config for libcurl detection buildsys: handle gpgme libs and cflags separately buildsys: use AC_DEFINE for CYGWIN macro buildsys: define warning CFLAGS in separate var buildsys: cleanup libtool and autoconf initialization buildsys: move acinclude.m4 to m4/ buildsys: move autotools bloat to build-aux autoclean.sh: abide by POSIX shebang autoclean.sh | 24 +-- config.guess => build-aux/config.guess | 0 config.rpath => build-aux/config.rpath | 0 config.sub => build-aux/config.sub | 0 depcomp => build-aux/depcomp | 0 install-sh => build-aux/install-sh | 0 ltmain.sh => build-aux/ltmain.sh | 0 missing => build-aux/missing | 0 mkinstalldirs => build-aux/mkinstalldirs | 0 configure.ac | 63 ++++---- lib/libalpm/Makefile.am | 19 ++- acinclude.m4 => m4/acinclude.m4 | 0 m4/libcurl.m4 | 250 ------------------------------ m4/pkg.m4 | 159 +++++++++++++++++++ src/pacman/Makefile.am | 2 +- src/util/Makefile.am | 4 +- 16 files changed, 220 insertions(+), 301 deletions(-) rename config.guess => build-aux/config.guess (100%) rename config.rpath => build-aux/config.rpath (100%) rename config.sub => build-aux/config.sub (100%) rename depcomp => build-aux/depcomp (100%) rename install-sh => build-aux/install-sh (100%) rename ltmain.sh => build-aux/ltmain.sh (100%) rename missing => build-aux/missing (100%) rename mkinstalldirs => build-aux/mkinstalldirs (100%) rename acinclude.m4 => m4/acinclude.m4 (100%) delete mode 100644 m4/libcurl.m4 create mode 100644 m4/pkg.m4 -- 1.7.9.5

1 11

[pacman-dev] Fwd: Re: Unable to compile pacman in ubuntu-11.10
by Dave Reisner 02 Apr '12

02 Apr '12

----- Forwarded message from Dave Reisner <d(a)falconindy.com> ----- > Date: Fri, 30 Mar 2012 14:44:05 -0400 > From: Dave Reisner <d(a)falconindy.com> > To: Talespin Kit <talespin_kit(a)yahoo.com> > Subject: Re: [pacman-dev] Unable to compile pacman in ubuntu-11.10 > > On Fri, Mar 30, 2012 at 05:12:11AM -0700, Talespin Kit wrote: > > Finally managed to compile in ubuntu-11.10. > > > > Seems the problem was the Makefile generated by the configure script for the > > **libalpm ** > > does not add the **libcrypto** as dependency in the LIBS variable. > > > > Below is the steps. > > > > I have used the git commit e6f72c61a098b52ea29e54b8eb4739a2ff81e6b0 in > > repo git://projects.archlinux.org/pacman.git > > > > 1) $ git clean -xfd; ./autogen.sh && ./configure --prefix=/usr --sysconfdir=/ > > etc --localstatedir=/var \ > > --enable-git-version --enable-debug --without-gpgme > > > > 2) cd lib/libalpm > > > > 3) In the Makefile replace line > > > > LIBS = -lssl -larchive -lm > > with > > LIBS = -lssl -larchive -lm -lcrypto > > 4) cd ../../ && make > > > > top-posted HTML... awesome... I've made some alterations to the build > system and dropped them in a branch in my repo: > > git clone git://code.falconindy.com/pacman.git buildsys > > If you could check out this branch and see if you have any more luck > with auto configuration, it'd be appreciated. I tested this on my 10.04 > LTS install with: > > ./autogen.sh > ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var > --enable-git-version --enable-debug > > curl and ssl were properly detected for the build. If it does succeed, > I'd like to see the output of: > > readelf -d ./lib/libalpm/.libs/libalpm.so > > Thanks, > dave > ----- End forwarded message ----- Forwarding to list because I didnt reply-all... d

2 4