February 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] FS#8798 - Allow -Qo to perform a functional 'which'
by Jatheendra 11 Oct '09

11 Oct '09

Hi all, This is a simple patch to add a "which" like functionality to pacman -Qo[Bug FS#8798]. This is my first patch ,so any constructive criticism is most welcome. Thanks, Shankar --- src/pacman/query.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..fb3bb92 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -55,6 +55,43 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip trailing '/' */ + while (path[len-1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname,bufptr) == 0) { + strncpy(filename,fullname,PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -66,21 +103,35 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename,alpm_list_getdata(t),PATH_MAX+1); + char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(stat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename,'/') == NULL) { + if((search_path(filename,&buf)) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } + if(S_ISDIR(buf.st_mode)) { pm_fprintf(stderr, PM_LOG_ERROR, _("cannot determine ownership of a directory\n")); @@ -140,6 +191,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.0.2

4 5

[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

[pacman-dev] Fileconflict error...
by Nagy Gabor 20 Jul '09

20 Jul '09

Hi! I've tried -Su again... I've just run into a very "hard to fix" error. [ngaba@Arch ~]$ LANG=C sudo pacman -Su --ignore mplayer ... xulrunner: /usr/include/xulrunner-1.9 exists in filesystem xulrunner: /usr/lib/xulrunner-1.9 exists in filesystem xulrunner: /usr/lib/xulrunner-devel-1.9 exists in filesystem xulrunner: /usr/share/idl/xulrunner-1.9 exists in filesystem ... These are directories... But in the package we have symlinks. Bye

7 43

[pacman-dev] Package upgrade issues: False file conflicts
by Thomas Bächler 19 Jul '09

19 Jul '09

[i686][13:25:40][thomas@artin trunk]$ su -c "pacman -Ud klibc-1.5.14-1-i686.pkg.tar.gz" Password: loading package data... (1/1) checking for file conflicts [-----------------------------------------------------------------------------------------------------------------------------------------------] 100% error: failed to prepare transaction (conflicting files) klibc: /usr/lib/klibc/bin/mknod exists in filesystem klibc: /usr/lib/klibc/include/asm/Kbuild exists in filesystem klibc: /usr/lib/klibc/include/asm/a.out-core.h exists in filesystem klibc: /usr/lib/klibc/include/asm/a.out.h exists in filesystem klibc: /usr/lib/klibc/include/asm/acpi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/agp.h exists in filesystem klibc: /usr/lib/klibc/include/asm/alternative-asm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/alternative.h exists in filesystem klibc: /usr/lib/klibc/include/asm/apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/arch_hooks.h exists in filesystem klibc: /usr/lib/klibc/include/asm/asm-offsets.h exists in filesystem klibc: /usr/lib/klibc/include/asm/asm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/atomic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/atomic_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/atomic_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/auxvec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bios_ebda.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bitops.h exists in filesystem klibc: /usr/lib/klibc/include/asm/boot.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bootparam.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bug.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bugs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/byteorder.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cache.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cacheflush.h exists in filesystem klibc: /usr/lib/klibc/include/asm/calgary.h exists in filesystem klibc: /usr/lib/klibc/include/asm/calling.h exists in filesystem klibc: /usr/lib/klibc/include/asm/checksum.h exists in filesystem klibc: /usr/lib/klibc/include/asm/checksum_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/checksum_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cmpxchg.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cmpxchg_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cmpxchg_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/compat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cpufeature.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cputime.h exists in filesystem klibc: /usr/lib/klibc/include/asm/current.h exists in filesystem klibc: /usr/lib/klibc/include/asm/current_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/current_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/debugreg.h exists in filesystem klibc: /usr/lib/klibc/include/asm/delay.h exists in filesystem klibc: /usr/lib/klibc/include/asm/desc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/desc_defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/device.h exists in filesystem klibc: /usr/lib/klibc/include/asm/div64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dma-mapping.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dma.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dmi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ds.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dwarf2.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dwarf2_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dwarf2_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/e820.h exists in filesystem klibc: /usr/lib/klibc/include/asm/e820_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/e820_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/edac.h exists in filesystem klibc: /usr/lib/klibc/include/asm/efi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/elf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/emergency-restart.h exists in filesystem klibc: /usr/lib/klibc/include/asm/errno.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fcntl.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fixmap.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fixmap_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fixmap_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/floppy.h exists in filesystem klibc: /usr/lib/klibc/include/asm/frame.h exists in filesystem klibc: /usr/lib/klibc/include/asm/futex.h exists in filesystem klibc: /usr/lib/klibc/include/asm/gart.h exists in filesystem klibc: /usr/lib/klibc/include/asm/genapic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/genapic_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/genapic_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/geode.h exists in filesystem klibc: /usr/lib/klibc/include/asm/gpio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hardirq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hardirq_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hardirq_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/highmem.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hpet.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hugetlb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hw_irq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hw_irq_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hw_irq_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hypertransport.h exists in filesystem klibc: /usr/lib/klibc/include/asm/i387.h exists in filesystem klibc: /usr/lib/klibc/include/asm/i8253.h exists in filesystem klibc: /usr/lib/klibc/include/asm/i8259.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ia32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ia32_unistd.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ide.h exists in filesystem klibc: /usr/lib/klibc/include/asm/idle.h exists in filesystem klibc: /usr/lib/klibc/include/asm/intel_arch_perfmon.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ioctl.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ioctls.h exists in filesystem klibc: /usr/lib/klibc/include/asm/iommu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ipcbuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_regs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_regs_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_regs_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irqflags.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ist.h exists in filesystem klibc: /usr/lib/klibc/include/asm/k8.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kdebug.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kexec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kgdb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kmap_types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kprobes.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm_host.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm_para.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm_x86_emulate.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ldt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/lguest.h exists in filesystem klibc: /usr/lib/klibc/include/asm/lguest_hcall.h exists in filesystem klibc: /usr/lib/klibc/include/asm/linkage.h exists in filesystem klibc: /usr/lib/klibc/include/asm/local.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/apm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/do_timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/entry_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/irq_vectors.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/irq_vectors_limits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_traps.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_wakecpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/pci-functions.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/setup_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/smpboot_hooks.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_wakecpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/gpio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/irq_vectors_limits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_wakecpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-rdc321x/gpio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-rdc321x/rdc321x_defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/irq_vectors_limits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/cobalt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/entry_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/irq_vectors.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/lithium.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/piix4.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/setup_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/smpboot_hooks.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/do_timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/entry_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/irq_vectors.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/setup_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/math_emu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mc146818rtc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mca.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mca_dma.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mce.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mman.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu_context.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu_context_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu_context_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmx.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmzone.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmzone_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmzone_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/module.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mpspec_def.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msgbuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msidef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msr-index.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msr.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mtrr.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mutex.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mutex_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mutex_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/namei.h exists in filesystem klibc: /usr/lib/klibc/include/asm/nmi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/nops.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numa.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numa_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numa_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numaq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/olpc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/page.h exists in filesystem klibc: /usr/lib/klibc/include/asm/page_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/page_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/param.h exists in filesystem klibc: /usr/lib/klibc/include/asm/paravirt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/parport.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci-direct.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pda.h exists in filesystem klibc: /usr/lib/klibc/include/asm/percpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgalloc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-2level-defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-2level.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-3level-defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-3level.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/poll.h exists in filesystem klibc: /usr/lib/klibc/include/asm/posix_types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/posix_types_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/posix_types_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/prctl.h exists in filesystem klibc: /usr/lib/klibc/include/asm/processor-cyrix.h exists in filesystem klibc: /usr/lib/klibc/include/asm/processor-flags.h exists in filesystem klibc: /usr/lib/klibc/include/asm/processor.h exists in filesystem klibc: /usr/lib/klibc/include/asm/proto.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ptrace-abi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ptrace.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pvclock-abi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pvclock.h exists in filesystem klibc: /usr/lib/klibc/include/asm/reboot.h exists in filesystem klibc: /usr/lib/klibc/include/asm/reboot_fixups.h exists in filesystem klibc: /usr/lib/klibc/include/asm/required-features.h exists in filesystem klibc: /usr/lib/klibc/include/asm/resource.h exists in filesystem klibc: /usr/lib/klibc/include/asm/resume-trace.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rtc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rwlock.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rwsem.h exists in filesystem klibc: /usr/lib/klibc/include/asm/scatterlist.h exists in filesystem klibc: /usr/lib/klibc/include/asm/seccomp.h exists in filesystem klibc: /usr/lib/klibc/include/asm/seccomp_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/seccomp_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sections.h exists in filesystem klibc: /usr/lib/klibc/include/asm/segment.h exists in filesystem klibc: /usr/lib/klibc/include/asm/semaphore.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sembuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/serial.h exists in filesystem klibc: /usr/lib/klibc/include/asm/setup.h exists in filesystem klibc: /usr/lib/klibc/include/asm/shmbuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/shmparam.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sigcontext.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sigcontext32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/siginfo.h exists in filesystem klibc: /usr/lib/klibc/include/asm/signal.h exists in filesystem klibc: /usr/lib/klibc/include/asm/smp.h exists in filesystem klibc: /usr/lib/klibc/include/asm/socket.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sockios.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sparsemem.h exists in filesystem klibc: /usr/lib/klibc/include/asm/spinlock.h exists in filesystem klibc: /usr/lib/klibc/include/asm/spinlock_types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/srat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/stacktrace.h exists in filesystem klibc: /usr/lib/klibc/include/asm/stat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/statfs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/string.h exists in filesystem klibc: /usr/lib/klibc/include/asm/string_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/string_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/suspend.h exists in filesystem klibc: /usr/lib/klibc/include/asm/suspend_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/suspend_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/swiotlb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sync_bitops.h exists in filesystem klibc: /usr/lib/klibc/include/asm/system.h exists in filesystem klibc: /usr/lib/klibc/include/asm/system_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tce.h exists in filesystem klibc: /usr/lib/klibc/include/asm/termbits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/termios.h exists in filesystem klibc: /usr/lib/klibc/include/asm/therm_throt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/thread_info.h exists in filesystem klibc: /usr/lib/klibc/include/asm/thread_info_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/thread_info_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/time.h exists in filesystem klibc: /usr/lib/klibc/include/asm/timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/timex.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tlb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tlbflush.h exists in filesystem klibc: /usr/lib/klibc/include/asm/topology.h exists in filesystem klibc: /usr/lib/klibc/include/asm/trampoline.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tsc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uaccess.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uaccess_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uaccess_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ucontext.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unaligned.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unistd.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unistd_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unistd_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unwind.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uv/uv_hub.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uv/uv_mmrs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vdso.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vga.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vgtod.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vm86.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vmi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vmi_time.h exists in filesystem klibc: /usr/lib/klibc/include/asm/voyager.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vsyscall.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/events.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/grant_table.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/hypercall.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/hypervisor.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/interface.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/page.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xor.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xor_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xor_64.h exists in filesystem errors occurred, no packages were upgraded. The problem seems to be that in the old package /usr/lib/klibc/include/asm is a symlink to another directory which contains these files. In the new package, this symlink is replaced by a directory. pacman thinks that there are file conflicts, while there are none. I cannot find a viable workaround for this.

4 4

[pacman-dev] [PATCH] New sync070.py pactest
by Nagy Gabor 09 Jul '09

09 Jul '09

From cfcaa50b83d6ce09a026e8275f19ce0665365e31 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 2 Jul 2008 17:04:29 +0200 Subject: [PATCH] New sync070.py pactest This pactest tests the cooperation between front-end and back-end in case of "-S provision" operation. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync070.py | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync070.py diff --git a/pactest/tests/sync070.py b/pactest/tests/sync070.py new file mode 100644 index 0000000..2177ea7 --- /dev/null +++ b/pactest/tests/sync070.py @@ -0,0 +1,15 @@ +self.description = "Advanced -S provision test" + +sp1 = pmpkg("pkg", "1.0-1") +self.addpkg2db("sync2", sp1) + +sp2 = pmpkg("pkg", "2.0-1") +sp2.provides = [ "provision" ] +sp2.conflicts = [ "pkg1=1.0-1" ] +self.addpkg2db("sync1", sp2) + +self.args = "-S provision" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg") +self.addrule("PKG_VERSION=pkg|2.0-1") -- 1.5.6.1

2 6

[pacman-dev] [PATCH] Introduce destarch keyword into makepkg
by Thomas Bächler 17 Apr '09

17 Apr '09

If destarch is added to a PKGBUILD, makepkg sets the architecture of the resulting package to $destarch instead of $CARCH. This is useful if you want to cross-create packages for one architecture on the other. Using arch=('i686') destarch='x86_64' makes it possible to build multilib packages and to build grub without the export CARCH="x86_64" hack. --- scripts/makepkg.sh.in | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bce2e6c..c45d7e8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -152,7 +152,7 @@ clean_up() { rm -rf pkg src if [ "$pkgname" != "" ]; then # Can't do this unless the BUILDSCRIPT has been sourced. - rm -f "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*" + rm -f "${pkgname}-${pkgver}-${pkgrel}-${destarch}.log*" fi fi @@ -662,7 +662,7 @@ run_build() { local ret=0 if [ "$LOGGING" = "1" ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${destarch}.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -792,8 +792,8 @@ create_package() { echo "builddate = $builddate" >>.PKGINFO echo "packager = $packager" >>.PKGINFO echo "size = $size" >>.PKGINFO - if [ "$CARCH" != "" ]; then - echo "arch = $CARCH" >>.PKGINFO + if [ "$destarch" != "" ]; then + echo "arch = $destarch" >>.PKGINFO fi if [ "$(check_option force)" = "y" ]; then echo "force = true" >> .PKGINFO @@ -851,7 +851,7 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" - local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" if ! bsdtar -czf "$pkg_file" $comp_files *; then error "$(gettext "Failed to create package file.")" @@ -872,11 +872,11 @@ create_xdelta() { local pkginfo="$(mktemp "$startdir"/xdelta-pkginfo.XXXXXXXXX)" local old_file old_version - for old_file in $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do + for old_file in $(ls {"$cache_dir","$PKGDEST"}/${pkgname}-*-*{,-$destarch}$PKGEXT 2>/dev/null); do bsdtar -xOf "$old_file" .PKGINFO > "$pkginfo" || continue if [ "$(cat "$pkginfo" | grep '^pkgname = ')" != "pkgname = $pkgname" ]; then continue # Package name does not match. - elif [ "$(cat "$pkginfo" | grep '^arch = ')" != "arch = $CARCH" ] ; then + elif [ "$(cat "$pkginfo" | grep '^arch = ')" != "arch = $destarch" ] ; then continue # Not same arch. fi @@ -894,7 +894,7 @@ create_xdelta() { if [ "$base_file" != "" ]; then msg "$(gettext "Making delta from version %s...")" "$latest_version" - local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" + local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$destarch.delta" local ret=0 # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if @@ -984,9 +984,9 @@ install_package() { [ "$INSTALL" = "0" ] && return msg "$(gettext "Installing package ${pkgname} with pacman -U...")" if [ "$ASROOT" = "0" ]; then - sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? + sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT} || exit $? else - pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $? + pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT} || exit $? fi } @@ -1330,6 +1330,10 @@ if [ "$arch" = 'any' ]; then CARCH='any' fi +if [ -z "$destarch" ]; then + destarch="$CARCH" +fi + if ! in_array $CARCH ${arch[@]}; then if [ "$IGNOREARCH" = "0" ]; then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" @@ -1374,7 +1378,7 @@ unset valid_options opt known kopt devel_check devel_update -if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ +if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" \ -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" -a "$NOBUILD" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1402,7 +1406,7 @@ if [ "$INFAKEROOT" = "1" ]; then exit 0 # $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $destarch ($(date))" if [ $EUID -eq 0 ]; then warning "$(gettext "Running makepkg as root...")" @@ -1504,10 +1508,10 @@ else fi fi - create_xdelta "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" + create_xdelta "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${destarch}${PKGEXT}" fi -msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $destarch ($(date))" install_package -- 1.5.6

8 30

[pacman-dev] alpm_list regex matching
by leslie.polzer＠gmx.net 11 Apr '09

11 Apr '09

Hello, inlined diff (p0, hope that's not a problem) adds regex matching to alpm_list; useful for regular expressions in IgnorePkg etc. I'll leave the actual usage up to you and hope it helps somehow :) Leslie -- NEW homepage: https://viridian.dnsalias.net/~sky/homepage/ gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83 Index: lib/libalpm/alpm_list.c =================================================================== RCS file: /home/cvs-pacman/pacman-lib/lib/libalpm/alpm_list.c,v retrieving revision 1.11 diff -a -p -u -r1.11 alpm_list.c --- lib/libalpm/alpm_list.c 11 Mar 2007 21:10:03 -0000 1.11 +++ lib/libalpm/alpm_list.c 14 Apr 2007 19:18:15 -0000 @@ -24,9 +24,11 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <regex.h> /* libalpm */ #include "alpm_list.h" +#include "error.h" #include "util.h" /** \defgroup alpm_list functions */ @@ -458,6 +460,39 @@ int SYMEXPORT alpm_list_find_str(alpm_li return(0); } +/* Test for existence of a string in an alpm_list_t, treating the list + * elements as regular expressions +*/ +/** Is a _string_ in the list (optimization of alpm_list_find for strings) + * @param needle the string to compare + * @param haystack the list to search + * @return 1 if `needle` is found, 0 otherwise + */ + +int SYMEXPORT alpm_list_find_str_regex(alpm_list_t *haystack, const char *needle) +{ + alpm_list_t *lp = haystack; + + while(lp) { + if(lp->data) { + char* targ = lp->data; + regex_t reg; + + _alpm_log(PM_LOG_DEBUG, "matching needle '%s' against haystack item '%s'", + needle, lp->data); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } + + if (regexec(&reg, needle, 0, 0, 0) == 0) { + return(1); + } + } + lp = lp->next; + } + return(0); +} /** * Calculate the items in list `lhs` that are not present in list `rhs` * @note Entries are not duplicated

3 2

[pacman-dev] delta support in libalpm
by Henning Garus 14 Mar '09

14 Mar '09

Hi, I have been looking through the current delta implementation in libalpm and have put some thought into changing makepkg/repo-add to support delta creation. However, I'm running into some problems, mostly due to md5sums and gzip. The current implementation works as follows. On a sync operation it is checked, whether a valid delta path exists and if the summed filesize of the deltas is smaller than the filesize of the whole download. When this is the case the deltas are downloaded and applied to the old file. After that the patched file is treated as if it was downloaded normally, this includes a check of the md5sum. Gzip files have a header, that has a timestamp, which will screw with this md5sum. When a patch is applied to a gzipped file by xdelta, xdelta will unzip the file, apply the patch and then rezip the file. The author of xdelta was obviously aware of the problems with the timestamp, because he decided to leave it empty. The same can be achieved by the -n option of gzip. But there comes the next problem, xdelta uses zlib for compression, gzip implements compression itself. And files created by gzip can differ from files created by zlib. Bsdtar uses zlib as well, but writes the timestamp and there is no option to prevent this (at least none that I can see). There are four ways around this, that I can think of: 1. create the package, then create the delta, apply the delta to the old version, remove the original new package and present the patched package as output I think this sucks, this ties delta creation to makepkg (more about that later) and has an incredibly huge and useless overhead (countless unzips and rezips and applying the patch). 2. create the package, but don't compress it with bsdtar, use gzip -n instead. This means we have to use gzip again, in libalpm, when we apply the delta. Seems better than 1, but makes makepkg and libalpm rely on gzip. Not sure if this is a good thing, especially for libalpm. 3. save the md5sums of the unzipped tars in the synchdb and change libalpm to check those Seems reasonable, but I don't see a way to do this with libarchive, so this would require using zlib directly and pacman would lose the ability to handle to handle tar.bz2 4. Skip checking the md5sum for deltas OK during the initial synch, as long as we trust xdelta to do its job (the md5sums of both the old and the new file are in the delta file). But the created package will have the wrong md5sum and can't be used to reinstall, etc. which makes this look like a bad idea. In a previous mail Xavier toyed with the idea to put delta creation into repo-add, I have given this some thought, as it seems nice in principle, but there are drawbacks. For Arch this would mean creating deltas on Gerolde, which seems to be fairly strained already, according to the dev list. Furthermore this introduces some new variables to repo-add (at least repo location and an output location) this would be manageable, but doesn't look very nice. Delta creation in makepkg seems somehow ok (its already in there after all). But what I would really like is a separate tool for delta creation, which would allow the separation of building packages and creating deltas and setting up a separated delta server. This leaves us with options 2 and 3 and I am not really sure, which way to go. looking forward to your comments

6 40

[pacman-dev] [PATCH 1/5] Fix several issues with xdelta
by Xavier Chantry 01 Mar '09

01 Mar '09

1) The changes to sync.c look big but there are mostly caused by the indentation. Fix a bug where download_size == 0 because the packages and deltas are already in the cache, but we still need to build the deltas list and apply the deltas to create the final package. 2) Fix the gzip / md5sum issue by switching to xdelta3, disabling external recompression and using gzip -n in pacman, and disable bsdtar compression and using gzip -n in makepkg. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/pacman.conf.5.txt | 2 +- lib/libalpm/delta.c | 4 +- lib/libalpm/sync.c | 98 +++++++++++++++++++++++-------------------------- scripts/makepkg.sh.in | 28 +++----------- 4 files changed, 55 insertions(+), 77 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index fa21294..2f1fe3d 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -144,7 +144,7 @@ Options *UseDelta*:: Download delta files instead of complete packages if possible. Requires - the xdelta program to be installed. + the xdelta3 program to be installed. *TotalDownload*:: When downloading, display the amount downloaded, download rate, ETA, diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index ff77501..337eb66 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -232,13 +232,13 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } - _alpm_log(PM_LOG_DEBUG, "started delta shortest-path search\n"); + _alpm_log(PM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to); vertices = delta_graph_init(deltas); bestsize = delta_vert(vertices, to, to_md5, &bestpath); - _alpm_log(PM_LOG_DEBUG, "delta shortest-path search complete\n"); + _alpm_log(PM_LOG_DEBUG, "delta shortest-path search complete : '%lld'\n", (long long)bestsize); alpm_list_free_inner(vertices, _alpm_graph_free); alpm_list_free(vertices); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 709a36d..71d8771 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -725,14 +725,9 @@ static int apply_deltas(pmtrans_t *trans) CALLOC(to, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, 1)); snprintf(to, len, "%s/%s", cachedir, d->to); - /* an example of the patch command: (using /cache for cachedir) - * xdelta patch /path/to/pacman_3.0.0-1_to_3.0.1-1-i686.delta \ - * /path/to/pacman-3.0.0-1-i686.pkg.tar.gz \ - * /cache/pacman-3.0.1-1-i686.pkg.tar.gz - */ - /* build the patch command */ - snprintf(command, PATH_MAX, "xdelta patch %s %s %s", delta, from, to); + /* -R for disabling external recompression with gzip, -c for sending to stdout */ + snprintf(command, PATH_MAX, "xdelta3 -d -q -R -c -s %s %s | gzip -n > %s", from, delta, to); _alpm_log(PM_LOG_DEBUG, _("command: %s\n"), command); @@ -848,29 +843,31 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) fname = alpm_pkg_get_filename(spkg); ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1)); - if(spkg->download_size != 0) { - alpm_list_t *delta_path = spkg->delta_path; - if(delta_path) { - alpm_list_t *dlts = NULL; - - for(dlts = delta_path; dlts; dlts = dlts->next) { - pmdelta_t *d = dlts->data; - - if(d->download_size != 0) { - /* add the delta filename to the download list if - * it's not in the cache */ - files = alpm_list_add(files, strdup(d->delta)); - } - - /* keep a list of the delta files for md5sums */ - deltas = alpm_list_add(deltas, d); + alpm_list_t *delta_path = spkg->delta_path; + if(delta_path) { + /* using deltas */ + alpm_list_t *dlts = NULL; + + for(dlts = delta_path; dlts; dlts = dlts->next) { + pmdelta_t *d = dlts->data; + + if(d->download_size != 0) { + /* add the delta filename to the download list if needed */ + files = alpm_list_add(files, strdup(d->delta)); } - } else { - /* not using deltas, so add the file to the download list */ + /* keep a list of all the delta files for md5sums */ + deltas = alpm_list_add(deltas, d); + } + + } else { + /* not using deltas */ + if(spkg->download_size != 0) { + /* add the filename to the download list if needed */ files = alpm_list_add(files, strdup(fname)); } } + } } @@ -891,37 +888,34 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) handle->totaldlcb(0); } - if(handle->usedelta) { + /* if we have deltas to work with */ + if(handle->usedelta && deltas) { int ret = 0; - - /* only output if there are deltas to work with */ - if(deltas) { - errors = 0; - /* Check integrity of deltas */ - EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL); - - for(i = deltas; i; i = i->next) { - pmdelta_t *d = alpm_list_getdata(i); - const char *filename = alpm_delta_get_filename(d); - const char *md5sum = alpm_delta_get_md5sum(d); - - if(test_md5sum(trans, filename, md5sum) != 0) { - errors++; - *data = alpm_list_add(*data, strdup(filename)); - } - } - if(errors) { - pm_errno = PM_ERR_DLT_INVALID; - goto error; + errors = 0; + /* Check integrity of deltas */ + EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL); + + for(i = deltas; i; i = i->next) { + pmdelta_t *d = alpm_list_getdata(i); + const char *filename = alpm_delta_get_filename(d); + const char *md5sum = alpm_delta_get_md5sum(d); + + if(test_md5sum(trans, filename, md5sum) != 0) { + errors++; + *data = alpm_list_add(*data, strdup(filename)); } - EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_DONE, NULL, NULL); + } + if(errors) { + pm_errno = PM_ERR_DLT_INVALID; + goto error; + } + EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_DONE, NULL, NULL); - /* Use the deltas to generate the packages */ - EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_START, NULL, NULL); - ret = apply_deltas(trans); - EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL); + /* Use the deltas to generate the packages */ + EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_START, NULL, NULL); + ret = apply_deltas(trans); + EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL); - } if(ret) { pm_errno = PM_ERR_DLT_PATCHFAILED; goto error; diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 52e80d1..9e0f249 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -975,7 +975,7 @@ create_package() { # the null string rather than itself shopt -s nullglob - if ! bsdtar -c${TAR_OPT}f "$pkg_file" $comp_files *; then + if ! bsdtar -c${TAR_OPT}f - $comp_files * | gzip -n > "$pkg_file"; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi @@ -985,8 +985,8 @@ create_package() { create_xdelta() { if [ "$(check_buildenv xdelta)" != "y" ]; then return - elif [ ! "$(type -p xdelta)" ]; then - error "$(gettext "Cannot find the xdelta binary! Is xdelta installed?")" + elif [ ! "$(type -p xdelta3)" ]; then + error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" return fi @@ -1020,25 +1020,9 @@ create_xdelta() { local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" local ret=0 - # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if - # TMP_DIR is unset) then perform the delta on the resulting tars - xdelta delta "$base_file" "$pkg_file" "$delta_file" || ret=$? - - if [ $ret -eq 0 -o $ret -eq 1 ]; then - # Generate the final gz using xdelta for compression. xdelta will be our - # common denominator compression utility between the packager and the - # users. makepkg and pacman must use the same compression algorithm or - # the delta generated package may not match, producing md5 checksum - # errors. - msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" - msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" - ret=0 - xdelta patch "$delta_file" "$base_file" "$pkg_file" || ret=$? - if [ $ret -ne 0 ]; then - error "$(gettext "Could not generate the package from the delta.")" - exit 1 - fi - else + xdelta3 -s "$base_file" "$pkg_file" "$delta_file" || ret=$? + + if [ $ret -ne 0 ]; then warning "$(gettext "Delta was not able to be created.")" fi else -- 1.6.1.3

5 20

[pacman-dev] [PATCH 1/6] repo-add: print warning if same version already exists
by Xavier Chantry 01 Mar '09

01 Mar '09

Simple fix for FS#13414 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/repo-add.sh.in | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c6d25aa..b12188c 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -172,12 +172,16 @@ db_write_entry() return 1 fi - # remove an existing entry if it exists, ignore failures - db_remove_entry "$pkgname" - startdir=$(pwd) pushd "$gstmpdir" 2>&1 >/dev/null + if [ -d "$pkgname-$pkgver" ]; then + warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" + fi + + # remove an existing entry if it exists, ignore failures + db_remove_entry "$pkgname" + # create package directory mkdir "$pkgname-$pkgver" cd "$pkgname-$pkgver" -- 1.6.1.3

4 13