- Pacman-dev - lists.archlinux.org

[pacman-dev] pacman output wrapping on hurd
by Allan McRae 09 Apr '10

09 Apr '10

Hi, On Arch Hurd, I am seeing weird output from pacman. See http://allanmcrae.com/images/pacman-hurd.png (sorry, qemu image so cut/paste is hard). Basically, it is wrapping the output any time there is a whitespace. Any ideas on what is causing that? Arch Hurd is still in its infancy (barely a toolchain and makepkg deps, but it boots!), so it may be something basic in the system is still missing. Allan

2 2

Re: [pacman-dev] [arch-dev-public] [arch-general] WARNING: [testing] broken due to openssl and heimdal rebuilds
by Xavier Chantry 07 Apr '10

07 Apr '10

On Wed, Apr 7, 2010 at 6:23 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > On Wed, Apr 7, 2010 at 10:16 AM, Allan McRae <allan(a)archlinux.org> wrote: >> On 08/04/10 00:54, Florian Pritz wrote: >>> >>> On 07.04.2010 16:10, Allan McRae wrote: >>>> >>>> This would really not help here. Pacman does not directly link openssl, >>>> but does through libarchive and libfetch. Adding versioned libarchive >>>> and libfetch to pacman's deps and using sodeps on openssl in those >>>> packages would prevent pacman's SyncFirst from working. >>>> >>> >>> Don't add depends=(libfetch.sp libarchive.so) to the pacman PKGBUILD and >>> it won't be a problem. (Also see #2 below) >> >> Adding those or not is the same as adding versioned deps or not. Both cause >> bad issues. >> >>>> no versioned deps in pacman for lib{archive,fetch} = bad as between the >>>> openssl and lib{archive,fetch} updates vercmp is broken and so is >>>> install files. >>> >>> sodeps would ensure that pacman updates libfetch and libarchive directly >>> after openssl. >> >> Not directly after, but in the same transaction. That is the same as the >> current issue we have. Using sodeps is no improvement over versioned deps >> here. > > Allan and I talked a bit on IRC and we both came to some idea that a > vercmp without any deps would probably be a good solution. We can hack > this up for now, file attached to do so. > > If this goes into the pacman package dir in SVN and we just add a "gcc > -O2 -o vercmp vercmp.c" in there and put it in the right place, we can > avoid a lot of hassle with everything here. > That sounds fine, but what is the long term solution exactly ?

2 1

[pacman-dev] [PATCH] Add vim modeline to PKGBUILD-split.proto
by David Campbell 04 Apr '10

04 Apr '10

Add the vim modeline that is in PKGBUILD.proto to PKGBUILD-split.proto so they are consistent with each other. --- PKGBUILD-split.proto | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 68a8cc4..53a3e8f 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -61,3 +61,5 @@ package_pkg2() { cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg2 } + +# vim:set ts=2 sw=2 et: -- 1.7.0.3

2 1

[pacman-dev] Why alpm_list.h?
by Moritz Wilhelmy 02 Apr '10

02 Apr '10

Hello, since I started to dig into pacman's code, I've also started to wonder why exactly libalpm reinvents the wheel by using it's own list implementation rather than sys/queue.h (see QUEUE(3) for details). Is it for backwards compatibility or what are the exact reasons to handle it this way? Kind Regards, Moritz

2 1

Re: [pacman-dev] [arch-dev-public] openssl 1.0 rebuild
by Xavier Chantry 02 Apr '10

02 Apr '10

On Fri, Apr 2, 2010 at 2:46 AM, Allan McRae <allan(a)archlinux.org> wrote: > > I'd just remove it. > > Basically the arguement against widespread usage of versioned deps is if you > put a versioned openssl>=1.0 there and someone does "pacman -Sy mutt", it > will pull in the new openssl and break many packages on their system. If > you do not put it there, it will only break mutt. > Wasn't it in http://honestknave.com/2009/07/18/the-arch-package-management-debacle/ (unfortunately dead) that the guy did the following : 1) pacman -Sy mutt oh damn mutt is broken because of openssl, let's upgrade openssl 2) pacman -S openssl boom, we are back in the versioned dep case. IIRC this was the post that led to this FR : http://bugs.archlinux.org/task/15581

1 0

[pacman-dev] [PATCH] makepkg: place signature symlink in build dir
by Allan McRae 31 Mar '10

31 Mar '10

Be consistent in package and signature placements when using PKGDEST. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This patch is on top of Dan's gpg-more branch which has been rebased onto master (thanks to Xavier for finding my mistake). As part of the rebase, I have also gone back through the makepkg/repo-add patches and changed the style of the tests to what is now used. All this has been pushed to the "gpg" branch on my repo. scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 70cf09d..1c02392 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1039,16 +1039,17 @@ create_package() { exit 1 # TODO: error code fi + create_signature "$pkg_file" + if (( ! ret )) && [[ "$PKGDEST" != "${startdir}" ]]; then ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" ret=$? + [[ -f $pkg_file.sig ]] && ln -sf "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" fi if (( ret )); then warning "$(gettext "Failed to create symlink to package file.")" fi - - create_signature "$pkg_file" } create_signature() { -- 1.7.0.3

1 0

[pacman-dev] mmerge with dupe removal
by dave reisner 30 Mar '10

30 Mar '10

Hey all. I've been working on a AUR agent in C, and I ended up modifying some of the alpm_list methods for my own purposes. At toofishes' request, I'm posting them here to see if anyone finds them useful. The first finds and deletes duplicate entries during a mergesort. The latter is implemented by the modified merge to remove a specific node in a list, given that you already have a pointer to it. As I noticed there was a recent discussion regarding something of this nature, I hope it proves useful. It should be easily modifiable to allow for populating a new duplicate list if you choose to go that route. -dave reisner /** * @brief merge sort with duplicate deletion * * @param left left side of merge * @param right right side of merge * @param fn callback function for comparing data * @param fnf callback function for deleting data * * @return the merged list */ alpm_list_t *alpm_list_mmerge_dedupe(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_fn_free fnf) { alpm_list_t *lp, *newlist; int compare; if (left == NULL) return right; if (right == NULL) return left; do { compare = fn(left->data, right->data); if (compare > 0) { newlist = right; right = right->next; } else if (compare < 0) { newlist = left; left = left->next; } else { left = alpm_list_remove_item(left, left, fnf); } } while (compare == 0); newlist->prev = NULL; newlist->next = NULL; lp = newlist; while ((left != NULL) && (right != NULL)) { compare = fn(left->data, right->data); if (compare < 0) { lp->next = left; left->prev = lp; left = left->next; } else if (compare > 0) { lp->next = right; right->prev = lp; right = right->next; } else { left = alpm_list_remove_item(left, left, fnf); continue; } lp = lp->next; lp->next = NULL; } if (left != NULL) { lp->next = left; left->prev = lp; } else if (right != NULL) { lp->next = right; right->prev = lp; } while(lp && lp->next) { lp = lp->next; } newlist->prev = lp; return(newlist); } /** * @brief Remove a specific node from a list * * @param listhead list to remove from * @param target node within list to remove * @param fn comparison function * * @return the node following the removed node */ alpm_list_t *alpm_list_remove_item(alpm_list_t *listhead, alpm_list_t *target, alpm_list_fn_free fn) { alpm_list_t *next = NULL; if (target == listhead) { listhead = target->next; if (listhead) { listhead->prev = target->prev; } target->prev = NULL; } else if (target == listhead->prev) { if (target->prev) { target->prev->next = target->next; listhead->prev = target->prev; target->prev = NULL; } } else { if (target->next) { target->next->prev = target->prev; } if (target->prev) { target->prev->next = target->next; } } next = target->next; if (target->data) { fn(target->data); } free(target); return next; }

1 0

[pacman-dev] [PATCH] makepkg: BSD find compatibility fix
by Allan McRae 29 Mar '10

29 Mar '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9623ffa..b2b449c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -868,7 +868,7 @@ tidy_install() { if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" local binary - find ${STRIP_DIRS[@]} -type f -writable 2>/dev/null | while read binary ; do + find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *compressed-encoding*) # Skip compressed binaries ;; -- 1.7.0.3

1 0

[pacman-dev] Fwd: [PATCH] makepkg.conf: Added .svn to PURGE_TARGETS
by Daenyth Blank 26 Mar '10

26 Mar '10

--- etc/makepkg.conf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..c721209 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -85,7 +85,7 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod .svn) ######################################################################### # PACKAGE OUTPUT -- 1.7.0

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-150-g21abae9
by dan＠archlinux.org 26 Mar '10

26 Mar '10

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 21abae98cbd382d8fab4427109776d983cd07c9f (commit) via 98ee520907f7f2a50fa43edfd213dfc8eae07033 (commit) via 526806e7acf07f625da3a2a31de94b7ca150e4b7 (commit) via bf7c3eb17f4de35f6639b2f3f0c1c06a27b5242b (commit) from cdbb90aceb288034dbf4f228fc4c49da1e2ed0c0 (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 21abae98cbd382d8fab4427109776d983cd07c9f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 25 21:36:30 2010 -0500 Update -Si docs to reflect new -Sii operation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98ee520907f7f2a50fa43edfd213dfc8eae07033 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 24 15:59:04 2010 +1000 Sort and avoid duplicates in -Sii output Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 526806e7acf07f625da3a2a31de94b7ca150e4b7 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 24 15:22:23 2010 +1000 alpm_list_diff_sorted - make some arguments const Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf7c3eb17f4de35f6639b2f3f0c1c06a27b5242b Author: Matthias Lanzinger <mlaenz(a)gmail.com> Date: Thu Mar 25 11:03:00 2010 +0100 Fix cross-compilation issues with git and libfetch This patch fixes 2 issues I encountered when cross-compiling pacman. First is the test for libfetch which requires explicit linking to all libraries libfetch depends on. The other problem results from the AC_CHECK_PROGS test for git. This test will stop configure with an error when cross-compiling. The fix moves the call to AC_CHECK_PROG so that is only called of --enable-git is actually set. Signed-off-by: Matthias Lanzinger <mlaenz(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 8 ++++---- doc/pacman.8.txt | 5 +++-- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/package.c | 5 ++++- 5 files changed, 16 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0