- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] dload.c : drop the specific handling of file: url.
by Xavier Chantry 06 Aug '08

06 Aug '08

Before commit fc48dc31, file:/// urls forced the use of the internal downloader (libdownload), because the default XferCommand, wget, does not handle them. We tried to move away from forcing usage of libdownload, so this commit implemented the handling of file:/// urls manually. However, this implementation is way too basic. It does not handle the progress bar, thus nothing at all appears in pacman's output when a file: repo is synchronized, or when a file is downloaded from a sync repo. Also, it is not able to detect when the repo is already up-to-date. When libdownload was used, both were handled. So it seems better to just drop this implementation for now. All users who use libdownload will get the much better file:// handling back. For the users of XferCommand, it will be more problematic, but they have several options: 1) switch to a downloader handling file:// (wget doesn't, but curl does for example) 2) drop the file:// repo, and set up light http or ftp servers instead. Consider that going that way would make this repo available for the whole local network, which can be useful 3) switch back to libdownload, which works perfectly for many users Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/dload.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index b5f0b87..ef12646 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -340,21 +340,6 @@ cleanup: static int download(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew) { int ret; - const char *proto = "file://"; - int len = strlen(proto); - if(strncmp(url, proto, len) == 0) { - /* we can simply grab an absolute path from the file:// url by starting - * our path at the char following the proto (the root '/') - */ - const char *sourcefile = url + len; - const char *filename = get_filename(url); - char *destfile = get_destfile(localpath, filename); - - ret = _alpm_copyfile(sourcefile, destfile); - FREE(destfile); - /* copyfile returns 1 on failure, we want to return -1 on failure */ - return(ret ? -1 : 0); - } /* We have a few things to take into account here. * 1. If we have both internal/external available, choose based on -- 1.5.6.4

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-4-g72c5a29
by dan＠archlinux.org 06 Aug '08

06 Aug '08

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 72c5a298a3ee0f18019010ef2eb43da654ec25f8 (commit) via 4476598e4e128f4595d5383ecb51a9576a447b5b (commit) via 9bc799ec7b1718e6d90ceedd5e08672068e26e10 (commit) via 692ea72822e6cf11930fc8f85afd23c1b65f1e8e (commit) from fabf7ad6c4d9e0a45bf0957d93d810a361db7418 (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 72c5a298a3ee0f18019010ef2eb43da654ec25f8 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 4 01:16:08 2008 +0200 Avoid double slashes in URLs given to libdownload. If a Server specified in pacman.conf had a trailing slash, libalpm ended up building URLs with double slashes, and this broke libdownload with errors like the following one : error: failed retrieving file 'redland-1.0.8-1-i686.pkg.tar.gz' from 192.168.0.90 : Command okay So the public function alpm_db_set_server will make sure to remove the trailing slash of servers. For the private function _alpm_download_single_file, I only added a comment. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4476598e4e128f4595d5383ecb51a9576a447b5b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 3 20:03:05 2008 +0200 dload.c : drop the specific handling of file: url. Before commit fc48dc31, file:/// urls forced the use of the internal downloader (libdownload), because the default XferCommand, wget, does not handle them. We tried to move away from forcing usage of libdownload, so this commit implemented the handling of file:/// urls manually. However, this implementation is way too basic. It does not handle the progress bar, thus nothing at all appears in pacman's output when a file: repo is synchronized, or when a file is downloaded from a sync repo. Also, it is not able to detect when the repo is already up-to-date. When libdownload was used, both were handled. It seems better to just drop this implementation for now. All users who use libdownload will get the much better file:// handling back. For the users of XferCommand, it will be more problematic, but they have several options: 1) Switch to a downloader handling file:// (wget doesn't, but curl does for example). 2) Drop the file:// repo, and set up light http or ftp servers instead. Consider that going that way would make this repo available for the whole local network, which can be useful. 3) Switch back to libdownload, which works perfectly for many users. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9bc799ec7b1718e6d90ceedd5e08672068e26e10 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Aug 1 08:29:46 2008 +0200 makepkg: fix download functions with weird urls. This fixes FS#11076. 1) quote the url in get_downloadclient 2) only enable nullglob where it is needed You can see in 7fc306cd41 that nullglob was only enabled for one part, and that it already caused other problems, which were fixed in 7ff5a917fd0. Thanks to Henning Garus for pointing out that nullglob was problematic with urls containing expansion char like '?'. 3) change get_downloadcmd which displayed the download command line to download_file which actually executes the download. It seems nicer that way. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 692ea72822e6cf11930fc8f85afd23c1b65f1e8e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 30 21:53:02 2008 -0500 makepkg: Clarify usage instructions for --allsource/--source Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 14 +++++++++++--- lib/libalpm/db.c | 16 +++++++++++++--- lib/libalpm/dload.c | 16 +--------------- scripts/makepkg.sh.in | 29 ++++++++++++++++------------- 4 files changed, 41 insertions(+), 34 deletions(-) hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [PATCH] Attempt to idiot-proof making and refreshing docs
by Dan McGee 06 Aug '08

06 Aug '08

I mess this up more often than not, and maybe this will do the trick. Remove the --enable-asciidoc option as it has been superseded by the --disable-doc option in usefulness. If you want to skip building docs, you skip building all docs which is much easier when it comes to ensuring the make 'dist' and 'distcheck' targets will always build the manpages and always build the most up to date manpages. Developers shouldn't be affected in their normal builds, nor should end users of the source tarball. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Makefile.am | 3 +++ configure.ac | 23 ----------------------- doc/Makefile.am | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index ea3b0e0..ed9a34d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,9 @@ if WANT_DOC SUBDIRS += doc endif +# Make sure we test and build manpages when doing distcheck +DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version + # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README EXTRA_DIST = HACKING diff --git a/configure.ac b/configure.ac index 9f4209b..9c5ed23 100644 --- a/configure.ac +++ b/configure.ac @@ -103,11 +103,6 @@ AC_ARG_ENABLE(doxygen, AS_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]), [wantdoxygen=$enableval], [wantdoxygen=no]) -# Help line for asciidoc -AC_ARG_ENABLE(asciidoc, - AS_HELP_STRING([--enable-asciidoc], [build your own manpages with Asciidoc]), - [wantasciidoc=$enableval], [wantasciidoc=no]) - # Help line for debug AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [enable debugging support]), @@ -267,23 +262,6 @@ else fi AM_CONDITIONAL(USE_DOXYGEN, test "x$usedoxygen" = "xyes") -# Check for asciidoc support and status -AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) -AC_MSG_CHECKING([for asciidoc]) -if test "x$wantasciidoc" = "xyes" ; then - if test $ASCIIDOC ; then - AC_MSG_RESULT([yes]) - useasciidoc=yes - else - AC_MSG_RESULT([no, asciidoc missing]) - useasciidoc=no - fi -else - AC_MSG_RESULT([no, disabled by configure]) - useasciidoc=no -fi -AM_CONDITIONAL(USE_ASCIIDOC, test "x$useasciidoc" = "xyes") - # Enable or disable debug code AC_MSG_CHECKING(for debug mode request) if test "x$debug" = "xyes" ; then @@ -381,7 +359,6 @@ ${PACKAGE_NAME}: Run make in doc/ dir : ${wantdoc} Use download library : ${internaldownload} Doxygen support : ${usedoxygen} - Asciidoc support : ${useasciidoc} debug support : ${debug} " diff --git a/doc/Makefile.am b/doc/Makefile.am index 476a21c..cce0a71 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,6 +15,7 @@ ASCIIDOC_MANS = \ DOXYGEN_MANS = $(wildcard man3/*.3) EXTRA_DIST = \ + asciidoc.conf \ pacman.8.txt \ makepkg.8.txt \ repo-add.8.txt \ @@ -29,8 +30,12 @@ EXTRA_DIST = \ $(DOXYGEN_MANS) # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = *.xml -MAINTAINERCLEANFILES = $(ASCIIDOC_MANS) +MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) + +# Ensure manpages are fresh when building a dist tarball +dist-hook: + $(MAKE) $(AM_MAKEFLAGS) clean + $(MAKE) $(AM_MAKEFLAGS) all if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty @@ -39,20 +44,18 @@ else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) endif - man_MANS = dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8 if USE_DOXYGEN man_MANS += $(DOXYGEN_MANS) -all: doxygen.in +all-local: doxygen.in doxygen.in: $(DOXYGEN) $(srcdir)/Doxyfile endif -if USE_ASCIIDOC ASCIIDOC_OPTS = \ -f asciidoc.conf \ -a pacman_version="$(REAL_PACKAGE_VERSION)" \ @@ -64,11 +67,10 @@ A2X_OPTS = \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ --xsltproc-opts='-param man.endnotes.are.numbered 0' -$(ASCIIDOC_MANS): - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt - # These rules are due to the includes and files of the asciidoc text $(ASCIIDOC_MANS): asciidoc.conf footer.txt + a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt + pacman.8: pacman.8.txt makepkg.8: makepkg.8.txt repo-add.8: repo-add.8.txt @@ -78,7 +80,7 @@ pacman.conf.5: pacman.conf.5.txt libalpm.3: libalpm.3.txt # this one is just a symlink repo-remove.8: repo-add.8 - ln -s repo-add.8 repo-remove.8 -endif + rm -f repo-remove.8 + $(LN_S) repo-add.8 repo-remove.8 # vim:set ts=2 sw=2 noet: -- 1.5.6.4

1 0

[pacman-dev] [PATCH] pactest: remove need for pause when running tests
by Dan McGee 04 Aug '08

04 Aug '08

Instead of pausing 1.5 seconds on tests that check file mtimes, change the mtimes to something in the far past so we can immediately tell if a file was modified and/or touched. This saves a decent amount of time on the upgrade tests which often check mtimes. 355 was a completely arbitrary time value, don't ask me why I picked it. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- pactest/pmenv.py | 8 +++++--- pactest/pmfile.py | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pactest/pmenv.py b/pactest/pmenv.py index e9d0b4c..cc433dd 100755 --- a/pactest/pmenv.py +++ b/pactest/pmenv.py @@ -71,9 +71,11 @@ class pmenv: t.generate() # Hack for mtimes consistency for i in t.rules: - if i.rule.find("MODIFIED") != -1: - time.sleep(1.5) - break + if i.rule.find("FILE_MODIFIED") != -1: + [test, arg] = i.rule.split("=") + for f in t.files: + if f.name == arg: + f.resettimes() t.run(self.pacman) diff --git a/pactest/pmfile.py b/pactest/pmfile.py index 21baf01..ab4aa2c 100755 --- a/pactest/pmfile.py +++ b/pactest/pmfile.py @@ -56,6 +56,14 @@ class pmfile: return retval + def resettimes(self): + """ + """ + + filename = os.path.join(self.root, self.name) + os.utime(filename, (355, 355)) + self.mtime = getmtime(filename) + vprint("\tmtime reset (%s)" % self.name) if __name__ == "__main__": f = pmfile("/tmp", "foobar") -- 1.5.6.3

3 5

[pacman-dev] [PATCH] Change download functions to handle funny urls
by Henning Garus 01 Aug '08

01 Aug '08

Stop urls containing & or ? from breaking get_downloadclient() and get_downloadcmd(). Fixes FS#11076 Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- scripts/makepkg.sh.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 041b460..38364a6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -256,7 +256,7 @@ in_array() { get_downloadclient() { # $1 = url with valid protocol prefix local url=$1 - local proto=$(echo $netfile | sed 's|://.*||') + local proto=$(echo "$url" | sed 's|://.*||') # loop through DOWNLOAD_AGENTS variable looking for protocol local i @@ -293,7 +293,8 @@ get_downloadcmd() { local file=$3 if echo "$dlagent" | grep -q "%u" ; then - local dlcmd=$(echo "$dlagent" | sed "s|%o|$file.part|" | sed "s|%u|$netfile|") + #use awk because of possible & in $netfile (FS#11076) + local dlcmd=$(echo "$dlagent" | sed "s|%o|$file.part|" | awk -F "%u" -v nf="$netfile" '{ print $1 nf $2}') else local dlcmd="$dlagent $netfile" fi @@ -443,7 +444,10 @@ download_sources() { msg2 "$(gettext "Downloading %s...")" "$file" # fix flyspray bug #3289 local ret=0 + #disable expansion of possible ? in $netfile (FS#11076) + set -f $(get_downloadcmd "$dlclient" "$netfile" "$file") || ret=$? + set +f if [ $ret -gt 0 ]; then error "$(gettext "Failure while downloading %s")" "$file" plain "$(gettext "Aborting...")" -- 1.5.6.4

2 1

[pacman-dev] Fwd: makepkg download fails with special chars in URL (was: [signoff] pacman 3.2.0)
by Xavier 01 Aug '08

01 Aug '08

Forwarding this to the ML now that repoman is back. ---------- Forwarded message ---------- From: Xavier <shiningxc(a)gmail.com> Date: Fri, Aug 1, 2008 at 8:48 AM Subject: Re: [pacman-dev] makepkg download fails with special chars in URL (was: [signoff] pacman 3.2.0) To: Discussion list for pacman development <pacman-dev(a)archlinux.org> On Thu, Jul 31, 2008 at 10:29 PM, Henning Garus <henning.garus(a)googlemail.com> wrote: > > I think I found the reason for this, it's not the ampersands, it's the > question mark. It looks like bash tries to do filename expansion on the > url, this worked in the old version because no file was found and thus > the url not replaced. But in the new version nullglob is set, so the > url is removed. > > There are several ways to fix this behaviour: > > 1. Disable nullglob and reenable afterwards > > 2. Enable nullglob only when it is really needed > > 3. Disable filename expansion and reenable afterwards > > I think 1. is a bit weird and I don't know the code good enough to say > something about 2., so I lean heavily to 3. . > > You are my hero! You figured out everything, thanks for the explanation and all the possible solutions. I agree 1 is a bit weird and I would prefer 2 and 3. Since I looked at the history of nullglob in makepkg : http://projects.archlinux.org/?p=pacman.git&a=search&h=HEAD&st=commit&s=nul… I would like to with 2 for the two following reasons : * nullglob was only enabled for one specific part of the code (see first commit) * it already caused other problems (see second commit) >> > 2) escape ampersands in netfile in get_downloadcmd() >> > local netfile=$(echo "$2" | sed "s|\&|\\\&|g") >> > >> >> I wanted to try using bash substitution instead of sed for replacing >> %u and %o dlcmd=${dlagent//%o/$file.part} >> dlcmd=${dlcmd//%u/$netfile} >> >> But then, netfile still needs to be quoted, so >> dlcmd=${dlagent//%o/$file.part} >> dlcmd=${dlcmd//%u/\"$netfile\"} >> >> And just doing this breaks the whole vim syntax highlighting, which is >> very very annoying. > > >From my point of view this would be a good reason to stick with > escaping. I thought about some other way to do this without sed, but I > couldn't come up with anything useful :( . > Actually, I didn't need this quoting at all. The real problem was nullglob, thanks again for that.

1 0

[pacman-dev] makepkg download fails with special chars in URL (was: [signoff] pacman 3.2.0)
by Dan McGee 31 Jul '08

31 Jul '08

On Thu, Jul 31, 2008 at 8:15 AM, Xavier <shiningxc(a)gmail.com> wrote: > On Thu, Jul 31, 2008 at 2:50 PM, Allan McRae <allan(a)archlinux.org> wrote: >>> >>> Indeed, that is the first problem, netfile should be quoted here. >>> local proto=$(echo "$netfile" | sed 's|://.*||') >>> >>> >> >> And that $netfile should be $url.... >> > > Yeah, apparently. > >>> But once this is fixed, we run into a second problem, with another sed >>> command, which breaks because of all the & in the url. >>> local dlcmd=$(echo "$dlagent" | sed "s|%o|$file.part|" | sed "s|%u|$netfile|" >>> >>> $ netfile="ab&cd&ef"; echo "%u" | sed "s|%u|$netfile|" >>> ab%ucd%uef >>> >>> $ netfile="ab\&cd\&ef"; echo "%u" | sed "s|%u|$netfile|" >>> ab&cd&ef >>> >>> So I don't see how to fix this except manually escaping all & in the url... >>> >> >> Well, to just make the bug more obscure. >> >> $ netfile="ab&cd&ef"; echo "%u" | sed "s|%u|$netfile|" | sed "s|\%u|\&|g" >> ab&cd&ef >> >> But that makes problems if there is a %u in the url. But can we do some >> multistage hackery like that? >> > > I really don't like this. > > I think we could use bash feature instead. > echo ${netfile//foo/bar} > But even after converting the two above sed rules with this, I still > have other problem. It is driving me crazy. > When I print the whole download command myself, and copy/paste it to > the shell, it works fine. > But when it gets executed in makepkg with : $(get_downloadcmd foo > bar), it always fail. Subject change...and can someone open a bug and get this information in there, please? I'd rather track it there before 10 other people complain too. -Dan

4 5

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.2.0, created. v3.2.0
by Dan McGee 31 Jul '08

31 Jul '08

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 annotated tag, v3.2.0 has been created at a7f9eb8b8b3108c644bebfbe4ef8dcbc5bc464d9 (tag) tagging fabf7ad6c4d9e0a45bf0957d93d810a361db7418 (commit) replaces v3.1.4 tagged by Dan McGee on Wed Jul 30 20:23:29 2008 -0500 - Log ----------------------------------------------------------------- The craved for 3.2.0 release. Woo! -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkiRFBsACgkQXC5GoPU6du3iIgCgpdCjzZXoe+cz3hYw56iYzPJo fq0An2jyn4gxvmkuZ+EoYrdLj9YUo7nt =s9Ij -----END PGP SIGNATURE----- Aaron Griffin (1): Store replaces in the local DB too Allan McRae (17): Quote filenames in find expression in pacdiff Make all error messages use pm_fprintf No error in makepkg when removing deps fails Pactest for removing multiple items in a dependency chain. makepkg - add check for valid options in PKGBUILD Pactests for sync operations with NoUpgrade and NoExtract Tidy up of the handle struct in libalpm bacman - regenerate package from system makepkg: add --allsource option Move geninteg block in makepkg before error checking Additional path quoting and srcdir/pkgdir usage Remove symlinks to libtool files Use LC_ALL=C everywhere Strip *.a libraries in makepkg Make strip paths configurable makepkg: add packages to pkgdeps list only after successful install Update NEWS file for 3.2.0 release Alper KANAT (2): Add pacman Türkçe (Turkish) translation Add libalpm Türkçe (Turkish) translation Anton Fiuman (1): Don't require --force when using the --nobuild option Carlo Bersani (2): bacman: fix issue with symlink early copy contrib: add pactree script Chantry Xavier (31): libalpm/sync.c: don't duplicate packages for the sync->data field. Move the deptest code from frontend to backend. small memleak fix in sync.c. Add new public alpm_checkdbconflicts function. testdb : add conflicts checking. libalpm/cache.c : don't duplicate packages in pkgcache. libalpm/sync.c : conflicts resolving cleanup. remove --force option from repo-add. Move -Sy operation into its own transaction Improve yesno function. clean up dltotal leftover from 81a2a06818d367f852. libalpm/dload.c : memleak fixes. libalpm: clean up of md5sum functions. Refactoring of the download code. Add zipman makepkg option. Drop case insensitive comparisons in the config parsing. Kill some obsolete references to -A option. Kill PM_TRANS_TYPE_ADD. Kill the dependsonly option. Add new CleanMethod option. pactest: Add quotes for directory with whitespaces pactest : Use tarfile module. Refactor the trans init and release code. Completely rework delta algorithm Get rid of the delta patches list libalpm/sync.c : memleak fixes. get_filename : use the FILENAME db field only. Doxyfile : enable JAVADOC_AUTOBRIEF. contrib/paclist: list packages installed from given repo. Cleanup usages of alpm_list_find and alpm_list_remove. Add SyncFirst option. Daenyth Blank (1): makepkg: fix strip section to allow spaces in paths Dan McGee (138): Use dynamic string allocation in package structures Add functions to manipulate pmdepend_t objects Merge branch 'maint' memleak fix with new dynamic depend structure Merge branch 'maint' Merge branch 'maint' Merge branch 'maint' Convert deltas to dynamic allocation Merge branch 'maint' Fix memleak found by add004.py conflict.c: move debug message out of inner loop pactest: remove check for root permissions message Fix flip-flopped parameters to CALLOC macro Merge branch 'maint' Update libtool version (1.5.24 -> 1.5.26) Merge branch 'maint' Remove gensync and updatesync from normal distribution Remove gettext calls from gensync/updatesync Remove "Installed Size" hackeration Merge branch 'maint' Merge branch 'maint' Update Doxyfile with some new options in new version Merge branch 'maint' Move pmgraph_t struct and functions to their own header file Merge branch 'maint' Remove all unnecessary snprintf usage Merge branch 'maint' More cleanup to alpm_list Move download code out of server.c Add new stub download functions for use throughout the code Remove pmserver_t abstraction Merge branch 'maint' Start removing some junk from the function template Merge branch 'maint' Move -A pactests that are relevant to -U, clean the rest out Remove the Add option from the command line Remove frontend add code that is no longer necessary Remove useless TESTS file Merge branch 'maint' Merge branch 'maint' Update database mtime after it has been extracted Add -q (quiet) option to valgrind call in pactest Switch pmgrp_t to dynamic allocation, general group cleanup memleak fix: ensure we free result of get_destfile() Merge branch 'maint' Make db->treename a pointer Add an archive_fgets() function Read .PKGINFO directly from package file doc/pacman.8: fix manpage typo Merge branch 'maint' Fix segfault on -Qs usage Enable display of multiple groups in -Ss and -Qs output Update -Ss and -Qs pactests to include groups Merge branch 'maint' Add quiet printout to --owns functionality Remove libdownload reference from pacman frontend libalpm error cleanup, step 1 Remove unnecessary header file, move one macro to util.c Remove a bit more download.h pollution Allow disabling of internal (libdownload) code Add *.exe ignores for certain other platforms Add check for swprintf() and a workaround when it is missing Merge branch 'maint' Update configure.ac to current code Correctly use the fd returned my mkstemp() Remove unnecessary import in dload.h Merge branch 'maint' Memory allocation and other small cleanups Fix compilation errors on x86_64 Fix gettext on non-Linux platforms More non-Linux build updates, mostly Darwin Slight changes to fix warnings from autoconf 2.62 Merge branch 'maint' Remove unnecessary NULL check in FREE() macro Give libalpm native support for both libdownload and libfetch Merge branch 'maint' Rework delta struct and modify code accordingly Fix some fallout from the delta/download changes Remove unnecessary archive_entry_set_pathname() calls Update pactest to allow setting modes on created files Rework extract_single_file() temp file creation Updates to _alpm_copyfile() Merge branch 'maint' pacman-side code cleanups be_files.c: PATH_MAX cleanup Update md5 routines Use strdup() instead of a static buffer makepkg: Unify start and end messages scripts: add -q/--quiet option to repo-add and repo-remove Update makepath to remove PATH_MAX usage pacsearch: rewrite in perl pactest: fix --gdb option Remove some useless abstraction and start db cleanup Refactor pkg_load/parse_descfile into a new backend file Merge branch 'maint' Remove errant include of error.h Remove an outdated exception check in file conflict code Remove --builddeps from makepkg Remove lazy init code from pkg name and version functions Simplify _alpm_pkg_new() Update _alpm_versioncmp Remove wrapper call around versioncmp Fix compilation warning on x86_64 Merge branch 'maint' Add missing NULL set in group printing Add simple vercmp test script Fix versioncmp regression after update Allow GIT version to be used in pacman builds makepkg: remove some dead TODO code libalpm/md5: Fix license header Use correct C type for file sizes Reimplement TotalDownload functionality Reformat -Sg output to look like -Qg Various updates needed prior to a new release makepkg: remove deprecated --usesudo code Allow use of GIT_VERSION in documentation dir Use shell builtin to list files for package inclusion Merge branch 'maint' repo-*: allow use of readlink or realpath Combine repo-add and repo-remove into one script Document pacman -q/--quiet operation Expand PKGBUILD documentation Use access() instead of stat() when possible autoclean.sh: Fix paths to po/ dir makepkg.conf: make keeping docs the default Merge branch 'maint' Add information on version comparison to manpages Merge branch 'maint' Remove pacman.static build from build files makepkg: speed up svn revision check for large repositories Fix vercmp and add additional tests pacsearch: quote args passed to pacman Remove unused strverscmp substitute pactest: add test.expectfailure option for tests pactest: exit with a non-zero error code on unexpected failure vercmptest: fix binary existence check Further updates to submitting-patches Version bumps to configure for 3.2.0 release Geoffroy Carrier (1): Add trailing / to DESTDIR for stupid Makefiles. Giovanni Scafora (2): Update Italian translation Small fix to Italian translation Hugo Doria (1): Update Portuguese (Brazil) translation Jeff Bailes (1): Update British English translation Juan Pablo González Tognarelli (2): Spanish translation updates Update Spanish translation K. Piche (3): add.c: added some tracing and improved some variable locality Some comments for _alpm_unpack. remove.c: refactor into functions Mateusz Herych (1): Update Polish translation Matthias Gorissen (1): Update German translation Nagy Gabor (46): New reason001.py pactest New --asexplicit option small sync.c code clean-up New _alpm_conflict_dup function Fix PM_ERR_CONFLICTING_DEPS handling in sync.c pmsyncpkg_t cleanup New remove option : -u / --unneeded (FS#6505). libalpm/package.c : add _alpm_pkgname_pkg_cmp function. alpm_sync_sysupgrade split Remove alpm_sync_get_newversion function alpm_list.c clean-up New alpm_version function Remove trans->targets Add -Rss option Avoid duplicated target names. Kill compute_requiredby usage in can_remove_package() Swap the parameters of alpm_pkg_find Fix for remove052.py by moving recursedeps before checkdeps. Add some verbosity to _alpm_db_read. Use $PKGEXT (from /etc/makepkg.conf) in bacman Don't duplicate packages in requiredby list New _alpm_dep_edge function New _alpm_find_dep_satisfier function Swap parameters on PM_TRANS_CONV_INSTALL_IGNOREPKG callback function Resolvedeps rework Remove requiredby from pactests Fix a bogus message in Hungarian translation New remove060.py pactest remove_addtarget rework (in front-end) sync_addtarget rework Fix a wrong FREELIST usage in add.c Fix some memleaks in alpm/add.c Use "pacman -S $dep" in makepkg's dependency resolving _alpm_db_add_pkgincache rework Fix a possible segfault in alpm/remove.c alpm_list_remove treat NULL needle as "nothing" Use NULL instead of "" as no causingpkg Rephrase some debug messages in alpm/sync.c Update Hungarian translation New fileconflict004.py pactest Re-enable --debug with -Sw and -Sp Update pactest README -Sqg and -Qqg New fileconflict005.py pactest Remove UseColor from front-end Put CleanMethod to pacman.conf (commented out) Robson Roberto Souza Peixoto (1): Small fix to pt_BR translation. Roman Kyrylych (1): makepkg: Support for resuming source downloads Samed Beyribey (1): Update Turkish translation Sebastian Nowicki (7): Add documentation for transaction events Add detailed description to alpm_pkg_load Replace usage of "cp -s" with the more portable "ln -s" Allow an unprivileged user to create packages without fakeroot Use "legacy mode" on Mac OSX (for file command) Use chown 0:0 instead of root.root Use openssl for checksum verification instead of *sum utilities Sergey Tereschenko (1): Update Russian translation Thomas Bächler (1): Minor fix to German translation Vojtěch Gondžala (1): Update Czech translation Xavier Chantry (26): Fix rewinddir regression by cleaning up db_scan pactest: only use fakeroot when it is found. Disable geteuid in cygwin. du -b is not available on BSD, use du -k instead. be_files : stores REPLACES and FORCE in desc. Remove PM_TRANS_EVT_EXTRACT_START. Get rid of double / in database paths. src/pacman/sync.c : cleanup of pacman_sync Don't display filename on -Qip operation. fr.po : fix one minor alignment problem. makepkg: Add missing quotes for the source array. makepkg: add several quotes needed after nullglob. repo-add cleanup. src/pacman/sync.c : Display only errors with -Sp and -Sw operations. Update pot files. Update French translation libalpm/package.c : fix infolevel bug in pkg_dup src/pacman : rework the display_targets function. Show number of packages to be installed / removed. Implement AND based package searching. makepkg : use /etc/profile makepkg: Fix STRIP_DIRS test. Update submitting-patches file. Update README file. Final update of all translations. NEWS: updates from ML 甘露(Lu.Gan) (2): Update of Chinese simplified pacman translation. Update Chinese Simplified translation ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

5 4

[pacman-dev] [PATCH] Add linebreak parameter to list_display
by Nagy Gabor 31 Jul '08

31 Jul '08

From e63ea25813e65cbb6ad1f925d71720527cf7ea19 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 31 Jul 2008 15:58:25 +0200 Subject: [PATCH] Add linebreak parameter to list_display If linebreak is not set, list_display is identical to the old one: Targets: foo bar baz If linebreak is set, list_display put every list member to its own line: Optdepends: foo bar baz Since optdepends are expected in "foo: feature" format, Optdepends are listed with linebreak set. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/package.c | 16 ++++++------ src/pacman/pacman.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 4 +- src/pacman/util.c | 61 +++++++++++++++++++++++++++++++------------------ src/pacman/util.h | 2 +- 6 files changed, 51 insertions(+), 36 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 87ffd98..17887e7 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -91,18 +91,18 @@ void dump_pkg_full(pmpkg_t *pkg, int level) string_display(_("Name :"), alpm_pkg_get_name(pkg)); string_display(_("Version :"), alpm_pkg_get_version(pkg)); string_display(_("URL :"), alpm_pkg_get_url(pkg)); - list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg)); - list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); - list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); - list_display(_("Depends On :"), depstrings); - list_display(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg)); + list_display(_("Licenses :"), alpm_pkg_get_licenses(pkg), 0); + list_display(_("Groups :"), alpm_pkg_get_groups(pkg), 0); + list_display(_("Provides :"), alpm_pkg_get_provides(pkg), 0); + list_display(_("Depends On :"), depstrings, 0); + list_display(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg), 1); /* Only applicable if installed */ if(level > 0) { - list_display(_("Required By :"), requiredby); + list_display(_("Required By :"), requiredby, 0); FREELIST(requiredby); } - list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); - list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); + list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), 0); + list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg), 0); if(level < 0) { printf(_("Download Size : %6.2f K\n"), (float)alpm_pkg_get_size(pkg) / 1024.0); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 445365e..8b8698b 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -872,7 +872,7 @@ int main(int argc, char *argv[]) printf("\n"); printf("Lock File : %s\n", alpm_option_get_lockfile()); printf("Log File : %s\n", alpm_option_get_logfile()); - list_display("Targets :", pm_targets); + list_display("Targets :", pm_targets, 0); } /* Opening local database */ diff --git a/src/pacman/remove.c b/src/pacman/remove.c index f091fa4..f56ac2e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -74,7 +74,7 @@ int pacman_remove(alpm_list_t *targets) pkgnames = alpm_list_add(pkgnames, (void *)alpm_pkg_get_name(pkg)); } printf(_(":: group %s:\n"), targ); - list_display(" ", pkgnames); + list_display(" ", pkgnames, 0); int all = yesno(1, _(" Remove whole content?")); for(p = pkgnames; p; p = alpm_list_next(p)) { char *pkgn = alpm_list_getdata(p); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 8d0c529..ae3f523 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -603,7 +603,7 @@ static int sync_trans(alpm_list_t *targets) pkgnames = alpm_list_add(pkgnames, (char*)alpm_pkg_get_name(k->data)); } - list_display(" ", pkgnames); + list_display(" ", pkgnames, 0); if(yesno(1, _(":: Install whole content?"))) { for(k = pkgnames; k; k = alpm_list_next(k)) { targets = alpm_list_add(targets, strdup(alpm_list_getdata(k))); @@ -816,7 +816,7 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *packages = syncfirst(); if(packages) { printf(_(":: The following packages should be upgraded first :\n")); - list_display(" ", packages); + list_display(" ", packages, 0); if(yesno(1, _(":: Do you want to cancel the current operation\n" ":: and upgrade these packages now?"))) { FREELIST(targs); diff --git a/src/pacman/util.c b/src/pacman/util.c index ff5429e..17aaa1f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -442,7 +442,7 @@ void string_display(const char *title, const char *string) printf("\n"); } -void list_display(const char *title, const alpm_list_t *list) +void list_display(const char *title, const alpm_list_t *list, int linebreak) { const alpm_list_t *i; int cols, len; @@ -453,7 +453,7 @@ void list_display(const char *title, const alpm_list_t *list) len = strlen(title) + 1; wcstr = calloc(len, sizeof(wchar_t)); len = mbstowcs(wcstr, title, len); - len = wcswidth(wcstr, len); + len = wcswidth(wcstr, len) + 1; free(wcstr); printf("%s ", title); } else { @@ -461,29 +461,44 @@ void list_display(const char *title, const alpm_list_t *list) } if(list) { - for(i = list, cols = len; i; i = alpm_list_next(i)) { - char *str = alpm_list_getdata(i); - /* s goes from # bytes -> # chars -> # cols */ - int s = strlen(str) + 1; - wcstr = calloc(s, sizeof(wchar_t)); - s = mbstowcs(wcstr, str, s); - s = wcswidth(wcstr, s); - free(wcstr); - /* two additional spaces are added to the length */ - s += 2; - int maxcols = getcols(); - if(s + cols >= maxcols) { - int i; - cols = len; - printf("\n"); - for (i = 0; i <= len; ++i) { + if(linebreak) { + /* Print the first element */ + indentprint((const char *) alpm_list_getdata(list), len); + printf("\n"); + /* Print the rest */ + for(i = alpm_list_next(list); i; i = alpm_list_next(i)) { + int j; + for(j = 1; j <= len; j++) { printf(" "); } + indentprint((const char *) alpm_list_getdata(i), len); + printf("\n"); + } + } else { + for(i = list, cols = len; i; i = alpm_list_next(i)) { + char *str = alpm_list_getdata(i); + /* s goes from # bytes -> # chars -> # cols */ + int s = strlen(str) + 1; + wcstr = calloc(s, sizeof(wchar_t)); + s = mbstowcs(wcstr, str, s); + s = wcswidth(wcstr, s); + free(wcstr); + /* two additional spaces are added to the length */ + s += 2; + int maxcols = getcols(); + if(s + cols > maxcols) { + int j; + cols = len; + printf("\n"); + for (j = 1; j <= len; j++) { + printf(" "); + } + } + printf("%s ", str); + cols += s; } - printf("%s ", str); - cols += s; + printf("\n"); } - printf("\n"); } else { printf(_("None\n")); } @@ -529,7 +544,7 @@ void display_targets(const alpm_list_t *pkgs, int install) if(install) { asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); - list_display(str, targets); + list_display(str, targets, 0); free(str); printf("\n"); @@ -537,7 +552,7 @@ void display_targets(const alpm_list_t *pkgs, int install) printf(_("Total Installed Size: %.2f MB\n"), mbisize); } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); - list_display(str, targets); + list_display(str, targets, 0); free(str); printf("\n"); diff --git a/src/pacman/util.h b/src/pacman/util.h index 2ddc1b5..0a1ac2c 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -50,7 +50,7 @@ char *strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); alpm_list_t *strsplit(const char *str, const char splitchar); void string_display(const char *title, const char *string); -void list_display(const char *title, const alpm_list_t *list); +void list_display(const char *title, const alpm_list_t *list, int linebreak); void display_targets(const alpm_list_t *pkgs, int install); void display_synctargets(const alpm_list_t *syncpkgs); int yesno(short preset, char *fmt, ...); -- 1.5.6.4

1 0

[pacman-dev] [PATCH] Move the the description parsing logic to string_display()
by Nagy Gabor 31 Jul '08

31 Jul '08

From 0c25a17fb3ecabe397e9acb6bc7818395ed17756 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 31 Jul 2008 13:38:30 +0200 Subject: [PATCH] Move the the description parsing logic to string_display() So dump_pkg_full will indent all strings correctly. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/package.c | 18 ++---------------- src/pacman/util.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 0680037..87ffd98 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -44,13 +44,11 @@ */ void dump_pkg_full(pmpkg_t *pkg, int level) { - const char *reason, *descheader; + const char *reason; time_t bdate, idate; char bdatestr[50] = "", idatestr[50] = ""; const alpm_list_t *i; alpm_list_t *requiredby = NULL, *depstrings = NULL; - wchar_t *wcstr; - int len; if(pkg == NULL) { return; @@ -132,19 +130,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) if(level < 0) { string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg)); } - - /* printed using a variable to make i18n safe */ - descheader = _("Description : "); - /* len goes from # bytes -> # chars -> # cols */ - len = strlen(descheader) + 1; - wcstr = calloc(len, sizeof(wchar_t)); - len = mbstowcs(wcstr, descheader, len); - len = wcswidth(wcstr, len); - free(wcstr); - /* we can finally print the darn thing */ - printf("%s", descheader); - indentprint(alpm_pkg_get_desc(pkg), len); - printf("\n\n"); + string_display(_("Description :"), alpm_pkg_get_desc(pkg)); /* Print additional package info if info flag passed more than once */ if(level > 1) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 82c460b..c7cdb78 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -425,12 +425,21 @@ alpm_list_t *strsplit(const char *str, const char splitchar) void string_display(const char *title, const char *string) { + wchar_t *wcstr; + int len; + /* compute the length of title */ + len = strlen(title) + 1; + wcstr = calloc(len, sizeof(wchar_t)); + len = mbstowcs(wcstr, title, len); + len = wcswidth(wcstr, len); + free(wcstr); printf("%s ", title); if(string == NULL || string[0] == '\0') { - printf(_("None\n")); + printf(_("None")); } else { - printf("%s\n", string); + indentprint(string, len + 1); } + putchar('\n'); } void list_display(const char *title, const alpm_list_t *list) -- 1.5.6.4

1 1