- Pacman-dev - lists.archlinux.org

[pacman-dev] Multiple/Shared Architectures
by Teran McKinney 29 Sep '08

29 Sep '08

Hey, I've planned out a set of changes I want to try with Pacman and Makepkg. Most deal with creating a source repository setup that would store source files as their sha512sums, but that isn't related to this. Another thing that I want to do is have a "shared" repository for non-architecture specific packages. I would rather not use different repositories for the "shared" architecture, ie: core-shared, extra-shared. Here is my current mirror layout: icadyptes/i486/{core,extra} The shared architecture could be at: icadyptes/shared/{core,extra} I'm sure that this conflitcts with a few things inside libalpm, but here is my proposed implmentation: pacman.conf: SupportedArchs = i486 shared (Could have i686 too, or anything making this useful for other tasks) mirrorlist: Server = ftp://icadyptes.go-beyond.org/icadyptes/$arch/$repo A shared repository would save disk space on mirrors, as well as bandwidth (to a lesser extent). The makepkg implementation for this could simply be setting $arch to shared. Distributions using Pacman would need to change other things for this to work properly, but in my opinion, it is a clean change that could be very useful. Packages could be queried for just like they are if it is not immediately found in the first repository, checking until it finds an architecture with the package's name. This could serve other purposes, too. With additional hacking (and possibly pacman.conf options), doc files could be split into seperate packages (and hence a different repo), and be given the "doc" architecture. Users would add "doc" to SupportedArchs (I'm sure this could have a better name), and when they download a new package the doc files would come in a seperate package with it. SupportedArchs would also be ordered by preference, so perhaps it could be pentium4, i686, i486, shared, so that packages (on an incomplete build) more optimised for a certain architectures would be prefered over their lesser-optimum counter parts (sure that this induces a few potential problems though). Now that I think about it, there could even be a $distribution setting for people wanting to pull packages from multiple distributions :-P. You guys have already put a ton of work into Pacman, and made it one awesome package manager. Not sure if this idea interests you or not, but it is something I'd really love to have in my Arch fork. I'm willing to code this in myself, but I'd need to learn more C first, and am sure that any of you could do it in much less time. Let me know what you think of it, and if you have any suggestions or ideas. Thanks, Teran (sega01) PS: I think that the stock makepkg should default to arch=(any) if $arch is not set. I do this in Icadyptes, and it is a very safe (to my knowledge) and easy hack. Has there been any discussion or patches regarding PGP signed database files?

3 3

[pacman-dev] Add rsync vcs support to makepkg
by Mark Constable 29 Sep '08

29 Sep '08

Plus a couple of other minor points. Qt daily snapshots are only available via rsync (and tarballs) so I added _rsyncroot and _rsyncmod awareness to makepkg. elif [ ! -z ${_rsyncroot} ] && [ ! -z ${_rsyncmod} ] ; then [ $(type -p rsync) ] || return 0 msg "$(gettext "Determining latest rsync revision...")" newpkgver=$(date -u +%Y%m%d%H) The date format is per hour so multiple updates per day are possible and the -u is UTC so the the timestamp is universal worldwide. Whilst submitting a patch I thought I'd throw in this option for consideration which is to use the pkgrel variable as the VCS version field rather than pkgver. if [ "$USE_PKGREL" != "" ]; then msg2 "$(gettext "Package release version found: %s")" "$newpkgver" pkgrel=$newpkgver else msg2 "$(gettext "Version found: %s")" "$newpkgver" pkgver=$newpkgver fi It requires a new USE_PKGREL argument (see attached diff). It makes it easier to offer packages called qt-snaphot-4.4.1-2008092301 and qt-snaphot-4.5.0-2008092301 And finally, this minor tweak ensures that a pkgver=$(date) or pkgver=$EXPORTED_GLOBAL_VAR will not be overwritten... - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT + sed -i "s/^pkgver=[^$ |\$$]*/pkgver=$newpkgver/" ./$BUILDSCRIPT --markc

2 1

[pacman-dev] Show total progress bar
by Nathan Jones 28 Sep '08

28 Sep '08

Hey folks, Message about the TotalDownload option from way back in November 07: http://archlinux.org/pipermail/pacman-dev/2007-November/009948.html Back then, I did not know how to draw two progress bars. Well, now I have figured it out (and it only took ten months, not bad). I have a really terrible patch right now which somewhat works. If everyone thinks that having two progress bars is a good thing, then I will make a better patch. I don't know if it is a good thing or not. The output is a bit overwhelming, but it is fun to look at. To see what having two bars would look like without having to apply the patch, try this python script: import sys import time print 'pacman [###-------] 25%' print 'total [##--------] 10%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'pacman [#########-] 90%' print 'total [#####-----] 50%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'pacman [##########] 100%' print 'gcc [##--------] 10%' print 'total [######----] 60%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'gcc [######----] 60%' print 'total [########--] 80%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'gcc [########--] 80%' print 'total [#########-] 90%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'gcc [##########] 100%' print 'total [##########] 100%'

2 2

[pacman-dev] possible bug?
by Roman Kyrylych 28 Sep '08

28 Sep '08

Hi! Stumbled upon this today: http://bugs.archlinux.org/task/11498 Can this be somehow related to the fact that Pacman doesn't store ownership of directories? -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [PATCH] makepkg: Add used options to PKGINFO file
by Allan McRae 27 Sep '08

27 Sep '08

Adds defined options to the PKGINFO file in the form of "makepkgopt =". It may be useful to be able to add these to the pacman DB at some point as that would allow (e.g.) checking which packages have had their docs striped (FS#7092). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c15d91f..f5a5af4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -41,8 +41,9 @@ confdir='@sysconfdir@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -known_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'ccache' 'distcc' 'makeflags' 'force') -readonly -a known_options +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman') +other_options=('ccache' 'distcc' 'makeflags' 'force') +readonly -a packaging_options other_options # Options ASROOT=0 @@ -844,6 +845,16 @@ create_package() { for it in "${backup[@]}"; do echo "backup = $it" >>.PKGINFO done + for it in "${packaging_options[@]}"; do + local ret="$(check_option $it)" + if [ "$ret" != "?" ]; then + if [ "$ret" = "y" ]; then + echo "makepkgopt = $it" >>.PKGINFO + else + echo "makepkgopt = !$it" >>.PKGINFO + fi + fi + done # TODO maybe remove this at some point # warn if license array is not present or empty @@ -1385,7 +1396,7 @@ valid_options=1 for opt in ${options[@]}; do known=0 # check if option matches a known option or its inverse - for kopt in ${known_options[@]}; do + for kopt in ${packaging_options[@]} ${other_options[@]}; do if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then known=1 fi -- 1.6.0.2

1 1

Re: [pacman-dev] handling info files
by Miklos Vajna 21 Sep '08

21 Sep '08

On Sun, Sep 21, 2008 at 08:43:17PM +1000, Allan McRae <allan(a)archlinux.org> wrote: > Yes, but the compressing of info pages is only on the master branch. There > is no automatic removing of the dir file but that would require hard-coding > a file name into makepkg which I am not too sure about... I don't exaclty know how you can do it with your KISS way, but we have a (you can call it distro-specific) install macro that already does stuff like removing perl's perllocal.pod/.packlist files, etc. That macro takes care of removing such info dirs as well.

1 0

[pacman-dev] handling info files
by Andreas Radke 21 Sep '08

21 Sep '08

Now that we decided that we want to ship info documentation we should decide how to package such files: info files could be gzipped by makepkg or stay uncompressed. On my system they already take quiet a lot of space compared to much more packages shipping man-pages: [root@workstation64 andyrtr]# du -ch /usr/share/info/ 21M /usr/share/info/ [root@workstation64 andyrtr]# du -sch /usr/share/man 61M /usr/share/man Some are really big like gcc.info being 1.8mb uncompressed. I vote for auto-gzipping the info pages like man-pages. And shouldn't we check and remove the $pkgdir/usr/share/info/dir file that every pkg with info files produces? Maybe we can also print at the end of the makepkg run an array of found info files the packager should put into the *.install file. Right now we use the proto-info.install shipped with the "abs" pkg. An automated solution would be also nice for that. Opinions? -Andy

4 3

[pacman-dev] problem with deltas file generated by repo-add and what _alpm_delta_parse expects
by solsTiCe d'Hiver 14 Sep '08

14 Sep '08

hi. i browse into alpm code, and just find that repo-add adds lines like that to a deltas file $fromver $tover $deltasize $deltafile $deltamd5 but _alpm_delta_parse (in delta.c) which is used in be_files.c, expect the same line to be $oldfile $oldmd5 $newfile $newmd5 $deltafile $deltamd5 $deltasize is it because this delta stuff is not finished yet ? or i am simply completly wrong ?? by the way, i am trying to create a bsd db4 back-end for alpm. i have written convert.c, rewritten repo.add.py.in, pmdb.py. i have to rewrite be_files.c yet, the big part. what do you, the dev, think of that ? i know that almost every one was against such a thing some time ago, and might still do. i do it mostly as an exercise but it would be nice if it is used. cheers

1 0

[pacman-dev] [PATCH] libalpm: handle syscall interruption correctly
by Dan McGee 10 Sep '08

10 Sep '08

It is possible to throw EINTR from a system call such as open(), close(), or waitpid() if custom signal handlers are set up and they are not initialized with the SA_RESTART flag. This was noticed by Andreas Radke when ^C (SIGINT) was given during the call to waitpid(), causing it to throw the EINTR error and we could not accommodate it. Simply wrap these calls in a simple loop that allows us to retry the call if interrupted. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This patch should probably be considered for maint. It seems to work correctly in the normal case, although I have not reproduced it by trying to issue a SIGINT during the system call itself, which could be tricky. As a side note, our signal handlers are not async-safe at all and should probably be looked at sometime. -Dan lib/libalpm/trans.c | 5 ++--- lib/libalpm/util.c | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index d233645..73ae822 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -30,7 +30,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/statvfs.h> -#include <unistd.h> #include <errno.h> /* libalpm */ @@ -205,7 +204,7 @@ int SYMEXPORT alpm_trans_release() /* unlock db */ if(handle->lckfd != -1) { - close(handle->lckfd); + while(close(handle->lckfd) == -1 && errno == EINTR); handle->lckfd = -1; } if(_alpm_lckrm()) { @@ -567,7 +566,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, /* this code runs for the parent only (wait on the child) */ pid_t retpid; int status; - retpid = waitpid(pid, &status, 0); + while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR); if(retpid == -1) { _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno)); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index b26c970..da3463b 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -254,7 +254,8 @@ int _alpm_lckmk() _alpm_makepath(dir); FREE(dir); - fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); + while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 + && errno == EINTR); return(fd > 0 ? fd : -1); } -- 1.6.0.1

1 1

[pacman-dev] [PATCH] makepkg: allow compression type to be autodetected
by Dan McGee 05 Sep '08

05 Sep '08

Inspired by commit 7e8f1469c4168875b54956d63884b8583ce99e38, use our given PKGEXT or SRCEXT to determine what method of compression to use on the package we create. If the extension is invalid, this should fall back to creating a non-compressed tar file. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c15d91f..ff05e48 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -871,13 +871,21 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" + local TAR_OPT + case "$PKGEXT" in + *tar.gz) TAR_OPT="z" ;; + *tar.bz2) TAR_OPT="j" ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$PKGEXT" ;; + esac + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - if ! bsdtar -czf "$pkg_file" $comp_files *; then + if ! bsdtar -c${TAR_OPT}f "$pkg_file" $comp_files *; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi @@ -992,12 +1000,20 @@ create_srcpackage() { fi done + local TAR_OPT + case "$SRCEXT" in + *tar.gz) TAR_OPT="z" ;; + *tar.bz2) TAR_OPT="j" ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$SRCEXT" ;; + esac + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -czLf "$pkg_file" ${pkgname}; then + if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgname}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 1.6.0.1

4 5

[pacman-dev] [PATCH] Rework fakechroot checking
by Dan McGee 05 Sep '08

05 Sep '08

Do the checks in the tests that need it, and get rid of some of the cluttered output when it is not available (one line per test run). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- pactest/pmtest.py | 4 +--- pactest/tests/scriptlet001.py | 4 ++++ pactest/tests/scriptlet002.py | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pactest/pmtest.py b/pactest/pmtest.py index 39f4dea..7bb3281 100755 --- a/pactest/pmtest.py +++ b/pactest/pmtest.py @@ -197,9 +197,7 @@ class pmtest: cmd.append("fakeroot") fakechroot = which("fakechroot") - if not fakechroot: - print "WARNING: fakechroot not found, scriptlet tests WILL fail!!!" - else: + if fakechroot: cmd.append("fakechroot") if pacman["gdb"]: diff --git a/pactest/tests/scriptlet001.py b/pactest/tests/scriptlet001.py index 54a46aa..ff7fcd2 100644 --- a/pactest/tests/scriptlet001.py +++ b/pactest/tests/scriptlet001.py @@ -14,3 +14,7 @@ self.args = "--debug -U %s" % p1.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=" + pre) self.addrule("PACMAN_OUTPUT=" + post) + +fakechroot = which("fakechroot") +if not fakechroot: + self.expectfailure = True diff --git a/pactest/tests/scriptlet002.py b/pactest/tests/scriptlet002.py index dd792b8..cc316a1 100644 --- a/pactest/tests/scriptlet002.py +++ b/pactest/tests/scriptlet002.py @@ -14,3 +14,7 @@ self.args = "--debug -R %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=" + pre) self.addrule("PACMAN_OUTPUT=" + post) + +fakechroot = which("fakechroot") +if not fakechroot: + self.expectfailure = True -- 1.6.0.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-2-g242e9e9
by dan＠archlinux.org 05 Sep '08

05 Sep '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, maint has been updated via 242e9e90f4190b9f770a0230e99d302f7ec53e70 (commit) via 95ea6fb3c19a8d72d5b2e71ab5e37f2da8c77d5d (commit) from afac773d1936cbd0ea18ea94155f21dcf9411fb7 (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 242e9e90f4190b9f770a0230e99d302f7ec53e70 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Aug 29 17:24:34 2008 +0200 Another attempt at fixing totaldownload. This fixes FS#11339, which is a regression of commit 89c2c5196: When totaldownload is enabled, the database downloading percent (-Sy) is always at 0. That is because we have no guarantee that the totaldownload callback was called by libalpm. In particular, it is not called (and it would not make sense to) when a single file is downloaded, like it is the case with databases. So the correct way to detect if totaldownload should be used is checking both config->totaldownload and list_total, like it was already done in several places in the cb_dl_progress function. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 95ea6fb3c19a8d72d5b2e71ab5e37f2da8c77d5d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Aug 28 20:55:26 2008 +0200 Separate targets on -Qi/-Si with a newline. This fixes FS#11331 The newline was lost with commit 9451b2e4f23a3c566fcfe3420c379b3cb3eb1f90. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: src/pacman/callback.c | 24 ++++++++++++++++-------- src/pacman/package.c | 4 +++- 2 files changed, 19 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-18-gda933c2
by dan＠archlinux.org 05 Sep '08

05 Sep '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 da933c223eedb66c51b4a48b6ab0ce8fcb344b5c (commit) from 1c47500ea6d41bf9354155fca2e7c83fca368e1d (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 da933c223eedb66c51b4a48b6ab0ce8fcb344b5c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 2 12:27:32 2008 -0500 Remove unnecessary initialization in new functions We don't need to zero things out, we are already using calloc for this purpose. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/handle.c | 9 --------- lib/libalpm/trans.c | 9 --------- src/pacman/conf.c | 4 ---- 3 files changed, 0 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] ALPM & PackageKit
by Georg Grabler 03 Sep '08

03 Sep '08

Hey guys, I've some concerns. I also posted quite a similar thing to the dev~ list of PackageKit, and I'll also try to get some information in IRC lateron. First of all, as you might know, the Shaman devs (drf and boom) would like to switch to packagekit with version 2 of Shaman. Therefore, I looked at the implementation of the ALPM backend in PackageKit (developed by onestep). As it seems, all operations which at least require a synchronisation, or download functionality, are missing in the backend implementation. The reason: PackageKit has no functionality to supply server or configuration parameters to the backend library (interfaces missing). Now, since ALPM does not read any config files (I basically think it's the right way that the frontends have their own config management), I'd like to know before I talk again with the PK maintainers what ALPM would need for all "standard" operations (see chart at http://www.packagekit.org/pk-matrix.html) In between: ALPM has improved a lot ("helpful" functions) since I looked at it the last time. Nice job. Kind regards, Georg

2 2

Re: [pacman-dev] [arch-dev-public] Xorg-server 1.5RC6 enters testing
by Xavier 02 Sep '08

02 Sep '08

On Mon, Sep 1, 2008 at 2:23 AM, Allan McRae <allan(a)archlinux.org> wrote: > > After upgrading, X failed to start with a message about libpciaccess. > Installing that fixed the problem... Is this a missing dep somewhere? > The dep is not missing, so this might be a pacman bug.. http://bugs.archlinux.org/task/11367 To anyone who did not upgrade yet to the latest xorg-server (currently in testing) : Please check that when you upgrade, libpciaccess is indeed in the target list. If anyone sees that it is missing, canceling the operation and running it again with --debug would be very helpful.

1 2

[pacman-dev] GIT 2008 User Survey
by Dan McGee 02 Sep '08

02 Sep '08

Hey guys, Since our project uses git, I thought I'd point out the 2008 GIT user survey that is currently going on: http://www.survs.com/survey?id=M3PIVU72&channel=2WXE4BVTW8 I'm sure they would appreciate our input, whether you are a developer that fully understands GIT, or just a lurker that keeps up with pacman development. -Dan

3 2

[pacman-dev] makepkg 3.2.1 testing
by Xavier 28 Aug '08

28 Aug '08

Hello, while pacman 3.2.0 release was quite good, makepkg one was a bit worse. I think the main cause is the lack of testing. I personally always use the devel versions of pacman and makepkg, but I use pacman daily, while I only use makepkg very irregularly. Anyway, the 3.2.1 release is close now, and all known makepkg bugs were fixed : - fix download functions with weird URLs (FS#11076) - fix creation of source package with local files (FS#11149) - fix error when sourcing profile scripts (FS#11179) - perform case-insensitive checksum comparison (FS#11283) For FS#11292 (handling multiple source files which have the same name), a new feature had to be introduced. it is now possible to use the filename of your choice for remote sources, like this : source=('filename::http://path/to/file') This allows to handle multiple source files with same name, and also to handle more nicely weird URLs like http://www.vim.org/scripts/download_script.php?src_id=6992. So if some of the intensive makepkg users could just grab this pre 3.2.1 release and simply check everything is still fine with their PKGBUILDs, or more specifically check that all the bugs mentioned here are fixed, or that the new filename feature correctly, that would be great. Simply gunzip the attached file, and either run it directly from where you extracted it, or put it somewhere in your path.

2 3

Re: [pacman-dev] [arch-dev-public] info pages
by Miklos Vajna 27 Aug '08

27 Aug '08

On Sat, Aug 09, 2008 at 12:12:29PM +1000, Allan McRae <allan(a)archlinux.org> wrote: > CC: pacman-dev - We should also automatically compress the info files like > we do the man pages. That should not be hard, we have this trivial commit since a while: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=…

5 4

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.2.1, created. v3.2.1
by dan＠archlinux.org 27 Aug '08

27 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 annotated tag, v3.2.1 has been created at 9b583491c5a1c3962e6479f755917c2cb472d617 (tag) tagging afac773d1936cbd0ea18ea94155f21dcf9411fb7 (commit) replaces v3.2.0 tagged by Dan McGee on Tue Aug 26 20:09:48 2008 -0500 - Log ----------------------------------------------------------------- Standard issue maint release; thanks to everyone that pitched in to help fix problems we've encountered since v3.2.0. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAki0qXQACgkQXC5GoPU6du3nxQCcDn+bCWNcGJEgtb6+INc7t5+d y7gAnRMxY4lwjeA4yaYyUD2IxEKkf+Ie =KQoU -----END PGP SIGNATURE----- Allan McRae (2): Fix creation of source package with local source files Fix error when sourcing profile script Dan McGee (8): makepkg: Clarify usage instructions for --allsource/--source doc: allow asciidoc to format the note Fix variable naming issues in _alpm_db_cmp Fix segfault on x86_64 when using UseSyslog Factor shell script size command into configure script Fix 'None' text so we don't have to translate it twice Update translation files for pending 3.2.1 release Updates in preparation for 3.2.1 release Giovanni Scafora (1): Update Italian translation Hugo Doria (1): Update Portuguese (Brazil) translation Juan Pablo González Tognarelli (1): Update Spanish translation Mateusz Herych (1): Update Polish translation Matthias Gorissen (1): Update German translation Nagy Gabor (5): Remove an usused variable from alpm/util.c/_alpm_lckmk() repo-add: Fix whitespaces handling in variables. Move the the description parsing logic to string_display() Add new list_display_linebreak function Update Hungarian translation Roman Kyrylych (2): Add missing comma to -S --help message New Ukrainian translation Samed Beyribey (1): Update Turkish translation Sergey Tereschenko (1): Update Russian translation Vojtěch Gondžala (1): Update Czech translation Xavier Chantry (19): makepkg: fix download functions with weird urls. dload.c : drop the specific handling of file: url. Avoid double slashes in URLs given to libdownload. pacman/callback.c : fix detection of totaldownload pacman.conf : add curl example for XferCommand. pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp libalpm/add.c : ensure the old pkg was fully loaded. repo-add: add optdepends to the sync database. makepkg: do insensitive comparisons of checksums. pacman: print optdepends on install and upgrade. makepkg : localize the Y/n part of the question. pacman : clarify help message. fix HACKING asciidoc file. download : disable progressbar when total is unknown. Cleanup of _alpm_pkg_compare_versions. Update French translation Update British English translation Final updates on all translation for 3.2.1 makepkg : allow to specify a download filename 甘露(Lu.Gan) (1): Update Chinese Simplified translation ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

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

27 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 1c47500ea6d41bf9354155fca2e7c83fca368e1d (commit) via afac773d1936cbd0ea18ea94155f21dcf9411fb7 (commit) via 8263bd0cc260399b70c0cf36028c523de110b610 (commit) via d6f62ba22d5c6da484f4a7f0876b203ad545342a (commit) via 24d7c6a372ee9e796b4112f6dbff5f188fc80d35 (commit) via ece3d3606ac273fb3e032dcffee82458deb0cd72 (commit) via 81853893a53a1f31061d30efc01a0e420359de0a (commit) via eeb3c6868cc26a57015e692dde4f4217111e4fcc (commit) via cfc52dad98b130d882970392952b8fd4625ae7a5 (commit) via 49c58ce9db70dc06d16ef56d0bafc64a9f38f141 (commit) via 08b0fb856dab2d8c09622a4b95bd250f77b21539 (commit) via 6f38cedd8d55eb92a9ab417a747ca380b426efc0 (commit) from d05882db9e417244fa580c4697b45333faffcc79 (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 1c47500ea6d41bf9354155fca2e7c83fca368e1d Merge: d05882db9e417244fa580c4697b45333faffcc79 afac773d1936cbd0ea18ea94155f21dcf9411fb7 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 26 20:11:25 2008 -0500 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 20 +- TRANSLATORS | 5 +- configure.ac | 6 +- doc/PKGBUILD.5.txt | 4 + doc/makepkg.conf.5.txt | 13 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/cs.po | 10 +- lib/libalpm/po/de.po | 8 +- lib/libalpm/po/en_GB.po | 2 - lib/libalpm/po/es.po | 2 - lib/libalpm/po/fr.po | 2 - lib/libalpm/po/pl.po | 2 - lib/libalpm/po/pt_BR.po | 8 +- lib/libalpm/po/ru.po | 8 +- lib/libalpm/po/tr.po | 10 +- lib/libalpm/po/uk.po | 554 ++++++++++++++++ lib/libalpm/po/zh_CN.po | 10 +- po/LINGUAS | 1 + po/cs.po | 34 +- po/de.po | 37 +- po/en_GB.po | 12 +- po/es.po | 11 +- po/fr.po | 6 +- po/hu.po | 8 +- po/it.po | 6 +- po/pacman.pot | 6 +- po/pl.po | 7 +- po/pt_BR.po | 77 +-- po/ru.po | 42 +- po/tr.po | 34 +- po/uk.po | 1643 +++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 32 +- scripts/makepkg.sh.in | 65 ++- src/pacman/pacman.c | 2 +- 34 files changed, 2418 insertions(+), 270 deletions(-) create mode 100644 lib/libalpm/po/uk.po create mode 100644 po/uk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-45-gafac773
by dan＠archlinux.org 27 Aug '08

27 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, maint has been updated via afac773d1936cbd0ea18ea94155f21dcf9411fb7 (commit) from 8263bd0cc260399b70c0cf36028c523de110b610 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 3 +- TRANSLATORS | 3 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/uk.po | 554 ++++++++++++++++ po/LINGUAS | 1 + po/uk.po | 1643 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 2204 insertions(+), 1 deletions(-) create mode 100644 lib/libalpm/po/uk.po create mode 100644 po/uk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] Ukrainian translation for 3.2.1
by Roman Kyrylych 26 Aug '08

26 Aug '08

Hi! This is a brand new translation of pacman (yay!) to my native Ukrainian language (finally!), done by Ivan Kovnatsky (Іван Ковнацький), with some changes from me. Please include in 3.2.1. ;-) -- Roman Kyrylych (Роман Кирилич)

2 7

[pacman-dev] Move -Sw to front-end
by Nagy Gabor 26 Aug '08

26 Aug '08

Hi! After moving -Sp to front-end I decided to move -Sw as well, thus we would reach the following goal: alpm_trans_commit represents a _real_ transaction, ie. its successful run will cause a localdb change. It would make our code much more understandable, for example we could simply move ldconfig call to trans_commit (this would fix the duplicated ldconfig run issue on -Su %REPLACES%) and this would be helpful in my refresh_pkgcache branch etc. The reason for not providing a patch, I couldn't decide how to make this "download part" public. (This should be factorised from sync_commit). I put some ideas/opinions here, some of them may be conflicting. I appreciate any feedback. 1. Pre-condition: download callback stuffs are attached to handle, not to trans. Cool, "nice" transaction independent download stuff is possible. 2. First I thought something like this: alpm_download_packages(alpm_list_t *packages, ...) This seems the easiest to implement (cut from sync_commit). However, if we want transaction-independent function, we should do pmsyncpkg_t -> pmpkg_t conversion always. (Ugly) 3. Then I started to like the following: alpm_download_package(pmpkg_t *package) We have a problem with this, in this case if we want to keep the current "download all packages then check all integrity" order we should make something like alpm_check_integrity public (no, too complicated). Alternatively, we could check_integrity in download_package. This is also logical, but changes the current behaviour (order). Either 2. or 3. seems easy first. But there is a very minor thing, I want to fix, which makes our life more difficult: delta_path and download_size (of pmpkg_t) 4. First I thought, that these shouldn't belong to pmpkg_t, because they are not "constant" package properties like packager etc. These depend on the actual state of the download cache. I started to like the idea of moving them to pmsyncpkg_t instead. (Btw, alpm_pkg_download_size is in sync.c) But this just broke my plan to make transaction independent download stuff, so this idea was dropped. 5. These two fields are computed by compute_download_size as a last step of sync_prepare. If front-end is allowed to download some packages manually, then we should update these fields automatically. (these fields are used by determining the to-be-downloaded files) Even if we drop "-Sw in front-end" idea, it would nice, if these (or at least the public download_size) fields were "on-demand" stuffs, like other fields of pmpkg_t (new infolevel?, or download_size = -1 for "not yet computed"?): not hardwired sync_prepare computing, and automatically update the field if needed. (Because the front-end is allowed to request download_size field between sync_addtarget and sync_prepare etc.) However, if we want to update these fields after successful download, we should completely restructure the current download stuff (atm we just collect files then download them, and forget about packages):-/ I may mixed many things here, and I may misunderstand something (this delta stuff made things quite complicated in sync.c) So I decided to rework this download part, but I am unsure about directions. Bye

2 3

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

26 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 d05882db9e417244fa580c4697b45333faffcc79 (commit) via 070135626023caa0186a77f9f846c078e3cf1be8 (commit) via 9dbe5c9d1ee5fb00f25515dfb5a2feb3ae6ebd59 (commit) via a06d0de104d2f03c19b917ea47394d8d6be89a9a (commit) from a4100b384737d6b422a31eb0f6614b4f5f6070cb (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 d05882db9e417244fa580c4697b45333faffcc79 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 19:36:28 2008 +0200 Rename alpm_db_get{pkg,grp}cache to alpm_db_get_{pkg,grp}cache This is more consistent with the private functions : _alpm_db_get_{pkg,grp}cache Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 070135626023caa0186a77f9f846c078e3cf1be8 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 19:30:36 2008 +0200 Change checkdeps and checkdbconflicts to be more flexible. These two functions now take directly a package list rather than a database. checkdbconflicts was renamed to checkconflicts. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 9dbe5c9d1ee5fb00f25515dfb5a2feb3ae6ebd59 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 24 02:29:10 2008 +0200 pacman : smarter optdepends handling. During an upgrade, only the new optdepends will be displayed, to only keep the useful information and not clutter pacman output too much. The whole optdepends list is always available with -Si / -Qi. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a06d0de104d2f03c19b917ea47394d8d6be89a9a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 24 01:51:56 2008 +0200 makepkg.conf : some info / docs adjustements After commit 7865fb9af487, info pages are now treated like man pages. This means even with !docs, info pages will still be included. And including info pages was the main reason the docs option was enabled by default recently. So this is now longer needed, and we can revert back to !docs by default for disabling gigantic html pages and other docs. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 7 ++++--- etc/makepkg.conf.in | 6 +++--- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 8 ++++---- lib/libalpm/conflict.c | 6 +++--- lib/libalpm/db.c | 4 ++-- lib/libalpm/deps.c | 12 ++++-------- lib/libalpm/remove.c | 6 +++--- lib/libalpm/sync.c | 2 +- src/pacman/callback.c | 2 +- src/pacman/query.c | 8 ++++---- src/pacman/sync.c | 12 ++++++------ src/pacman/util.c | 19 +++++++++++++++++++ src/pacman/util.h | 1 + src/util/testdb.c | 5 +++-- 15 files changed, 59 insertions(+), 41 deletions(-) hooks/post-receive -- The official pacman repository

4 5

[pacman-dev] [PATCH] testdb : extend the tool to allow checking sync dbs too.
by Xavier Chantry 26 Aug '08

26 Aug '08

Example usage and output : > src/util/testdb -h usage: testdb [-b <pacman db>] : check the local database testdb [-b <pacman db>] core extra ... : check the listed sync databases > src/util/testdb Checking the integrity of the local database in /var/lib/pacman/ > src/util/testdb core extra testing community Checking the integrity of the sync databases in /var/lib/pacman/ missing dependency for archboot : bcm43xx-fwcutter>=006-2 missing dependency for xvattr : xfree86 missing dependency for eclipse-ve : eclipse<3.3 missing dependency for flumotion : twisted-web missing dependency for gg2 : arts missing dependency for man-pages-cs : groff-utf8 missing dependency for qc-usb : kernel26<2.6.26 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/util/testdb.c | 174 ++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 126 insertions(+), 48 deletions(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index 69e3519..8a66819 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -56,7 +56,7 @@ void output_cb(pmloglevel_t level, char *fmt, va_list args) } } -static int db_test(char *dbpath) +static int db_test(char *dbpath, int local) { struct dirent *ent; char path[PATH_MAX]; @@ -70,7 +70,8 @@ static int db_test(char *dbpath) } while ((ent = readdir(dir)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..") + || ent->d_name[0] == '.') { continue; } /* check for desc, depends, and files */ @@ -84,58 +85,22 @@ static int db_test(char *dbpath) printf("%s: dependency file is missing\n", ent->d_name); ret++; } - snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name); - if(access(path, F_OK)) { - printf("%s: file list is missing\n", ent->d_name); - ret++; + if(local) { + snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name); + if(access(path, F_OK)) { + printf("%s: file list is missing\n", ent->d_name); + ret++; + } } } return(ret); } -int main(int argc, char **argv) +int checkdeps(alpm_list_t *pkglist) { - int retval = 0; /* default = false */ - pmdb_t *db = NULL; - char *dbpath; - char localdbpath[PATH_MAX]; - alpm_list_t *i; - - if(argc == 1) { - dbpath = DBPATH; - } else if(argc == 3 && strcmp(argv[1], "-b") == 0) { - dbpath = argv[2]; - } else { - fprintf(stderr, "usage: %s -b <pacman db>\n", BASENAME); - return(1); - } - - snprintf(localdbpath, PATH_MAX, "%s/local", dbpath); - retval = db_test(localdbpath); - if(retval) { - return(retval); - } - - if(alpm_initialize() == -1) { - fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); - return(1); - } - - /* let us get log messages from libalpm */ - alpm_option_set_logcb(output_cb); - - alpm_option_set_dbpath(dbpath); - - db = alpm_db_register_local(); - if(db == NULL) { - fprintf(stderr, "error: could not register 'local' database (%s)\n", - alpm_strerrorlast()); - cleanup(EXIT_FAILURE); - } - + alpm_list_t *data, *i; + int ret = 0; /* check dependencies */ - alpm_list_t *data; - alpm_list_t *pkglist = alpm_db_get_pkgcache(db); data = alpm_checkdeps(pkglist, 0, NULL, pkglist); for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); @@ -144,17 +109,130 @@ int main(int argc, char **argv) printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss), depstring); free(depstring); + ret++; } + return(ret); +} +int checkconflicts(alpm_list_t *pkglist) +{ + alpm_list_t *data, *i; + int ret = 0; /* check conflicts */ data = alpm_checkconflicts(pkglist); for(i = data; i; i = i->next) { pmconflict_t *conflict = alpm_list_getdata(i); printf("%s conflicts with %s\n", alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); + ret++; + } + return(ret); +} + +int check_localdb(char *dbpath) { + char localdbpath[PATH_MAX]; + int ret = 0; + pmdb_t *db = NULL; + alpm_list_t *pkglist; + + snprintf(localdbpath, PATH_MAX, "%s/local", dbpath); + ret = db_test(localdbpath, 1); + if(ret) { + return(ret); + } + + db = alpm_db_register_local(); + if(db == NULL) { + fprintf(stderr, "error: could not register 'local' database (%s)\n", + alpm_strerrorlast()); + cleanup(EXIT_FAILURE); + } + pkglist = alpm_db_get_pkgcache(db); + ret += checkdeps(pkglist); + ret += checkconflicts(pkglist); + return(ret); +} + +int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { + char syncdbpath[PATH_MAX]; + int ret = 0; + pmdb_t *db = NULL; + alpm_list_t *i, *pkglist, *syncpkglist = NULL; + + for(i = dbnames; i; i = alpm_list_next(i)) { + char *dbname = alpm_list_getdata(i); + snprintf(syncdbpath, PATH_MAX, "%s/sync/%s", dbpath, dbname); + ret = db_test(syncdbpath, 0); + if(ret) { + return(ret); + } + db = alpm_db_register_sync(dbname); + if(db == NULL) { + fprintf(stderr, "error: could not register sync database (%s)\n", + alpm_strerrorlast()); + cleanup(EXIT_FAILURE); + } + pkglist = alpm_db_get_pkgcache(db); + syncpkglist = alpm_list_join(syncpkglist, alpm_list_copy(pkglist)); + } + ret += checkdeps(syncpkglist); + alpm_list_free(syncpkglist); + + alpm_db_unregister_all(); + return(ret); +} + +void usage() { + fprintf(stderr, "usage:\n"); + fprintf(stderr, + "\t%s [-b <pacman db>] : check the local database\n", BASENAME); + fprintf(stderr, + "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + exit(1); +} + +int main(int argc, char **argv) +{ + int ret = 0; + char *dbpath = DBPATH; + int a = 1; + alpm_list_t *dbnames = NULL; + + while(a < argc) { + if(strcmp(argv[a], "-b") == 0) { + if(++a < argc) { + dbpath = argv[a]; + } else { + usage(); + } + } else if(strcmp(argv[a], "-h") == 0 || + strcmp(argv[a], "--help") == 0 ) { + usage(); + } else { + dbnames = alpm_list_add(dbnames, argv[a]); + } + a++; + } + + if(alpm_initialize() == -1) { + fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); + return(1); + } + + /* let us get log messages from libalpm */ + alpm_option_set_logcb(output_cb); + + alpm_option_set_dbpath(dbpath); + + if(!dbnames) { + printf("Checking the integrity of the local database in %s\n",dbpath); + ret = check_localdb(dbpath); + } else { + printf("Checking the integrity of the sync databases in %s\n",dbpath); + ret = check_syncdbs(dbpath,dbnames); } - cleanup(retval); + cleanup(ret); } /* vim: set ts=2 sw=2 noet: */ -- 1.6.0.1

1 0