April 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] MirrorBrain for mirrors?
by Tim G 03 Jul '09

03 Jul '09

Hey everyone, I am not sure if it has been brought up before, but has anyone thought about providing a MirrorBrain http repository? OpenSUSE has one at http://download.opensuse.org/ and it works quite well. If we are able to provide something like this, it would mean that we could provide transparent mirroring. MirrorBrain even looks after creating mirror lists http://download.opensuse.org/distribution/11.1/iso/openSUSE-11.1-KDE4-LiveCD -i686.iso?mirrorlist Anyways, have a look at it, http://mirrorbrain.org/features -- Tim Groeneveld (Application Developer) Digital Pacific www.digitalpacific.com.au <http://www.digitalpacific.com.au/>

5 5

[pacman-dev] Mime-type filtering?
by Aaron Griffin 30 Jun '09

30 Jun '09

On Mon, Mar 23, 2009 at 5:11 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > 2009/3/23 Samed Beyribey <ras0ir(a)eventualis.org>: >> Well i just noticed that, (probably) mailman rejects my attachment (it >> was 9.5k) >> so i've put it on my web site: >> http://eventualis.org/pacman/0001-fixed-typos-and-alignment-problem-in-Turk… >> >> This is my last mail about this patch, again, i feel so sorry. > > This isn't your fault. > > Aaron, do we not allow gzipped and bzipped files through? I guess not. What's the mime-type for these? Considering mailman uses a whitelist, would anyone be able to construct a decent list that covers pretty much all attachment types we'd want?

3 5

Re: [pacman-dev] [arch-general] "pkgdyn" a set of scripts for analysis of ELF deps in pkgs.
by Aaron Griffin 15 May '09

15 May '09

On Thu, Apr 23, 2009 at 10:45 PM, Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> wrote: > Hi, > > This is a set of draft scripts that I use to find/extract some data of > ELF files from packages. > For example: > > * Find all packages that needed inexistent shared objects because a > soname bump in libraries. > * Generate a report for all packages per repo that in case of soname > bump , needs to be rebuild. > * Find ELF files that are outside the allowed paths (for example ELF in > /usr/share) > * Find RPATH in packages, with a simple "awk" can generate a report etc. > > * Other task with "temporary data generated", but there are no scripts > at this time, are only "at command line runtime". > Can be easily construct with awk, of your preferer lang. > > It use files in analysis so, if a ELF needed a "soname" that are > symlink, this are reported (tho only case here are courier-maildrop, > just ignore it) > > http://archlinux.djgera.com.ar/pkgdyn/ > > Sample data and generated DB by "dynup.bash" is uploaded, extract in > "pkgdyn" directory. > The dyunp.bash can make DB from empty DB, or update the DB, deleting old > entries and inserting news. > > > Is in "public domain": so use it, modify it, copy it, no problem. > Sugestions, improvements, dudes, write me. > > > PS1: Exception here: (this report as missing, but is a "optdepend in > community") > extra/gnome-speech-0.4.25-1:NEEDED libespeak.so.1 > > PS2: All missing deps I already reported and many of [community] have > been fixed. Congrats TU! > > > Cheers, Just replying so I can send this over to the pacman-dev list. This looks great

2 2

[pacman-dev] [PATCH] New feature: files verification
by changaco 04 May '09

04 May '09

>From 7c0348fa499f55968764fef4c7bb3d3d7245932b Mon Sep 17 00:00:00 2001 From: Charly COSTE <changaco(a)laposte.net> Date: Sat, 28 Mar 2009 12:36:23 +0100 Subject: [PATCH] New feature: files verification A new option "-Qy" which checks if the files owned by a/some/all package(s) really are on the system (i.e. not accidentally deleted). http://bugs.archlinux.org/task/13877 Signed-off-by: Charly COSTE <changaco(a)laposte.net> --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 6 +++- src/pacman/query.c | 87 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 466d983..01a1828 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,6 +50,7 @@ typedef struct __config_t { unsigned short op_q_search; unsigned short op_q_changelog; unsigned short op_q_upgrade; + unsigned short op_q_verify; unsigned short op_s_clean; unsigned short op_s_downloadonly; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 59916d6..e1d13a4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -360,6 +360,7 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, + {"verify", no_argument, 0, 'y'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -510,7 +511,10 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_DOWNLOADONLY; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; - case 'y': (config->op_s_sync)++; break; + case 'y': + (config->op_s_sync)++; + config->op_q_verify = 1; + break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 0d48638..2a7dba5 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -334,10 +334,70 @@ static void display(pmpkg_t *pkg) } } +// We loop through the packages and for each packages we loop through files to check if they exist +static void verify(alpm_list_t *pkgs) +{ + alpm_list_t *i, *files, *file, *pkgs2repair; + pmpkg_t *pkg; + struct stat stFileInfo; + int pkgs_n = alpm_list_count(pkgs); + int j = 0, k = 0; + for(i = pkgs; i; i = alpm_list_next(i)) { + j++; + pkg = alpm_list_getdata(i); + char *pkgname = alpm_pkg_get_name(pkg); + if(filter(pkg)) { + files = alpm_pkg_get_files(pkg); + for(file = files; file; file = alpm_list_next(file)){ + char *x = alpm_list_getdata(file); + char *f = malloc (strlen(x)+2); + strcpy(f,"/"); + strcat(f, x); + k++; + if(strncmp(f, "/tmp", 4)==0){ + continue; // ignore files in /tmp + } + if(lstat(f,&stFileInfo) == 0) { // we use lstat to prevent errors from symbolic links + if(!config->quiet){ + fprintf(stderr, "\rfile n°%i (package %i/%i): OK", k, j, pkgs_n); fflush(stdout); + } + } + else { + if(config->quiet){ + fprintf(stderr, "%s %s\n", pkgname, f); fflush(stdout); + } else { + fprintf(stderr, "\rfile n°%i (package %i/%i): Missing file owned by \"%s\": %s\n", k, j, pkgs_n, pkgname, f); fflush(stdout); + } + if(alpm_list_find_ptr(pkgs2repair, pkgname) == NULL) { + pkgs2repair = alpm_list_add(pkgs2repair, pkgname); + } + } + } + } + } + if(!config->quiet){ + fprintf(stderr, "\n"); + } + if(alpm_list_count(pkgs2repair) > 0) { + if(!config->quiet){ + fprintf(stderr, "Damaged packages: "); + } + for(i = pkgs2repair; i; i = alpm_list_next(i)) { + fprintf(stdout, "%s ", alpm_list_getdata(i)); + } + } else { + if(!config->quiet){ + fprintf(stderr, "No damaged packages."); + } + } + fprintf(stdout, "\n"); + fflush(stdout); +} + int pacman_query(alpm_list_t *targets) { int ret = 0; - alpm_list_t *i; + alpm_list_t *i, *pkgs; /* First: operations that do not require targets */ @@ -363,18 +423,20 @@ int pacman_query(alpm_list_t *targets) } /* operations on all packages in the local DB - * valid: no-op (plain -Q), list, info + * valid: no-op (plain -Q), list, info, verify * invalid: isfile, owns */ if(targets == NULL) { if(config->op_q_isfile || config->op_q_owns) { pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); return(1); - } - - for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { - pmpkg_t *pkg = alpm_list_getdata(i); - if(filter(pkg)) { - display(pkg); + } else if(config->op_q_verify) { + verify(alpm_db_get_pkgcache(db_local)); + } else { + for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); + if(filter(pkg)) { + display(pkg); + } } } return(0); @@ -389,7 +451,7 @@ int pacman_query(alpm_list_t *targets) } /* operations on named packages in the local DB - * valid: no-op (plain -Q), list, info */ + * valid: no-op (plain -Q), list, info, verify */ for(i = targets; i; i = alpm_list_next(i)) { char *strname = alpm_list_getdata(i); pmpkg_t *pkg = NULL; @@ -406,8 +468,12 @@ int pacman_query(alpm_list_t *targets) continue; } + if(filter(pkg)) { display(pkg); + if(config->op_q_verify){ + pkgs = alpm_list_add(pkgs, pkg); + } } if(config->op_q_isfile) { @@ -415,6 +481,9 @@ int pacman_query(alpm_list_t *targets) pkg = NULL; } } + if(config->op_q_verify){ + verify(pkgs); + } return(ret); } -- 1.6.2.1 Créez votre adresse électronique prenom.nom(a)laposte.net 1 Go d'espace de stockage, anti-spam et anti-virus intégrés.

7 21

Re: [pacman-dev] [PATCH] Fix a possible bash-4.0 problem in makepkg
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 28 Apr '09

28 Apr '09

Am Dienstag, den 28.04.2009, 14:26 +1000 schrieb Allan McRae: > Aaron Griffin wrote: > > On Sun, Apr 26, 2009 at 9:39 AM, Marc - A. Dahlhaus <mad(a)wol.de> wrote: > > > >> Dan McGee schrieb: > >> > >>> On Sun, Apr 26, 2009 at 9:04 AM, Marc - A. Dahlhaus <mad(a)wol.de> wrote: > >>> > >>> > >>>> Allan McRae schrieb: > >>>> > >>>> > >>>>> Marc - A. Dahlhaus wrote: > >>>>> > >>>>> > >>>>>> Hello, > >>>>>> > >>>>>> i've spotted a problem in makepkg's cleanup part if the host is running > >>>>>> bash-4.0. > >>>>>> As makepkg runs bash with option -e, on bash-4.0 it fails if strip > >>>>>> reports an unsupported binary. > >>>>>> The following trivial patch fixes the problem. > >>>>>> > >>>>>> Signed-off-by: "Marc - A. Dahlhaus" <mad(a)wol.de> > >>>>>> > >>>>>> --- pacman-3.2.2.orig/scripts/makepkg.sh.in > >>>>>> +++ pacman-3.2.2/scripts/makepkg.sh.in > >>>>>> @@ -766,11 +766,11 @@ tidy_install() { > >>>>>> find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; > >>>>>> do > >>>>>> case "$(file -biz "$binary")" in > >>>>>> *application/x-sharedlib*) # Libraries (.so) > >>>>>> - /usr/bin/strip --strip-debug "$binary";; > >>>>>> + /usr/bin/strip --strip-debug "$binary" || true;; > >>>>>> *application/x-archive*) # Libraries (.a) > >>>>>> - /usr/bin/strip --strip-debug "$binary";; > >>>>>> + /usr/bin/strip --strip-debug "$binary" || true;; > >>>>>> *application/x-executable*) # Binaries > >>>>>> - /usr/bin/strip "$binary";; > >>>>>> + /usr/bin/strip "$binary" || true;; > >>>>>> esac > >>>>>> done > >>>>>> fi > >>>>>> > >>>>>> > >>>>> I don't think this is a good approach to the problem. Having "|| true" > >>>>> means if there is a real problem, then it gets ignored. > >>>>> > >>>>> > >>>> What real problem could arise? > >>>> An unsupported binary? Would print errors but creates the package mostly > >>>> stripped. > >>>> A missing strip command? Would print errors but creates the package > >>>> unstripped. > >>>> A damaged storage... but i think in that case makepkg would have failed > >>>> in > >>>> the actual build step and not in cleanup. > >>>> > >>>> > >>>>> I suppose the real question is: How do you actually get an unsupported > >>>>> binary? My guess is this occurs when building a package from a binary > >>>>> source, in which case "options=('!strip')" would be the solution. > >>>>> > >>>>> > >>>> The package that triggered this, was xen. > >>>> xen installs some gzipped content inside /usr/lib which strip doesn't > >>>> support. > >>>> > >>>> $ file -biz usr/lib/xen/boot/ioemu-stubdom.gz > >>>> application/x-executable; charset=binary > >>>> compressed-encoding=application/x-gzip; charset=binary; charset=binary > >>>> > >>>> The file itself is a bootable image file for grub. > >>>> > >>>> The library strip lines are not needed. > >>>> What about a case which catches *"*compressed-encoding*" and continues > >>>> with > >>>> the next file?* > >>>> > >>>> > >>> I'm with Allan here- we should fix the real problem rather than adding > >>> a "|| true" and calling it a day. > >>> > >>> > >> This was an ugly hack, i know, hence the last few lines of my message. > >> > >>> I wouldn't be against an exclusion of "compressed-encoding=" when > >>> running strip- Allan, what do you think? The easiest way of > >>> implementing this would be to make it the first case and make it a > >>> no-op. > >>> > >> Thats what i had in mind. > >> > >> I'll do a complete rebuild of all packages and grep for unsupported binarys > >> in the logs. > >> There might be some other types where this could bite us. I'll report back > >> after that. $ grep "File format not recognized" makepkg.log /usr/bin/strip:usr/lib/xen/boot/ioemu-stubdom.gz: File format not recognized /usr/bin/strip:usr/lib/xen/boot/pv-grub-x86_32.gz: File format not recognized /usr/bin/strip:usr/lib/xen/boot/pv-grub-x86_64.gz: File format not recognized Looks like it's a xen only problem as no other package deploys compressed contents in searchpath. > > Is it actually strip-able? Could we actually unpack it (based on the > > compressed-encoding), strip it, and repack? > > I had that thought initially and then thought that would be a major > pain. I'm quite happy with detecting compressed files and skipping > them. But if someone goes ahead and implements that, at this stage I see > no reason not to include it. It just won't be me... > > Allan I don't think that it would work for xen as the files are bootable images that could depend on size and or symbols that we might strip out. An updated patch is attached. Marc

1 1