May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit elfutils for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package elfutils for openSUSE:Factory checked in at Mon May 2 11:57:46 CEST 2011. -------- --- elfutils/elfutils.changes 2010-09-21 00:49:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/elfutils/elfutils.changes 2011-04-28 19:48:06.000000000 +0200 @@ -1,0 +2,24 @@ +Wed Apr 27 00:35:22 UTC 2011 - tonyj(a)novell.com + +- Upgrade to 0.152, upstream changelog: + - Various build and warning nits fixed for newest GCC and Autoconf. + - libdwfl: Yet another prelink-related fix for another regression. + Look for Linux kernel images in files named with compression + suffixes. + - elfcmp: New flag --ignore-build-id to ignore differing build ID bits. + New flag -l/--verbose to print all differences. + +------------------------------------------------------------------- +Fri Jan 21 22:02:25 UTC 2011 - tonyj(a)novell.com + +- Update to 0.151 +- Upstream changelog for 0.151/0.150 + - libdwfl: Fix for more prelink cases with separate debug file. + - eu-strip: New flag --strip-sections to remove section headers entirely. + - libdwfl: Remove bogus assert. + - libdw: Fix for handling huge .debug_aranges section. + - libdwfl: Fix for handling prelinked DSO with separate debug file. + - findtextrel: Fix diagnostics to work with usual section ordering. + - libebl: i386 backend fix for multi-register integer return value location + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- elfutils-0.149.tar.bz2 New: ---- elfutils-0.152.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elfutils.spec ++++++ --- /var/tmp/diff_new_pack.rnvSa8/_old 2011-05-02 11:54:53.000000000 +0200 +++ /var/tmp/diff_new_pack.rnvSa8/_new 2011-05-02 11:54:53.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package elfutils (Version 0.149) +# spec file for package elfutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: elfutils License: GPLv2 ; GPLv2+ ; LGPLv2.1+ -Version: 0.149 +Version: 0.152 Release: 1 Summary: Higher-level library to access ELF Group: System/Libraries ++++++ elfutils-0.149.tar.bz2 -> elfutils-0.152.tar.bz2 ++++++ ++++ 32151 lines of diff (skipped) ++++++ elfutils-portability.patch ++++++ --- /var/tmp/diff_new_pack.rnvSa8/_old 2011-05-02 11:54:54.000000000 +0200 +++ /var/tmp/diff_new_pack.rnvSa8/_new 2011-05-02 11:54:54.000000000 +0200 @@ -1,22 +1,22 @@ From: Tony Jones <tonyj(a)suse.de> Subject: Elfutils portability patch -Version: 0.149 -References: https://fedorahosted.org/releases/e/l/elfutils/0.149/elfutils-portability.p… +Version: 0.152 +References: https://fedorahosted.org/releases/e/l/elfutils/0.152/elfutils-portability.p… Upstream: yes This patch contains portability fixes that are regarded as generally useful by the community but are not accepted by the elfutils maintainer (and are therefore not in the git repository). -Following change is removed from the patch (as Factory is built using +Following change is removed from the patch (as Factory is built using GNU_SOURCE and thus %a is interpreted as having a float param): -+ * addr2line.c (handle_address): Use %a instead of %m for compatibility. ++ * addr2line.c (handle_address): Use %a instead of %m for compatibility. + --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -106,6 +106,10 @@ +@@ -111,6 +111,10 @@ * ppc_attrs.c (ppc_check_object_attribute): Handle tag GNU_Power_ABI_Struct_Return. @@ -27,7 +27,7 @@ 2008-10-04 Ulrich Drepper <drepper(a)redhat.com> * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and -@@ -433,6 +437,11 @@ +@@ -438,6 +442,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -39,7 +39,7 @@ 2005-11-19 Roland McGrath <roland(a)redhat.com> * ppc64_reloc.def: REL30 -> ADDR30. -@@ -455,6 +464,9 @@ +@@ -460,6 +469,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -98,7 +98,7 @@ libebl_i386.so: $(cpu_i386) --- elfutils/ChangeLog +++ elfutils/ChangeLog -@@ -7,6 +7,10 @@ +@@ -13,6 +13,10 @@ * configure.ac (LOCALEDIR, DATADIRNAME): Removed. @@ -109,7 +109,7 @@ 2009-09-21 Ulrich Drepper <drepper(a)redhat.com> * configure.ac: Update for more modern autoconf. -@@ -15,6 +19,10 @@ +@@ -21,6 +25,10 @@ * configure.ac (zip_LIBS): Check for liblzma too. @@ -120,7 +120,7 @@ 2009-04-19 Roland McGrath <roland(a)redhat.com> * configure.ac (eu_version): Round down here, not in version.h macros. -@@ -26,6 +34,8 @@ +@@ -32,6 +40,8 @@ 2009-01-23 Roland McGrath <roland(a)redhat.com> @@ -129,7 +129,7 @@ * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3. * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of -@@ -106,6 +116,10 @@ +@@ -112,6 +122,10 @@ * configure.ac: Add dummy automake conditional to get dependencies for non-generic linker right. See src/Makefile.am. @@ -140,7 +140,7 @@ 2005-11-18 Roland McGrath <roland(a)redhat.com> * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -153,6 +167,17 @@ +@@ -159,6 +173,17 @@ * Makefile.am (all_SUBDIRS): Add libdwfl. * configure.ac: Write libdwfl/Makefile. @@ -224,8 +224,8 @@ LEXLIB LEX_OUTPUT_ROOT LEX -@@ -3852,6 +3854,130 @@ if test "x$ac_cv_c99" != xyes; then : - as_fn_error "gcc with C99 support required" "$LINENO" 5 +@@ -3856,6 +3858,130 @@ if test "x$ac_cv_c99" != xyes; then : + as_fn_error $? "gcc with C99 support required" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5 @@ -355,13 +355,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5 $as_echo_n "checking for __thread support... " >&6; } if test "${ac_cv_tls+set}" = set; then : -@@ -3888,7 +4014,13 @@ fi +@@ -3892,7 +4018,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5 $as_echo "$ac_cv_tls" >&6; } if test "x$ac_cv_tls" != xyes; then : -- as_fn_error "__thread support required" "$LINENO" 5 +- as_fn_error $? "__thread support required" "$LINENO" 5 + if test "$use_locks" = yes; then : -+ as_fn_error "--enable-thread-safety requires __thread support" "$LINENO" 5 ++ as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5 +else + +$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h @@ -370,16 +370,16 @@ fi # Check whether --enable-largefile was given. -@@ -4874,7 +5006,7 @@ ac_config_files="$ac_config_files versio +@@ -4878,7 +5010,7 @@ ac_config_files="$ac_config_files versio # 1.234<whatever> -> 1234<whatever> case "$PACKAGE_VERSION" in -[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;; +[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; - *) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; + *) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; esac case "$eu_version" in -@@ -4903,7 +5035,7 @@ case "$eu_version" in +@@ -4907,7 +5039,7 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. @@ -390,7 +390,7 @@ # This file is a shell script that caches the results of configure --- elfutils/configure.ac +++ elfutils/configure.ac -@@ -73,6 +73,54 @@ CFLAGS="$old_CFLAGS"]) +@@ -70,6 +70,54 @@ CFLAGS="$old_CFLAGS"]) AS_IF([test "x$ac_cv_c99" != xyes], AC_MSG_ERROR([gcc with C99 support required])) @@ -445,7 +445,7 @@ AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl # Use the same flags that we use for our DSOs, so the test is representative. # Some old compiler/linker/libc combinations fail some ways and not others. -@@ -88,7 +136,10 @@ static __thread int a; int foo (int b) { +@@ -85,7 +133,10 @@ static __thread int a; int foo (int b) { CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"]) AS_IF([test "x$ac_cv_tls" != xyes], @@ -457,7 +457,7 @@ dnl This test must come as early as possible after the compiler configuration dnl tests, because the choice of the file model can (in principle) affect -@@ -251,7 +302,7 @@ AC_SUBST([eu_version]) +@@ -248,7 +299,7 @@ AC_SUBST([eu_version]) # 1.234<whatever> -> 1234<whatever> case "$PACKAGE_VERSION" in @@ -466,7 +466,7 @@ *) AC_MSG_ERROR([confused by version number '$PACKAGE_VERSION']) ;; esac case "$eu_version" in -@@ -280,6 +331,6 @@ case "$eu_version" in +@@ -277,6 +328,6 @@ case "$eu_version" in esac # Round up to the next release API (x.y) version. @@ -547,7 +547,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libasm/ChangeLog +++ elfutils/libasm/ChangeLog -@@ -67,6 +67,11 @@ +@@ -71,6 +71,11 @@ * asm_error.c: Add new error ASM_E_IOERROR. * libasmP.h: Add ASM_E_IOERROR definition. @@ -649,7 +649,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -299,6 +299,10 @@ +@@ -308,6 +308,10 @@ * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. @@ -660,7 +660,7 @@ 2009-08-10 Roland McGrath <roland(a)redhat.com> * dwarf_getscopevar.c: Use dwarf_diename. -@@ -1067,6 +1071,11 @@ +@@ -1076,6 +1080,11 @@ 2005-05-31 Roland McGrath <roland(a)redhat.com> @@ -712,7 +712,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -1283,6 +1283,11 @@ +@@ -1366,6 +1366,11 @@ 2005-07-21 Roland McGrath <roland(a)redhat.com> @@ -794,7 +794,7 @@ @MUDFLAP_FALSE@libmudflap = --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -666,6 +666,11 @@ +@@ -671,6 +671,11 @@ * elf.h: Update from glibc. @@ -891,7 +891,7 @@ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -220,8 +220,16 @@ +@@ -260,8 +260,16 @@ * readelf.c (attr_callback): Use print_block only when we don't use print_ops. @@ -908,7 +908,7 @@ * ar.c (do_oper_extract): Use pathconf instead of statfs. 2009-08-01 Ulrich Drepper <drepper(a)redhat.com> -@@ -568,6 +578,11 @@ +@@ -608,6 +618,11 @@ that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really is valid in RELRO. @@ -920,7 +920,7 @@ 2008-02-29 Roland McGrath <roland(a)redhat.com> * readelf.c (print_attributes): Add a cast. -@@ -819,6 +834,8 @@ +@@ -859,6 +874,8 @@ * readelf.c (hex_dump): Fix rounding error in whitespace calculation. @@ -929,7 +929,7 @@ 2007-10-15 Roland McGrath <roland(a)redhat.com> * make-debug-archive.in: New file. -@@ -1258,6 +1275,10 @@ +@@ -1298,6 +1315,10 @@ * elflint.c (valid_e_machine): Add EM_ALPHA. Reported by Christian Aichinger <Greek0(a)gmx.net>. @@ -940,7 +940,7 @@ 2006-08-08 Ulrich Drepper <drepper(a)redhat.com> * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -1334,6 +1355,10 @@ +@@ -1374,6 +1395,10 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. @@ -951,7 +951,7 @@ 2006-06-12 Ulrich Drepper <drepper(a)redhat.com> * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -1682,6 +1707,11 @@ +@@ -1722,6 +1747,11 @@ * readelf.c (print_debug_loc_section): Fix indentation for larger address size. @@ -965,7 +965,7 @@ * readelf.c (print_debug_line_section): Print section offset of each --- elfutils/src/findtextrel.c +++ elfutils/src/findtextrel.c -@@ -490,7 +490,11 @@ ptrcompare (const void *p1, const void * +@@ -504,7 +504,11 @@ ptrcompare (const void *p1, const void * static void @@ -1137,7 +1137,7 @@ /* Name and version of program. */ static void print_version (FILE *stream, struct argp_state *state); -@@ -301,8 +307,18 @@ process_file (const char *fname) +@@ -311,8 +317,18 @@ process_file (const char *fname) /* If we have to preserve the timestamp, we need it in the format utimes() understands. */ @@ -1156,7 +1156,7 @@ } /* Open the file. */ -@@ -1747,7 +1763,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1809,7 +1825,7 @@ while computing checksum for debug infor /* If requested, preserve the timestamp. */ if (tvp != NULL) { @@ -1165,7 +1165,7 @@ { error (0, errno, gettext ("\ cannot set access and modification date of '%s'"), -@@ -1804,7 +1820,7 @@ handle_ar (int fd, Elf *elf, const char +@@ -1866,7 +1882,7 @@ handle_ar (int fd, Elf *elf, const char if (tvp != NULL) { @@ -1176,7 +1176,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -154,6 +154,8 @@ +@@ -205,6 +205,8 @@ 2008-01-21 Roland McGrath <roland(a)redhat.com> @@ -1185,7 +1185,7 @@ * testfile45.S.bz2: Add tests for cltq, cqto. * testfile45.expect.bz2: Adjust. -@@ -862,6 +864,11 @@ +@@ -913,6 +915,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. ++++++ elfutils-robustify.patch ++++++ --- /var/tmp/diff_new_pack.rnvSa8/_old 2011-05-02 11:54:54.000000000 +0200 +++ /var/tmp/diff_new_pack.rnvSa8/_new 2011-05-02 11:54:54.000000000 +0200 @@ -1,16 +1,16 @@ From: Tony Jones <tonyj(a)suse.de> -Subject: Elfutils robustify patch -Version: 0.149 -References: https://fedorahosted.org/releases/e/l/elfutils/0.149/elfutils-robustify.pat… +Subject: Elfutils robustify patch +Version: 0.152 +References: https://fedorahosted.org/releases/e/l/elfutils/0.152/elfutils-robustify.pat… Upstream: yes -This patch contains functional/stability fixes that are regarded as generally -useful by the community but are not accepted by the elfutils maintainer (and -are therefore not in the git repository). +This patch contains functional/stability fixes that are regarded as generally +useful by the community but are not accepted by the elfutils maintainer (and +are therefore not in the git repository). --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -658,10 +658,53 @@ +@@ -663,10 +663,53 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -875,7 +875,7 @@ #endif /* libelfP.h */ --- elfutils/src/ChangeLog +++ elfutils/src/ChangeLog -@@ -1670,6 +1670,16 @@ +@@ -1710,6 +1710,16 @@ object symbols or symbols with unknown type. (check_rel): Likewise. @@ -892,7 +892,7 @@ 2005-06-08 Roland McGrath <roland(a)redhat.com> * readelf.c (print_ops): Add consts. -@@ -1715,6 +1725,19 @@ +@@ -1755,6 +1765,19 @@ * readelf.c (dwarf_tag_string): Add new tags. @@ -987,7 +987,7 @@ } if (sym->st_shndx == SHN_XINDEX) -@@ -1038,9 +1048,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1039,9 +1049,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Shdr rcshdr_mem; const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem); @@ -1001,7 +1001,7 @@ { /* Found the dynamic section. Look through it. */ Elf_Data *d = elf_getdata (scn, NULL); -@@ -1050,7 +1062,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e +@@ -1051,7 +1063,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem); @@ -1012,7 +1012,7 @@ if (dyn->d_tag == DT_RELCOUNT) { -@@ -1064,7 +1078,9 @@ section [%2d] '%s': DT_RELCOUNT used for +@@ -1065,7 +1079,9 @@ section [%2d] '%s': DT_RELCOUNT used for /* Does the number specified number of relative relocations exceed the total number of relocations? */ @@ -1023,7 +1023,7 @@ ERROR (gettext ("\ section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"), idx, section_name (ebl, idx), -@@ -1224,7 +1240,8 @@ section [%2d] '%s': no relocations for m +@@ -1225,7 +1241,8 @@ section [%2d] '%s': no relocations for m } } @@ -1033,7 +1033,7 @@ ERROR (gettext (reltype == ELF_T_RELA ? "\ section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\ section [%2d] '%s': section entry size does not match ElfXX_Rel\n"), -@@ -1447,7 +1464,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G +@@ -1448,7 +1465,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1043,7 +1043,7 @@ { GElf_Rela rela_mem; GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem); -@@ -1497,7 +1515,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE +@@ -1498,7 +1516,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE Elf_Data *symdata = elf_getdata (symscn, NULL); enum load_state state = state_undecided; @@ -1053,7 +1053,7 @@ { GElf_Rel rel_mem; GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem); -@@ -1600,7 +1619,8 @@ section [%2d] '%s': referenced as string +@@ -1597,7 +1616,8 @@ section [%2d] '%s': referenced as string shdr->sh_link, section_name (ebl, shdr->sh_link), idx, section_name (ebl, idx)); @@ -1063,7 +1063,7 @@ ERROR (gettext ("\ section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"), idx, section_name (ebl, idx)); -@@ -1610,7 +1630,7 @@ section [%2d] '%s': section entry size d +@@ -1607,7 +1627,7 @@ section [%2d] '%s': section entry size d idx, section_name (ebl, idx)); bool non_null_warned = false; @@ -1072,7 +1072,7 @@ { GElf_Dyn dyn_mem; GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem); -@@ -1891,6 +1911,8 @@ section [%2d] '%s': entry size does not +@@ -1879,6 +1899,8 @@ section [%2d] '%s': entry size does not idx, section_name (ebl, idx)); if (symshdr != NULL @@ -1081,7 +1081,7 @@ && (shdr->sh_size / shdr->sh_entsize < symshdr->sh_size / symshdr->sh_entsize)) ERROR (gettext ("\ -@@ -1917,6 +1939,12 @@ section [%2d] '%s': extended section ind +@@ -1905,6 +1927,12 @@ section [%2d] '%s': extended section ind } Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL); @@ -1094,7 +1094,7 @@ if (*((Elf32_Word *) data->d_buf) != 0) ERROR (gettext ("symbol 0 should have zero extended section index\n")); -@@ -1959,7 +1987,7 @@ section [%2d] '%s': hash table section i +@@ -1947,7 +1975,7 @@ section [%2d] '%s': hash table section i size_t maxidx = nchain; @@ -1103,7 +1103,7 @@ { size_t symsize = symshdr->sh_size / symshdr->sh_entsize; -@@ -1970,18 +1998,28 @@ section [%2d] '%s': hash table section i +@@ -1958,18 +1986,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1134,7 +1134,7 @@ } -@@ -2011,18 +2049,28 @@ section [%2d] '%s': hash table section i +@@ -1999,18 +2037,28 @@ section [%2d] '%s': hash table section i maxidx = symsize; } @@ -1166,7 +1166,7 @@ } -@@ -2047,7 +2095,7 @@ section [%2d] '%s': bitmask size not pow +@@ -2035,7 +2083,7 @@ section [%2d] '%s': bitmask size not pow if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)) { ERROR (gettext ("\ @@ -1175,7 +1175,7 @@ idx, section_name (ebl, idx), (long int) shdr->sh_size, (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))); return; -@@ -2719,8 +2767,9 @@ section [%2d] '%s' refers in sh_link to +@@ -2707,8 +2755,9 @@ section [%2d] '%s' refers in sh_link to /* The number of elements in the version symbol table must be the same as the number of symbols. */ @@ -1402,7 +1402,7 @@ "\ --- elfutils/src/strip.c +++ elfutils/src/strip.c -@@ -545,6 +545,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -555,6 +555,11 @@ handle_elf (int fd, Elf *elf, const char goto fail_close; } @@ -1414,7 +1414,7 @@ /* Storage for section information. We leave room for two more entries since we unconditionally create a section header string table. Maybe some weird tool created an ELF file without one. -@@ -566,7 +571,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -576,7 +581,7 @@ handle_elf (int fd, Elf *elf, const char { /* This should always be true (i.e., there should not be any holes in the numbering). */ @@ -1423,7 +1423,7 @@ shdr_info[cnt].scn = scn; -@@ -579,6 +584,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -589,6 +594,7 @@ handle_elf (int fd, Elf *elf, const char shdr_info[cnt].shdr.sh_name); if (shdr_info[cnt].name == NULL) { @@ -1431,7 +1431,7 @@ error (0, 0, gettext ("illformed file '%s'"), fname); goto fail_close; } -@@ -588,6 +594,8 @@ handle_elf (int fd, Elf *elf, const char +@@ -598,6 +604,8 @@ handle_elf (int fd, Elf *elf, const char /* Remember the shdr.sh_link value. */ shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link; @@ -1440,7 +1440,7 @@ /* Sections in files other than relocatable object files which are not loaded can be freely moved by us. In relocatable -@@ -600,7 +608,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -610,7 +618,7 @@ handle_elf (int fd, Elf *elf, const char appropriate reference. */ if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX)) { @@ -1449,7 +1449,7 @@ shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt; } else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP)) -@@ -617,7 +625,12 @@ handle_elf (int fd, Elf *elf, const char +@@ -627,7 +635,12 @@ handle_elf (int fd, Elf *elf, const char for (inner = 1; inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word); ++inner) @@ -1462,7 +1462,7 @@ if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0)) /* If the section group contains only one element and this -@@ -628,7 +641,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -638,7 +651,7 @@ handle_elf (int fd, Elf *elf, const char } else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym)) { @@ -1471,7 +1471,7 @@ shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt; } -@@ -636,7 +649,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -646,7 +659,7 @@ handle_elf (int fd, Elf *elf, const char discarded right away. */ if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0) { @@ -1480,7 +1480,7 @@ if (shdr_info[shdr_info[cnt].group_idx].idx == 0) { -@@ -711,11 +724,15 @@ handle_elf (int fd, Elf *elf, const char +@@ -722,11 +735,15 @@ handle_elf (int fd, Elf *elf, const char { /* If a relocation section is marked as being removed make sure the section it is relocating is removed, too. */ @@ -1498,7 +1498,7 @@ if (shdr_info[cnt].idx == 1) { -@@ -742,7 +759,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -753,7 +770,7 @@ handle_elf (int fd, Elf *elf, const char if (shdr_info[cnt].symtab_idx != 0 && shdr_info[shdr_info[cnt].symtab_idx].data == NULL) { @@ -1507,7 +1507,7 @@ shdr_info[shdr_info[cnt].symtab_idx].data = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, -@@ -782,6 +799,9 @@ handle_elf (int fd, Elf *elf, const char +@@ -793,6 +810,9 @@ handle_elf (int fd, Elf *elf, const char else if (scnidx == SHN_XINDEX) scnidx = xndx; @@ -1517,7 +1517,7 @@ if (shdr_info[scnidx].idx == 0) /* This symbol table has a real symbol in a discarded section. So preserve the -@@ -812,12 +832,16 @@ handle_elf (int fd, Elf *elf, const char +@@ -823,12 +843,16 @@ handle_elf (int fd, Elf *elf, const char } /* Handle references through sh_info. */ @@ -1536,7 +1536,7 @@ /* Mark the section as investigated. */ shdr_info[cnt].idx = 2; -@@ -956,7 +980,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -967,7 +991,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"), elf_errmsg (-1)); @@ -1545,7 +1545,7 @@ /* Add this name to the section header string table. */ shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0); -@@ -993,7 +1017,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1004,7 +1028,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while create section header section: %s"), elf_errmsg (-1)); @@ -1554,7 +1554,7 @@ shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn); if (shdr_info[cnt].data == NULL) -@@ -1049,7 +1073,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1060,7 +1084,7 @@ handle_elf (int fd, Elf *elf, const char error (EXIT_FAILURE, 0, gettext ("while create section header section: %s"), elf_errmsg (-1)); @@ -1563,7 +1563,7 @@ /* Finalize the string table and fill in the correct indices in the section headers. */ -@@ -1139,20 +1163,20 @@ handle_elf (int fd, Elf *elf, const char +@@ -1150,20 +1174,20 @@ handle_elf (int fd, Elf *elf, const char shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, NULL); @@ -1587,7 +1587,7 @@ >= shdr_info[cnt].data->d_size / elsize); } -@@ -1207,7 +1231,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1218,7 +1242,7 @@ handle_elf (int fd, Elf *elf, const char sec = shdr_info[sym->st_shndx].idx; else { @@ -1596,7 +1596,7 @@ sec = shdr_info[xshndx].idx; } -@@ -1228,7 +1252,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1239,7 +1263,7 @@ handle_elf (int fd, Elf *elf, const char nxshndx = sec; } @@ -1605,7 +1605,7 @@ if ((inner != destidx || nshndx != sym->st_shndx || (shndxdata != NULL && nxshndx != xshndx)) -@@ -1252,7 +1276,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1263,7 +1287,7 @@ handle_elf (int fd, Elf *elf, const char || shdr_info[cnt].debug_data == NULL) /* This is a section symbol for a section which has been removed. */ @@ -1614,7 +1614,7 @@ } if (destidx != inner) -@@ -1439,11 +1463,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -1450,11 +1474,11 @@ handle_elf (int fd, Elf *elf, const char { GElf_Sym sym_mem; GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); @@ -1628,7 +1628,7 @@ size_t hidx = elf_hash (name) % nbucket; if (bucket[hidx] == 0) -@@ -1462,7 +1486,7 @@ handle_elf (int fd, Elf *elf, const char +@@ -1473,7 +1497,7 @@ handle_elf (int fd, Elf *elf, const char else { /* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */ @@ -1637,7 +1637,7 @@ == sizeof (Elf64_Xword)); Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf; -@@ -1493,11 +1517,11 @@ handle_elf (int fd, Elf *elf, const char +@@ -1504,11 +1528,11 @@ handle_elf (int fd, Elf *elf, const char { GElf_Sym sym_mem; GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit findutils for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package findutils for openSUSE:Factory checked in at Mon May 2 11:54:41 CEST 2011. -------- --- findutils/findutils.changes 2010-11-17 14:13:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/findutils/findutils.changes 2011-04-29 17:31:27.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 29 17:29:58 CEST 2011 - pth(a)suse.de + +- findutils-locate needs find so require findutils. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ findutils.spec ++++++ --- /var/tmp/diff_new_pack.Ouajpo/_old 2011-05-02 11:54:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Ouajpo/_new 2011-05-02 11:54:23.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package findutils (Version 4.4.2) +# spec file for package findutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ License: GPLv3+ Group: Productivity/File utilities Version: 4.4.2 -Release: 9 +Release: 14 Summary: The GNU versions of find utilities (find and xargs) # retreived from http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz Source: findutils-%{version}.tar.bz2 @@ -72,7 +72,7 @@ Group: Productivity/File utilities Provides: findutils:/usr/bin/locate PreReq: %{fillup_prereq} -Requires: cron +Requires: cron findutils = %{version} %description locate This package contains the locate program which is part of the GNU ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openvas-scanner for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package openvas-scanner for openSUSE:Factory checked in at Mon May 2 09:19:54 CEST 2011. -------- --- openvas-scanner/openvas-scanner.changes 2011-02-23 19:52:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/openvas-scanner/openvas-scanner.changes 2011-04-11 20:07:18.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 11 17:25:46 UTC 2011 - bitshuffler(a)opensuse.org + +- Updated to 3.2.3 + * Fixed: Three potential resource leaks. + * Fixed: Generation of code documentation. + * Updated: Feed synchronization scripts. + * Changed: The openvas-nvt-sync script will now perform the initial feed + synchronization via HTTP instead of rsync. + * Changed: The openvas-nvt-sync script will now default to synchronize into the + NVT directory used by the OpenVAS Scanner instead of the one defined at + compile time. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openvas-scanner-3.2.2.tar.gz New: ---- openvas-scanner-3.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openvas-scanner.spec ++++++ --- /var/tmp/diff_new_pack.l38kE7/_old 2011-05-02 09:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.l38kE7/_new 2011-05-02 09:19:22.000000000 +0200 @@ -19,7 +19,7 @@ Name: openvas-scanner -Version: 3.2.2 +Version: 3.2.3 Release: 1 License: GPLv2 Group: Productivity/Networking/Security ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.l38kE7/_old 2011-05-02 09:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.l38kE7/_new 2011-05-02 09:19:22.000000000 +0200 @@ -1,3 +1,17 @@ +openvas-scanner (3.2.3-1) UNRELEASED; urgency=low + + * New upstream release + - Fixed: Three potential resource leaks. + - Fixed: Generation of code documentation. + - Updated: Feed synchronization scripts. + - Changed: The openvas-nvt-sync script will now perform the initial feed + synchronization via HTTP instead of rsync. + - Changed: The openvas-nvt-sync script will now default to synchronize into the + NVT directory used by the OpenVAS Scanner instead of the one defined at + compile time. + + -- Stephan Kleine <bitshuffler(a)opensuse.org> Mon, 11 Apr 2011 19:26:36 +0200 + openvas-scanner (3.2.2-1) UNRELEASED; urgency=low * New upstream release ++++++ openvas-scanner-3.2.2.tar.gz -> openvas-scanner-3.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/CHANGES new/openvas-scanner-3.2.3/CHANGES --- old/openvas-scanner-3.2.2/CHANGES 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/CHANGES 2011-04-11 09:29:40.000000000 +0200 @@ -1,3 +1,26 @@ +openvas-scanner 3.2.3 (2011-04-11) + +This is the third maintenance release of the openvas-scanner 3.2 module for the +Open Vulnerability Assessment System release 4 (OpenVAS-4). + +This release features a number of minor improvements to the build process and to +the synchronization scripts. It also close three potential resource leaks +discovered by Henri Doreau. + +Many thanks to everyone who has contributed to this release: +Henri Doreau and Michael Wiegand. + +Main changes compared to 3.2.2: +* Fixed: Three potential resource leaks. +* Fixed: Generation of code documentation. +* Updated: Feed synchronization scripts. +* Changed: The openvas-nvt-sync script will now perform the initial feed + synchronization via HTTP instead of rsync. +* Changed: The openvas-nvt-sync script will now default to synchronize into the + NVT directory used by the OpenVAS Scanner instead of the one defined at + compile time. + + openvas-scanner 3.2.2 (2011-02-21) This is the second maintenance release of the openvas-scanner 3.2 module for the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/CMakeLists.txt new/openvas-scanner-3.2.3/CMakeLists.txt --- old/openvas-scanner-3.2.2/CMakeLists.txt 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/CMakeLists.txt 2011-04-11 09:29:40.000000000 +0200 @@ -79,7 +79,7 @@ set (CPACK_TOPLEVEL_TAG "") set (CPACK_PACKAGE_VERSION_MAJOR "3") set (CPACK_PACKAGE_VERSION_MINOR "2") -set (CPACK_PACKAGE_VERSION_PATCH "2${SVN_REVISION}") +set (CPACK_PACKAGE_VERSION_PATCH "3${SVN_REVISION}") set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") @@ -270,6 +270,9 @@ install (DIRECTORY DESTINATION ${OPENVAS_NVT_DIR}) install (DIRECTORY DESTINATION ${OPENVAS_CACHE_DIR}) +install (DIRECTORY + DESTINATION ${OPENVAS_SYSCONF_DIR}/gnupg + DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) ## Tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/ChangeLog new/openvas-scanner-3.2.3/ChangeLog --- old/openvas-scanner-3.2.2/ChangeLog 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/ChangeLog 2011-04-11 09:29:40.000000000 +0200 @@ -1,3 +1,102 @@ +2011-04-11 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Preparing the openvas-scanner 3.2.3 release. + + * CHANGES: Updated. + +2011-04-08 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/openvas-nvt-sync.in: Use feed.openvas.org instead of + rsync.openvas.org in the feed URL. + +2011-04-08 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/openvas-nvt-sync.in: Ensure openvas-nvt-sync syncs into the + NVT directory configured in the scanner by default. Remove obsolete + comment. + +2011-03-31 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/openvas-nvt-sync.in: Do not use rsync as the default when no + feed is present, i.e. we are doing the initial sync. Use http (wget or + curl) instead. + +2011-03-29 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/greenbone-nvt-sync: Enable BatchMode in ssh during rsync. + +2011-03-28 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/greenbone-nvt-sync: Add support for specifying an arbitrary + port for synchronization. + +2011-03-28 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/greenbone-nvt-sync: Add support for reading configuration from + $sysconfdir/openvas/greenbone-nvt-sync.conf. + +2011-03-28 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/greenbone-nvt-sync: Add support for reading feed information + from the plugin_feed_info.inc. Rename FEED_PROVIDER to FEED_VENDOR for + consistency. + +2011-03-28 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/openvas-nvt-sync.in: Make indentation consistent, flush + trailing spaces. + +2011-03-25 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/openvas-nvt-sync.in: Add support for reading feed information + from the plugin_feed_info.inc. Rename FEED_PROVIDER to FEED_VENDOR + for consistency. + +2011-03-16 Henri Doreau <henri.doreau(a)greenbone.net> + + * src/locks.c (file_lock): fixed coding style mismatch from previous + commit. + +2011-03-16 Henri Doreau <henri.doreau(a)greenbone.net> + + * src/locks.c (file_lock, file_locked): Close file descriptors before + return. + + * src/save_kb.c (save_kb_load_kb): Close stream before return. + +2011-03-10 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/greenbone-nvt-sync: Fix conditionals so that they are + evaluated as intended. + +2011-03-07 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * tools/openvas-nvt-sync.in: Removed last bashism from + openvas-nvt-sync a second time: Drop SIG prefix when referring to + signal as it is a bashism as well. + +2011-03-04 Michael Wiegand <michael.wiegand(a)greenbone.net> + + * CMakeLists.txt: Ensure that a "gnupg" directory is created in the + OpenVAS configuration directory with the correct permissions as a + preparation for signature verifications. + +2011-03-02 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Enable the generation of code documentation. Spotted by Michael Meyer. + + * doc/CMakeLists.txt: New. Add to enable the generation of code + documentation. + + * doc/Doxyfile.in, doc/Doxyfile_full.in: Fix value of INPUT to match + the current paths. + +2011-02-21 Michael Wiegand <michael.wiegand(a)greenbone.net> + + Post release version bump. + + * CMakeLists.txt: Set to version to 3.2.3. + 2011-02-21 Michael Wiegand <michael.wiegand(a)greenbone.net> Preparing the openvas-scanner 3.2.2 release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/doc/CMakeLists.txt new/openvas-scanner-3.2.3/doc/CMakeLists.txt --- old/openvas-scanner-3.2.2/doc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/openvas-scanner-3.2.3/doc/CMakeLists.txt 2011-04-11 09:29:40.000000000 +0200 @@ -0,0 +1,62 @@ +# OpenVAS +# $Id$ +# Description: CMakefile for the OpenVAS Scanner documentation +# +# Authors: +# Matthew Mundell <matthew.mundell(a)greenbone.net> +# Michael Wiegand <michael.wiegand(a)greenbone.net> +# +# Copyright: +# Copyright (C) 2011 Greenbone Networks GmbH +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +## build + +set_directory_properties (PROPERTIES CLEAN_NO_CUSTOM true) +set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ".built-html;.built-html_full") + +include (FindDoxygen) + +if (NOT DOXYGEN_EXECUTABLE) + message (STATUS "WARNING: Doxygen is required to build the HTML docs.") +else (NOT DOXYGEN_EXECUTABLE) + set (DOC_FILES + ../src/attack.c ../src/auth.c ../src/comm.c ../src/hosts.c + ../src/locks.c ../src/log.c ../src/nasl_plugins.c ../src/ntp_11.c + ../src/openvassd.c ../src/otp_1_0.c ../src/oval_plugins.c ../src/parser.c + ../src/piic.c ../src/pluginlaunch.c ../src/pluginload.c + ../src/pluginscheduler.c ../src/plugs_hash.c ../src/plugs_req.c + ../src/preferences.c ../src/processes.c ../src/rules.c ../src/save_kb.c + ../src/shared_socket.c ../src/sighand.c ../src/users.c ../src/utils.c + ../README ../INSTALL) + + add_custom_target (doc COMMENT "Building documentation..." + DEPENDS Doxyfile .built-html) + + add_custom_target (doc-full COMMENT "Building documentation..." + DEPENDS Doxyfile_full .built-html_full) +endif (NOT DOXYGEN_EXECUTABLE) + +add_custom_command (OUTPUT .built-html + COMMAND sh + ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile && touch doc/.built-html\;\" + DEPENDS Doxyfile ${DOC_FILES}) + +add_custom_command (OUTPUT .built-html_full + COMMAND sh + ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile_full && touch doc/.built-html_full\;\" + DEPENDS Doxyfile_full ${DOC_FILES}) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/doc/Doxyfile.in new/openvas-scanner-3.2.3/doc/Doxyfile.in --- old/openvas-scanner-3.2.2/doc/Doxyfile.in 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/doc/Doxyfile.in 2011-04-11 09:29:40.000000000 +0200 @@ -459,7 +459,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = openvassd include +INPUT = src # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/doc/Doxyfile_full.in new/openvas-scanner-3.2.3/doc/Doxyfile_full.in --- old/openvas-scanner-3.2.2/doc/Doxyfile_full.in 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/doc/Doxyfile_full.in 2011-04-11 09:29:40.000000000 +0200 @@ -459,7 +459,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = openvassd include +INPUT = src # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/src/locks.c new/openvas-scanner-3.2.3/src/locks.c --- old/openvas-scanner-3.2.2/src/locks.c 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/src/locks.c 2011-04-11 09:29:40.000000000 +0200 @@ -1,5 +1,5 @@ /* OpenVAS -* $Id: locks.c 9864 2011-01-03 19:48:27Z jan $ +* $Id: locks.c 10561 2011-03-16 09:58:33Z hdoreau $ * Description: Deals with file locking. * * Authors: - Renaud Deraison <deraison(a)nessus.org> (Original pre-fork develoment) @@ -77,7 +77,10 @@ bzero (buf, sizeof (buf)); snprintf (buf, sizeof (buf), "%d", getpid ()); if (write (fd, buf, strlen (buf)) < 0) - return -1; + { + close (fd); + return -1; + } close (fd); return 0; } @@ -120,6 +123,7 @@ log_write ("Could not determine if the file %s is locked: Failed to read %s\n", name, lock); efree (&lock); + close (fd); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/src/save_kb.c new/openvas-scanner-3.2.3/src/save_kb.c --- old/openvas-scanner-3.2.2/src/save_kb.c 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/src/save_kb.c 2011-04-11 09:29:40.000000000 +0200 @@ -1,5 +1,5 @@ /* OpenVAS -* $Id: save_kb.c 9983 2011-01-17 17:46:44Z jan $ +* $Id: save_kb.c 10560 2011-03-16 08:56:04Z hdoreau $ * Description: Saves the currently used knowledge base. * * Authors: - Renaud Deraison <deraison(a)nessus.org> (Original pre-fork develoment) @@ -647,6 +647,7 @@ log_write ("user %s : Could not read %s - kb won't be restored for %s\n", (char *) arg_get_value (globals, "user"), fname, hostname); efree (&fname); + fclose (f); return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/tools/greenbone-nvt-sync new/openvas-scanner-3.2.3/tools/greenbone-nvt-sync --- old/openvas-scanner-3.2.2/tools/greenbone-nvt-sync 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/tools/greenbone-nvt-sync 2011-04-11 09:29:40.000000000 +0200 @@ -49,9 +49,6 @@ # Script and feed information which will be made available to user through # command line options and automated tools. SCRIPT_NAME="greenbone-nvt-sync" -FEED_NAME="Greenbone Security Feed" -FEED_PROVIDER="Greenbone Networks GmbH" -FEED_HOME="http://www.greenbone.net/solutions/gbn_feed.html" RESTRICTED=1 # Result of selftest () is stored here. If it is not 0, the selftest has failed @@ -61,13 +58,16 @@ # Verbosity flag for rsync. "-q" means a quiet rsync, "-v" a verbose rsync. RSYNC_VERBOSE="-q" +# Port to use for synchronization. Default value is 24. +PORT=24 + if [ ! -w $LOGDIR ] then NOLOG=1 fi log_write(){ - if [ -n $NOLOG ] + if [ -n "$NOLOG" ] then echo "LOG: [`date -R`] $1" > /dev/stderr else @@ -107,6 +107,8 @@ sysconfdir=`$SCANNER_BINARY --sysconfdir` + [ -r $sysconfdir/openvas/greenbone-nvt-sync.conf ] && . $sysconfdir/openvas/greenbone-nvt-sync.conf + if [ -z $NVT_DIR ] then NVT_DIR=`$SCANNER_BINARY -s | grep plugins_folder | sed 's/plugins\_folder\ *=\ *//'` @@ -127,16 +129,36 @@ exit 1 fi fi + + INFOFILE="$NVT_DIR/plugin_feed_info.inc" + if [ -r $INFOFILE ] ; then + FEED_VERSION=`grep PLUGIN_SET $INFOFILE | sed -e 's/[^0-9]//g'` + FEED_NAME=`awk -F\" '/PLUGIN_FEED/ { print $2 }' $INFOFILE` + FEED_VENDOR=`awk -F\" '/FEED_VENDOR/ { print $2 }' $INFOFILE` + FEED_HOME=`awk -F\" '/FEED_HOME/ { print $2 }' $INFOFILE` + FEED_PRESENT=1 + else + FEED_PRESENT=0 + fi + + if [ -z "$FEED_NAME" ] ; then + FEED_NAME="Greenbone Security Feed" + fi + + if [ -z "$FEED_VENDOR" ] ; then + FEED_VENDOR="Greenbone Networks GmbH" + fi + + if [ -z "$FEED_HOME" ] ; then + FEED_HOME="http://www.greenbone.net/solutions/gbn_feed.html" + fi } sync_nvts(){ log_write "Synchronizing NVTs from the Greenbone Security Feed into $NVT_DIR..." - VERSIONFILE="$NVT_DIR/plugin_feed_info.inc" - if [ -r $VERSIONFILE ] ; then - FEEDVERSION=`grep PLUGIN_SET $VERSIONFILE | sed -e 's/[^0-9]//g'` - FEEDNAME=`grep PLUGIN_FEED $VERSIONFILE | awk -F\" '{print $(NF-1)}'` + if [ $FEED_PRESENT -eq 1 ] ; then FEEDCOUNT=`grep -E "nasl$|inc$" $NVT_DIR/md5sums | wc -l` - log_write "Current status: Using $FEEDNAME at version $FEEDVERSION ($FEEDCOUNT NVTs)" + log_write "Current status: Using $FEED_NAME at version $FEED_VERSION ($FEEDCOUNT NVTs)" else log_write "Current status: No feed installed." fi @@ -170,9 +192,9 @@ fi if [ "$gsmproxy" = "proxy_feed" ] || [ -z $gsmproxy ] then - rsync -e "ssh -p 24 -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR + rsync -e "ssh -o \"BatchMode=yes\" -p $PORT -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR else - rsync -e "ssh -o \"ProxyCommand corkscrew $gsmproxy %h %p\" -p 24 -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR + rsync -e "ssh -o \"BatchMode=yes\" -o \"ProxyCommand corkscrew $gsmproxy %h %p\" -p $PORT -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR fi if [ $? -ne 0 ] ; then stderr_write "== greenbone-nvt-sync $VERSION ================================================" @@ -189,7 +211,7 @@ fi eval "cd \"$NVT_DIR\" ; md5sum -c --status \"$NVT_DIR/md5sums\"" if [ $? -ne 0 ] ; then - if [ -n $retried ] + if [ -n "$retried" ] then stderr_write "== greenbone-nvt-sync $VERSION ================================================" stderr_write "The feed integrity check failed two times in a row. This may indicate a serious" @@ -217,11 +239,10 @@ fi done log_write "Synchronization with the Greenbone Security Feed successful." - if [ -r $VERSIONFILE ] ; then - FEEDVERSION=`grep PLUGIN_SET $VERSIONFILE | sed -e 's/[^0-9]//g'` - FEEDNAME=`grep PLUGIN_FEED $VERSIONFILE | awk -F\" '{print $(NF-1)}'` + init_sync + if [ $FEED_PRESENT -eq 1 ] ; then FEEDCOUNT=`grep -E "nasl$|inc$" $NVT_DIR/md5sums | wc -l` - log_write "Current status: Using $FEEDNAME at version $FEEDVERSION ($FEEDCOUNT NVTs)" + log_write "Current status: Using $FEED_NAME at version $FEED_VERSION ($FEEDCOUNT NVTs)" else log_write "Current status: No feed installed." fi @@ -240,7 +261,7 @@ } update_openvasmd (){ - if [ -n $NOINIT ] ; then + if [ -n "$NOINIT" ] ; then return fi log_write "Updating OpenVAS Manager" @@ -307,8 +328,11 @@ do_describe () { + if [ -z $NVT_DIR ] ; then + init_sync + fi echo "This script synchronizes an NVT collection with the '$FEED_NAME'." - echo "The '$FEED_NAME' is provided by '$FEED_PROVIDER'." + echo "The '$FEED_NAME' is provided by '$FEED_VENDOR'." echo "Online information about this feed: '$FEED_HOME'." } @@ -316,12 +340,10 @@ if [ -z $NVT_DIR ] ; then init_sync fi - VERSIONFILE="$NVT_DIR/plugin_feed_info.inc" - if [ -r $VERSIONFILE ] ; then - FEEDVERSION=`grep PLUGIN_SET $VERSIONFILE | sed -e 's/[^0-9]//g'` - echo $FEEDVERSION + if [ $FEED_PRESENT -eq 1 ] ; then + echo $FEED_VERSION else - stderr_write "The file containing the feed version ($VERSIONFILE) could not be found." + stderr_write "The file containing the feed version could not be found." exit 1 fi } @@ -343,6 +365,7 @@ exit 0 ;; --identify) + init_sync echo "NVTSYNC|$SCRIPT_NAME|$VERSION|$FEED_NAME|$RESTRICTED|NVTSYNC" exit 0 ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openvas-scanner-3.2.2/tools/openvas-nvt-sync.in new/openvas-scanner-3.2.3/tools/openvas-nvt-sync.in --- old/openvas-scanner-3.2.2/tools/openvas-nvt-sync.in 2011-02-21 10:40:34.000000000 +0100 +++ new/openvas-scanner-3.2.3/tools/openvas-nvt-sync.in 2011-04-11 09:29:40.000000000 +0200 @@ -12,7 +12,7 @@ # Vlatko Kosturjak <kost(a)linux.hr> # Michael Wiegand <michael.wiegand(a)greenbone.net> # -# Script is complete rewrite of original sync script by +# Script is complete rewrite of original sync script by # Lukas Grunwald <l.grunwald(a)dn-systems.de> # Jan-Oliver Wagner <jan-oliver.wagner(a)intevation.de> # @@ -32,66 +32,89 @@ # if you need to debug script # set -x -# these locations should be correct if standard ./configure had -# been applied. - # configure NVT_DIR where we will sync NVTs if [ -z "$NVT_DIR" ]; then - NVT_DIR="@OPENVAS_NVT_DIR@" + OPENVASSD=`which openvassd` + if [ -z "$OPENVASSD" ] ; then + echo "[e] Error: openvassd is not in the path, could not determine NVT directory." + exit 1 + else + NVT_DIR=`openvassd -s | awk -F" = " '/^plugins_folder/ { print $2 }'` + fi +fi + +# Script and feed information which will be made available to user through +# command line options and automated tools. +SCRIPT_NAME="openvas-nvt-sync" +VERSION=@OPENVASSD_VERSION@ +RESTRICTED=0 + +INFOFILE="$NVT_DIR/plugin_feed_info.inc" +if [ -r $INFOFILE ] ; then + FEED_VERSION=`grep PLUGIN_SET $INFOFILE | sed -e 's/[^0-9]//g'` + FEED_NAME=`grep PLUGIN_FEED $INFOFILE | sed 's/PLUGIN_FEED\s*\=\s*\"$[^"]\+$\";/\1/'` + FEED_VENDOR=`grep FEED_VENDOR $INFOFILE | sed 's/FEED_VENDOR\s*\=\s*\"$[^"]\+$\";/\1/'` + FEED_HOME=`grep FEED_HOME $INFOFILE | sed 's/FEED_HOME\s*\=\s*\"$[^"]\+$\";/\1/'` + FEED_PRESENT=1 +else + FEED_PRESENT=0 +fi + +if [ -z "$FEED_NAME" ] ; then + FEED_NAME="OpenVAS NVT Feed" +fi + +if [ -z "$FEED_VENDOR" ] ; then + FEED_VENDOR="The OpenVAS Project" +fi + +if [ -z "$FEED_HOME" ] ; then + FEED_HOME="http://www.openvas.org/openvas-nvt-feed.html" fi # The URL of the plugin feed if [ -z "$OV_RSYNC_FEED" ]; then - OV_RSYNC_FEED=rsync://rsync.openvas.org:/nvt-feed - # An alternative syntax which might work if the above doesn't: - # OV_RSYNC_FEED=rsync@rsync.openvas.org::nvt-feed + OV_RSYNC_FEED=rsync://feed.openvas.org:/nvt-feed + # An alternative syntax which might work if the above doesn't: + # OV_RSYNC_FEED=rsync@feed.openvas.org::nvt-feed fi if [ -z "$OV_HTTP_FEED" ]; then - OV_HTTP_FEED=http://www.openvas.org/openvas-nvt-feed-current.tar.bz2 + OV_HTTP_FEED=http://www.openvas.org/openvas-nvt-feed-current.tar.bz2 fi if [ -z "$TMPDIR" ]; then - SYNC_TMP_DIR=/tmp -# If we have mktemp, create a temporary dir (safer) - if [ -n "`which mktemp`" ]; then - SYNC_TMP_DIR=`mktemp -d openvas-nvt-sync.XXXXXXXXXX -t` || { echo "ERROR: Cannot create temporary directory for file download" >&2; exit 1 ; } - trap "rm -rf $SYNC_TMP_DIR" EXIT SIGHUP SIGINT SIGTRAP SIGTERM - fi + SYNC_TMP_DIR=/tmp + # If we have mktemp, create a temporary dir (safer) + if [ -n "`which mktemp`" ]; then + SYNC_TMP_DIR=`mktemp -d openvas-nvt-sync.XXXXXXXXXX -t` || { echo "ERROR: Cannot create temporary directory for file download" >&2; exit 1 ; } + trap "rm -rf $SYNC_TMP_DIR" EXIT HUP INT TRAP TERM + fi else - SYNC_TMP_DIR="$TMPDIR" + SYNC_TMP_DIR="$TMPDIR" fi -# Script and feed information which will be made available to user through -# command line options and automated tools. -SCRIPT_NAME="openvas-nvt-sync" -VERSION=@OPENVASSD_VERSION@ -FEED_NAME="OpenVAS NVT Feed" -FEED_PROVIDER="The OpenVAS Project" -FEED_HOME="http://www.openvas.org/openvas-nvt-feed.html" -RESTRICTED=0 - do_help () { - echo "$0: Sync NVTs using different protocols" - echo " --rsync sync with rsync (default)" - echo " --wget sync with wget" - echo " --curl sync with curl" - echo " --check just checksum check" - echo "OpenVAS administrator functions:" - echo " --selftest perform self-test" - echo " --identify display information" - echo " --version display version" - echo " --describe display current feed info" - echo " --nvt-dir <dir> directory of the NVT collection" - echo "" - echo "Environment variables:" - echo "NVT_DIR where to extract plugins (absolute path)" - echo "OV_RSYNC_FEED URL of rsync feed" - echo "OV_HTTP_FEED URL of http feed" - echo "TMPDIR temporary directory used to download the files" - echo "Note that you can use standard ones as well (e.g. http_proxy) for wget/curl" - echo "" - exit 0 + echo "$0: Sync NVTs using different protocols" + echo " --rsync sync with rsync (default)" + echo " --wget sync with wget" + echo " --curl sync with curl" + echo " --check just checksum check" + echo "OpenVAS administrator functions:" + echo " --selftest perform self-test" + echo " --identify display information" + echo " --version display version" + echo " --describe display current feed info" + echo " --nvt-dir <dir> directory of the NVT collection" + echo "" + echo "Environment variables:" + echo "NVT_DIR where to extract plugins (absolute path)" + echo "OV_RSYNC_FEED URL of rsync feed" + echo "OV_HTTP_FEED URL of http feed" + echo "TMPDIR temporary directory used to download the files" + echo "Note that you can use standard ones as well (e.g. http_proxy) for wget/curl" + echo "" + exit 0 } CMD_RSYNC=`which rsync` @@ -101,141 +124,143 @@ TMP_NVT="$SYNC_TMP_DIR/openvas-feed-`date +%F`-$$.tar.bz2" chk_system_tools () { - echo "[i] Searching for required system tools (look for warnings)..." + echo "[i] Searching for required system tools (look for warnings)..." - if [ -z "$CMD_MD5SUM" ]; then - SELFTEST_FAIL=1 - echo "[w] Warning: MD5SUM not found"; - fi + if [ -z "$CMD_MD5SUM" ]; then + SELFTEST_FAIL=1 + echo "[w] Warning: MD5SUM not found"; + fi - if [ -z "$CMD_RSYNC" ]; then - echo "[w] Warning: RSYNC not found"; - fi + if [ -z "$CMD_RSYNC" ]; then + echo "[w] Warning: RSYNC not found"; + fi - if [ -z "$CMD_WGET" ]; then - echo "[w] Warning: wget not found"; - fi + if [ -z "$CMD_WGET" ]; then + echo "[w] Warning: wget not found"; + fi - if [ -z "$CMD_CURL" ]; then - echo "[w] Warning: curl not found"; - fi + if [ -z "$CMD_CURL" ]; then + echo "[w] Warning: curl not found"; + fi - if [ -z "$CMD_RSYNC" -a -z "$CMD_WGET" -a -z "$CMD_CURL" ]; then - SELFTEST_FAIL=1 - fi + if [ -z "$CMD_RSYNC" -a -z "$CMD_WGET" -a -z "$CMD_CURL" ]; then + SELFTEST_FAIL=1 + fi - echo "[i] If you did not get any warnings, that means you have all tools required" + echo "[i] If you did not get any warnings, that means you have all tools required" - echo "[i] Note that it is recommended to have md5sum and one of the following: rsync, wget or curl." + echo "[i] Note that it is recommended to have md5sum and one of the following: rsync, wget or curl." } do_rsync () { - if [ -z "$CMD_RSYNC" ]; then - echo "[w] rsync not found!" - else - echo "[i] Using rsync: $CMD_RSYNC" - echo "[i] Configured NVT rsync feed: $OV_RSYNC_FEED" - mkdir -p "$NVT_DIR" - eval "$CMD_RSYNC -ltvrP \"$OV_RSYNC_FEED\" \"$NVT_DIR\"" - if [ $? -ne 0 ] ; then - echo "Error: rsync failed. Your NVT collection might be broken now." - exit 1 - fi - fi + if [ -z "$CMD_RSYNC" ]; then + echo "[w] rsync not found!" + else + echo "[i] Using rsync: $CMD_RSYNC" + echo "[i] Configured NVT rsync feed: $OV_RSYNC_FEED" + mkdir -p "$NVT_DIR" + eval "$CMD_RSYNC -ltvrP \"$OV_RSYNC_FEED\" \"$NVT_DIR\"" + if [ $? -ne 0 ] ; then + echo "Error: rsync failed. Your NVT collection might be broken now." + exit 1 + fi + fi } do_wget () { - if [ -z "$CMD_WGET" ]; then - echo "[w] GNU wget not found!" - else - echo "[i] Using GNU wget: $CMD_WGET" - echo "[i] Configured NVT http feed: $OV_HTTP_FEED" - echo "[i] Downloading to: $TMP_NVT" - mkdir -p "$NVT_DIR" \ - && wget "$OV_HTTP_FEED" -O $TMP_NVT \ - && cd "$NVT_DIR" \ - && tar xvjf $TMP_NVT \ - && rm -f $TMP_NVT \ - && echo "[i] Download complete" - fi + if [ -z "$CMD_WGET" ]; then + echo "[w] GNU wget not found!" + else + echo "[i] Using GNU wget: $CMD_WGET" + echo "[i] Configured NVT http feed: $OV_HTTP_FEED" + echo "[i] Downloading to: $TMP_NVT" + mkdir -p "$NVT_DIR" \ + && wget "$OV_HTTP_FEED" -O $TMP_NVT \ + && cd "$NVT_DIR" \ + && tar xvjf $TMP_NVT \ + && rm -f $TMP_NVT \ + && echo "[i] Download complete" + fi } do_curl () { - if [ -z "$CMD_CURL" ]; then - echo "[w] curl not found!" - else - echo "[i] Using curl: $CMD_CURL" - echo "[i] Configured NVT http feed: $OV_HTTP_FEED" - echo "[i] Downloading to: $TMP_NVT" - mkdir -p "$NVT_DIR" \ - && curl "$OV_HTTP_FEED" -o $TMP_NVT \ - && cd "$NVT_DIR" \ - && tar xvjf $TMP_NVT \ - && rm -f $TMP_NVT \ - && echo "[i] Download complete" - fi + if [ -z "$CMD_CURL" ]; then + echo "[w] curl not found!" + else + echo "[i] Using curl: $CMD_CURL" + echo "[i] Configured NVT http feed: $OV_HTTP_FEED" + echo "[i] Downloading to: $TMP_NVT" + mkdir -p "$NVT_DIR" \ + && curl "$OV_HTTP_FEED" -o $TMP_NVT \ + && cd "$NVT_DIR" \ + && tar xvjf $TMP_NVT \ + && rm -f $TMP_NVT \ + && echo "[i] Download complete" + fi } do_check_md5 () { - if [ -z "CMD_MD5SUM" ]; then - echo "[w] md5sum utility not found, cannot check NVT checksums! You've been warned!" - else - echo -n "[i] Checking dir: " - eval "cd \"$NVT_DIR\"" - if [ $? -ne 0 ] ; then - echo "not ok" - echo "Check your NVT dir for existence and permissions!" - exit 1 - else - echo "ok" - fi - echo -n "[i] Checking MD5 checksum: " - eval "cd \"$NVT_DIR\" ; $CMD_MD5SUM -c --status \"$NVT_DIR/md5sums\"" - if [ $? -ne 0 ] ; then - echo "not ok" - echo "Error: md5sums not correct. Your NVT collection might be broken now." - echo "Please try this for details: cd \"$NVT_DIR\" ; $CMD_MD5SUM -c \"$NVT_DIR/md5sums\" | less" - exit 1 - fi - echo "ok" - fi + if [ -z "CMD_MD5SUM" ]; then + echo "[w] md5sum utility not found, cannot check NVT checksums! You've been warned!" + else + echo -n "[i] Checking dir: " + eval "cd \"$NVT_DIR\"" + if [ $? -ne 0 ] ; then + echo "not ok" + echo "Check your NVT dir for existence and permissions!" + exit 1 + else + echo "ok" + fi + echo -n "[i] Checking MD5 checksum: " + eval "cd \"$NVT_DIR\" ; $CMD_MD5SUM -c --status \"$NVT_DIR/md5sums\"" + if [ $? -ne 0 ] ; then + echo "not ok" + echo "Error: md5sums not correct. Your NVT collection might be broken now." + echo "Please try this for details: cd \"$NVT_DIR\" ; $CMD_MD5SUM -c \"$NVT_DIR/md5sums\" | less" + exit 1 + fi + echo "ok" + fi } do_self_test () { - chk_system_tools + chk_system_tools } do_describe () { echo "This script synchronizes an NVT collection with the '$FEED_NAME'." - echo "The '$FEED_NAME' is provided by '$FEED_PROVIDER'." + echo "The '$FEED_NAME' is provided by '$FEED_VENDOR'." echo "Online information about this feed: '$FEED_HOME'." } do_feedversion () { - VERSIONFILE="$NVT_DIR/plugin_feed_info.inc" - if [ -r $VERSIONFILE ] ; then - FEEDVERSION=`grep PLUGIN_SET $VERSIONFILE | sed -e 's/[^0-9]//g'` - echo $FEEDVERSION + if [ $FEED_PRESENT -eq 1 ] ; then + echo $FEED_VERSION fi } show_intro () { echo "[i] This script synchronizes an NVT collection with the '$FEED_NAME'." - echo "[i] The '$FEED_NAME' is provided by '$FEED_PROVIDER'." + echo "[i] The '$FEED_NAME' is provided by '$FEED_VENDOR'." echo "[i] Online information about this feed: '$FEED_HOME'." echo "[i] NVT dir: $NVT_DIR" } do_sync () { - if [ -z "$CMD_RSYNC" ]; then - echo "[w] rsync not found!" - if [ -z "$CMD_WGET"]; then + if [ -z "$CMD_RSYNC" ] || [ $FEED_PRESENT -eq 0 ] ; then + if [ $FEED_PRESENT -eq 0 ] ; then + echo "[i] rsync not is recommended for the initial sync. Falling back on http." + else + echo "[w] rsync not found!" + fi + if [ -z "$CMD_WGET" ]; then echo "[w] GNU wget not found!" - if [ -z "$CMD_CURL"]; then + if [ -z "$CMD_CURL" ]; then echo "[w] curl not found!" - echo -n "[e] no utility available in PATH environment variable to download plugins" + echo -n "[e] no utility available in PATH environment variable to download plugins" exit 1 else echo "[i] Will use curl" @@ -252,59 +277,59 @@ } if [ -n "$1" ]; then - while test $# -gt 0; do - case "$1" in - --help) - do_help - exit 0 - ;; - --rsync) - do_rsync - do_check_md5 - exit 0 - ;; - --wget) - do_wget - do_check_md5 - exit 0 - ;; - --curl) - do_curl - do_check_md5 - exit 0 - ;; - --check) - do_check_md5 - exit 0 - ;; - --version) - echo $VERSION - exit 0 - ;; - --identify) - echo "NVTSYNC|$SCRIPT_NAME|$VERSION|$FEED_NAME|$RESTRICTED|NVTSYNC" - exit 0 - ;; - --selftest) - SELFTEST_FAIL=0 - do_self_test - exit $SELFTEST_FAIL - ;; - --describe) - do_describe - exit 0 - ;; - --feedversion) - do_feedversion - exit 0 - ;; - --nvt-dir) - NVT_DIR="$2" - shift - ;; - esac - shift - done + while test $# -gt 0; do + case "$1" in + --help) + do_help + exit 0 + ;; + --rsync) + do_rsync + do_check_md5 + exit 0 + ;; + --wget) + do_wget + do_check_md5 + exit 0 + ;; + --curl) + do_curl + do_check_md5 + exit 0 + ;; + --check) + do_check_md5 + exit 0 + ;; + --version) + echo $VERSION + exit 0 + ;; + --identify) + echo "NVTSYNC|$SCRIPT_NAME|$VERSION|$FEED_NAME|$RESTRICTED|NVTSYNC" + exit 0 + ;; + --selftest) + SELFTEST_FAIL=0 + do_self_test + exit $SELFTEST_FAIL + ;; + --describe) + do_describe + exit 0 + ;; + --feedversion) + do_feedversion + exit 0 + ;; + --nvt-dir) + NVT_DIR="$2" + shift + ;; + esac + shift + done fi show_intro ++++++ openvas-scanner.dsc ++++++ --- /var/tmp/diff_new_pack.l38kE7/_old 2011-05-02 09:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.l38kE7/_new 2011-05-02 09:19:22.000000000 +0200 @@ -2,13 +2,13 @@ Source: openvas-scanner Binary: openvas-scanner Architecture: any -Version: 3.2.2-1 +Version: 3.2.3-1 Maintainer: Stephan Kleine <bitshuffler(a)opensuse.org> Homepage: http://www.openvas.org/ Standards-Version: 3.8.0 Build-Depends: debhelper (>= 6), devscripts, dpatch, cmake, hardening-wrapper, libopenvas4-dev, libwrap0-dev, pkg-config, po-debconf Files: - 776ce4e1000137c9aec7863372c8c876 373800 openvas-scanner-3.2.2.orig.tar.gz - 131e6720b0526ade9405eade0d9150ac 56625 openvas-scanner-3.2.2.diff.gz + 776ce4e1000137c9aec7863372c8c876 373800 openvas-scanner-3.2.3.orig.tar.gz + 131e6720b0526ade9405eade0d9150ac 56625 openvas-scanner-3.2.3.diff.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxfcegui4 for openSUSE:Factory
by root＠hilbert.suse.de 02 May '11

02 May '11

Hello community, here is the log from the commit of package libxfcegui4 for openSUSE:Factory checked in at Mon May 2 09:12:02 CEST 2011. -------- --- libxfcegui4/libxfcegui4.changes 2011-02-17 22:02:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/libxfcegui4/libxfcegui4.changes 2011-04-01 19:24:40.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 1 17:20:51 UTC 2011 - gber(a)opensuse.org + +- update to version 4.8.1 + * added missing license and fixed existing licenses + * translation updates + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libxfcegui4-4.8.0.tar.bz2 New: ---- libxfcegui4-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxfcegui4.spec ++++++ --- /var/tmp/diff_new_pack.kTXmtD/_old 2011-05-02 09:11:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kTXmtD/_new 2011-05-02 09:11:29.000000000 +0200 @@ -18,8 +18,8 @@ Name: libxfcegui4 -Version: 4.8.0 -Release: 8 +Version: 4.8.1 +Release: 1 License: LGPLv2.1+ Summary: Widget Library for the Xfce Desktop Environment Url: http://www.xfce.org/ ++++++ libxfcegui4-4.8.0.tar.bz2 -> libxfcegui4-4.8.1.tar.bz2 ++++++ ++++ 15942 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:11.4
by root＠hilbert.suse.de 01 May '11

01 May '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:11.4 checked in at Sun May 1 22:03:38 CEST 2011. -------- --- old-versions/11.4/UPDATES/all/aaa_base/aaa_base.changes 2011-03-15 15:32:07.000000000 +0100 +++ 11.4/aaa_base/aaa_base.changes 2011-04-21 12:49:33.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 21 12:49:18 CEST 2011 - werner(a)suse.de + +- Start blogd only once at boot (related to bnc#642289) + +------------------------------------------------------------------- +Mon Mar 21 13:58:08 CET 2011 - werner(a)suse.de + +- Avoid waiting on bind mounts in boot.localfs +- Be aware in refresh_initrd that modules used in initrd may use + options in the /etc/modprobe.d/ files + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.mF8TTS/_old 2011-05-01 22:03:14.000000000 +0200 +++ /var/tmp/diff_new_pack.mF8TTS/_new 2011-05-01 22:03:14.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.4 -Release: 54.<RELEASE62> +Release: 54.<RELEASE64> License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2011-01-15 13:28:44.000000000 +0100 +++ new/aaa_base/etc/init.d/boot 2011-04-21 12:48:02.000000000 +0200 @@ -29,6 +29,18 @@ export CONSOLE REDIRECT # +# Check real terminal line +# +if test -z "$REDIRECT" ; then + if (echo -n > /dev/tty) 2>/dev/null ; then + REDIRECT=/dev/tty + else + REDIRECT=/dev/console + fi + DO_BLOGD=no +fi + +# # Configuration and coloring of the boot messages # @@ -53,11 +65,11 @@ # Save old terminal settings and set -nl to avoid staircase # effect, do not lock scrolling, and avoid break characters. # -otty=$(stty -g) +otty=$(stty -g < $REDIRECT) if test "$FLOW_CONTROL" = "yes" ; then - stty -nl ixon ignbrk -brkint + stty -nl ixon ignbrk -brkint < $REDIRECT else - stty -nl -ixon ignbrk -brkint + stty -nl -ixon ignbrk -brkint < $REDIRECT fi echo -n "System Boot Control: " @@ -161,16 +173,8 @@ # Start blogd, requires /proc and /dev/pts. # Export the real device in variable REDIRECT. # -if test -z "$REDIRECT" ; then - if (echo -n > /dev/tty) 2>/dev/null ; then - REDIRECT=/dev/tty - else - REDIRECT=/dev/console - fi -else - if test "$DO_BLOGD" = yes ; then - /sbin/blogd $REDIRECT - fi +if test "$DO_BLOGD" = yes ; then + /sbin/blogd $REDIRECT fi # @@ -294,11 +298,6 @@ test -s /lib/bootcycle/stats && . /lib/bootcycle/stats # -# Stop blogd -# -killproc -QUIT /sbin/blogd - -# # Remember for master resource script # if test "$DO_CONFIRM" = "yes" ; then @@ -314,7 +313,7 @@ # # Restore old terminal settings # -stty $otty +stty $otty < $REDIRECT # # Let YaST2 finish its installation, if you installed with YaST2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2011-02-17 12:38:15.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2011-03-21 13:57:40.000000000 +0100 @@ -61,7 +61,7 @@ list_missed () { local dev line - local mount_opts="-t no${tmpfs//,/,no},$nofs -O no_netdev -O nonofail" + local mount_opts="-t no${tmpfs//,/,no},nonone -O no_netdev -O nonofail" mount -afnv $mount_opts 2> /dev/null | while read line ; do dev="${line%% *}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/rc new/aaa_base/etc/init.d/rc --- old/aaa_base/etc/init.d/rc 2010-05-28 16:38:17.000000000 +0200 +++ new/aaa_base/etc/init.d/rc 2011-04-21 12:48:02.000000000 +0200 @@ -115,6 +115,18 @@ export CONSOLE REDIRECT # +# Check real terminal line +# +if test -z "$REDIRECT" ; then + if (echo -n > /dev/tty) 2>/dev/null ; then + REDIRECT=/dev/tty + else + REDIRECT=/dev/console + fi + DO_BLOGD=no +fi + +# # Set I/O of this script and its childs to console # exec 0<> $CONSOLE 1>&0 2>&0 @@ -191,26 +203,18 @@ # Save old terminal settings and set -nl to avoid staircase # effect, do not lock scrolling, and avoid break characters. # -otty=$(stty -g) +otty=$(stty -g < $REDIRECT) if test "$FLOW_CONTROL" = "yes" ; then - stty -nl ixon ignbrk -brkint + stty -nl ixon ignbrk -brkint < $REDIRECT else - stty -nl -ixon ignbrk -brkint + stty -nl -ixon ignbrk -brkint < $REDIRECT fi # # Start blogd if not in single user mode # -if test -z "$REDIRECT" ; then - if (echo -n > /dev/tty) 2>/dev/null ; then - REDIRECT=/dev/tty - else - REDIRECT=/dev/console - fi -else - if test "$DO_BLOGD" = yes; then - /sbin/blogd $REDIRECT - fi +if test "$DO_BLOGD" = yes; then + /sbin/start_daemon /sbin/blogd $REDIRECT fi if test "$DO_CONFIRM" = "yes" ; then @@ -434,7 +438,7 @@ # # Restore old terminal settings # -stty $otty +stty $otty < $REDIRECT # # For the first logon on a virtual console. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/sbin/refresh_initrd new/aaa_base/sbin/refresh_initrd --- old/aaa_base/sbin/refresh_initrd 2009-10-07 13:28:24.000000000 +0200 +++ new/aaa_base/sbin/refresh_initrd 2011-03-21 13:56:44.000000000 +0100 @@ -6,12 +6,29 @@ # # Author: Werner Fink <werner(a)suse.de> # +initrd=$(readlink /boot/initrd) +test -n "$initrd" || exit 0 +modules=lib/modules/${initrd#initrd-} refresh=no -test /etc/sysconfig/clock -nt /boot/initrd && refresh=yes -test /etc/sysconfig/kernel -nt /boot/initrd && refresh=yes +test /etc/sysconfig/clock -nt $initrd && refresh=yes +test /etc/sysconfig/kernel -nt $initrd && refresh=yes + +while read module ; do + module=${module##*/} + module=${module%.ko} + modconfs=$(grep -lE "[[:blank:]]$module[[:blank:]]" /etc/modprobe.d/*) + for modconf in $modconfs; do + test $modconf -nt $initrd && refresh=yes + break 2 + done +done < <(lsinitrd /boot/initrd | grep -E "$modules/.*\.ko") +unset modules module modconfs modconf + test "$refresh" = yes || exit 0 +modprobe dm_mod --quiet &> /dev/null || true + line=on test -e /proc/splash && read line < /proc/splash line=${line##*: } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0