- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 3/3] repo-add: do not allow pkgnames to start with a minus
by Cedric Staniewski 27 Jul '09

27 Jul '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/repo-add.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index eb8837c..2133fed 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -216,8 +216,8 @@ db_write_entry() md5sum="$(openssl dgst -md5 "$pkgfile" | awk '{print $NF}')" csize=$(@SIZECMD@ "$pkgfile") - # ensure $pkgname and $pkgver variables were found - if [ -z "$pkgname" -o -z "$pkgver" ]; then + # ensure $pkgname and $pkgver variables were found and pkgname does not start with a minus + if [ -z "$pkgname" -o "${pkgname:0:1}" == "-" -o -z "$pkgver" ]; then error "$(gettext "Invalid package file '%s'.")" "$pkgfile" return 1 fi -- 1.6.3

4 11

[pacman-dev] [PATCH] PKGBUILD-split.proto: pkgbase is a string not an array
by Allan McRae 27 Jul '09

27 Jul '09

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 0baa496..08f98d6 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -5,7 +5,7 @@ # Contributor: Your Name <youremail(a)domain.com> pkgname=('pkg1' 'pkg2') -pkgbase=('pkg') +pkgbase="" pkgver=VERSION pkgrel=1 pkgdesc="" -- 1.6.3.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-218-g597118d
by dan＠archlinux.org 26 Jul '09

26 Jul '09

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 597118ddd756426530c3ed798e71ab9427438fb6 (commit) from 6fa5f2075aaffec9b9cc89329461a34e29b5b2a6 (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 597118ddd756426530c3ed798e71ab9427438fb6 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 26 12:58:02 2009 -0500 Revert "makepkg: Exit on failure within build() or package() functions" As reported in FS#15210, we have some problems with split packages and variable overrides because of this patch. For now, in prep for a release, it is best to back it out and see what we can do later. This reverts commit 621aa26e26fcf578221051e896d6440a0095b8a3. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman and same empty dirs in both pkgs, problem?
by Gerardo Exequiel Pozzi 25 Jul '09

25 Jul '09

Hi devs, This mail is trigger by this problem [#1]. 1) PKG1 installs some directory without any files like "/some/common/dir" 2) PKG2 installs the same directory "/some/common/dir" with or without any files inside 3) Removing PKG2 also remove "/some/common/dir" that is installed by PKG1 This behaviour is expected? pacman only track files not directories true? Also tested with the latest pacman.git (at commit 30c4d53ce) packages like openssh that install an empty dir "/var/empty/" should also install a hidden file like "/var/empty/.keep.this.for.openssh" ? [#1] http://bugs.archlinux.org/task/15668 (openntpd 3.9p1-7 uninstall removes /var/empty) -- Gerardo Exequiel Pozzi ( djgera ) http://www.djgera.com.ar KeyID: 0x1B8C330D Key fingerprint = 0CAA D5D4 CD85 4434 A219 76ED 39AB 221B 1B8C 330D

4 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-217-g6fa5f20
by dan＠archlinux.org 25 Jul '09

25 Jul '09

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 6fa5f2075aaffec9b9cc89329461a34e29b5b2a6 (commit) from 30c4d53ce5c16cbbb17a88fe1ad14faf53d91999 (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 6fa5f2075aaffec9b9cc89329461a34e29b5b2a6 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Jul 25 20:00:06 2009 +0200 Use lstat instead of stat for -Qo This fixes: FS#15675 - pacman can not determine ownership of dangling symlinks Using lstat seems more correct than stat for the -Qo operation anyway. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Requested Range Not Satisfiable
by Roman Kyrylych 23 Jul '09

23 Jul '09

Hi! This is another issue I noticed today. The output is from -Syyu, so I wonder what range has to do with it, because -yy should download the db file from the beginning, right? :: Synchronizing package databases... debug: using 'testing.db.tar.gz' for download progress debug: existing file found, using it debug: HTTP_PROXY: (null) debug: http_proxy: (null) debug: FTP_PROXY: (null) debug: ftp_proxy: (null) error: failed retrieving file 'testing.db.tar.gz' from dev.archlinux.org : Requested Range Not Satisfiable debug: failed to sync db: Requested Range Not Satisfiable error: failed to update testing (Requested Range Not Satisfiable) -- Roman Kyrylych (Роман Кирилич)

1 3

[pacman-dev] vercmp wildcards?
by Aaron Griffin 23 Jul '09

23 Jul '09

Just checking the sanity of an idea here: What do you all think of supporting wildcards for version comparisons? I was thinking fnmatch could almost be dropped in directly to alpm_pkg_vercmp in place of the initial strcmp. Use case: readline version 6.0.003 bash depends readline=6.0.* Thoughts?

4 3

[pacman-dev] Syncing pacman and aqpm+shaman release
by Dario Freddi 23 Jul '09

23 Jul '09

Hi folks, First of all thanks everyone, especially Xavier and Dan for pushing the patch in. Aqpm is, after a rush of fixes yesterday, definitely ready for prime time. I pushed the latest changes to the git repo yesterday to make it fully compliant with pacman 3.3. Now, shaman looks quite stable and working, but I still don't feel like calling it a final quality product. However, I definitely want to push it with pacman 3.3 and I'll try my best to fix the last issues (mainly with the config panel not behaving properly, while ABS support will be marked as "non working" since I simply have no time now). So, I wondered if we could set up a way in which we can push pacman, aqpm and shaman to the repos at the same time. You can simply pull from the git repos, but I will definitely release a tarball when the time comes. What do you think about this? -- ------------------- Dario Freddi KDE Developer GPG Key Signature: 511A9A3B

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-216-g30c4d53
by dan＠archlinux.org 23 Jul '09

23 Jul '09

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 30c4d53ce5c16cbbb17a88fe1ad14faf53d91999 (commit) from 1d19f0896ccc1560a7e2f5b93cfe095b4aefe84a (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 30c4d53ce5c16cbbb17a88fe1ad14faf53d91999 Author: Sebastian Nowicki <sebnow(a)gmail.com> Date: Sat Apr 4 16:17:30 2009 +0800 Add a fetch callback to allow front-end download support This allows a frontend to define its own download algorithm so that the libfetch dependency can be omitted without using an external process. The callback will be used when if it is defined, otherwise the old behavior applies. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> [Dan: minor cleanups] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 17 ++++++- lib/libalpm/dload.c | 104 +++------------------------------------------ lib/libalpm/handle.c | 34 ++++++++------- lib/libalpm/handle.h | 2 +- src/pacman/conf.c | 1 + src/pacman/conf.h | 1 + src/pacman/pacman.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 156 insertions(+), 118 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add a fetch callback to allow front-end download support
by Sebastian Nowicki 23 Jul '09

23 Jul '09

This allows a frontend to define its own download algorithm so that the libfetch dependency can be omitted without using an external process. The callback will be used when if it is defined, otherwise the old behavior applies. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- lib/libalpm/alpm.h | 14 ++++++++++++++ lib/libalpm/dload.c | 9 ++++++--- lib/libalpm/handle.c | 18 ++++++++++++++++++ lib/libalpm/handle.h | 1 + 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7b7ca4e..266f7ff 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -83,6 +83,17 @@ int alpm_logaction(char *fmt, ...); typedef void (*alpm_cb_download)(const char *filename, off_t xfered, off_t total); typedef void (*alpm_cb_totaldl)(off_t total); +/** A callback for downloading files + * @param url the URL of the file to be downloaded + * @param localpath the directory to which the file should be downloaded + * @param mtimeold the modification time of the file previously downloaded + * @param mtimenew the modification time of the newly downloaded file. + * This should be set by the callback. + * @return 0 on success, 1 if the modification times are identical, -1 on + * error. + */ +typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, + time_t mtimeold, time_t *mtimenew); /* * Options @@ -94,6 +105,9 @@ void alpm_option_set_logcb(alpm_cb_log cb); alpm_cb_download alpm_option_get_dlcb(); void alpm_option_set_dlcb(alpm_cb_download cb); +alpm_cb_fetch alpm_option_get_fetchcb(); +void alpm_option_set_fetchcb(alpm_cb_fetch cb); + alpm_cb_totaldl alpm_option_get_totaldlcb(); void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5b0a691..a244999 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -352,12 +352,15 @@ static int download(const char *url, const char *localpath, int ret; /* We have a few things to take into account here. - * 1. If we have both internal/external available, choose based on + * 1. If the fetch callback is set, prefer it. + * 2. If we have both internal/external available, choose based on * whether xfercommand is populated. - * 2. If we only have external available, we should first check + * 3. If we only have external available, we should first check * if a command was provided before we drop into download_external. */ - if(handle->xfercommand == NULL) { + if(handle->fetchcb != NULL) { + ret = handle->fetchcb(url, localpath, mtimeold, mtimenew); + } else if(handle->xfercommand == NULL) { #if defined(INTERNAL_DOWNLOAD) ret = download_internal(url, localpath, mtimeold, mtimenew); #else diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 813f439..f19bc3f 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -105,6 +105,15 @@ alpm_cb_download SYMEXPORT alpm_option_get_dlcb() return handle->dlcb; } +alpm_cb_fetch SYMEXPORT alpm_option_get_fetchcb() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->fetchcb; +} + alpm_cb_totaldl SYMEXPORT alpm_option_get_totaldlcb() { if (handle == NULL) { @@ -258,6 +267,15 @@ void SYMEXPORT alpm_option_set_dlcb(alpm_cb_download cb) handle->dlcb = cb; } +void alpm_option_set_fetchcb(alpm_cb_fetch cb) +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return; + } + handle->fetchcb = cb; +} + void SYMEXPORT alpm_option_set_totaldlcb(alpm_cb_totaldl cb) { if (handle == NULL) { diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index ad7666d..f895d85 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -40,6 +40,7 @@ typedef struct _pmhandle_t { alpm_cb_log logcb; /* Log callback function */ alpm_cb_download dlcb; /* Download callback function */ alpm_cb_totaldl totaldlcb; /* Total download callback function */ + alpm_cb_fetch fetchcb; /* Download file callback function */ /* filesystem paths */ char *root; /* Root path, default '/' */ -- 1.6.1

5 29