November 2014 - openSUSE Commits - openSUSE Mailing Lists

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-11-03 13:11:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-10-25 08:33:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-11-03 13:11:42.000000000 +0100 @@ -1,0 +2,46 @@ +Thu Oct 30 17:38:35 CET 2014 - chingpang(a)suse.de + +- Correct the loader type of grub2 + + For the UEFI machines, the loader type has to be "grub2-efi" to + make grub2-install search the efi modules. + +------------------------------------------------------------------- +Thu Oct 30 12:39:00 CET 2014 - ms(a)suse.de + +- v7.01.17 released + +------------------------------------------------------------------- +Thu Oct 30 12:37:45 CET 2014 - ms(a)suse.de + +- Activate efi support in suse-13.2-JeOS template + +------------------------------------------------------------------- +Thu Oct 30 10:34:42 CET 2014 - ms(a)suse.de + +- Fixed git tag helper + + report only first tag matching current version + +------------------------------------------------------------------- +Mon Oct 27 12:16:20 CET 2014 - ms(a)suse.de + +- Don't remove libdrm from boot images + +------------------------------------------------------------------- +Mon Oct 27 09:54:08 CET 2014 - schwab(a)suse.de + +- Set proper boot catalog in aarch64_efi + +------------------------------------------------------------------- +Fri Oct 24 11:30:44 CEST 2014 - ms(a)suse.de + +- Don't call makeIsoEFIBootable for product iso's + + The required data is provided by the installation-images-<distro> + package and doesn't need to be created. In addition the method + checks for the underlaying architecture which does not work when + creating product iso's because there the underlaying architecture + does not necessarily have to match the distro architecture + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.OiLETP/_old 2014-11-03 13:11:44.000000000 +0100 +++ /var/tmp/diff_new_pack.OiLETP/_new 2014-11-03 13:11:44.000000000 +0100 @@ -26,7 +26,7 @@ Group: System/Management Url: http://github.com/openSUSE/kiwi Name: kiwi -Version: 7.01.16 +Version: 7.01.17 Release: 0 Provides: kiwi-image:lxc Provides: kiwi-image:tbz ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.releasetags new/kiwi/.releasetags --- old/kiwi/.releasetags 2014-08-01 21:00:46.000000000 +0200 +++ new/kiwi/.releasetags 2014-10-30 10:34:28.000000000 +0100 @@ -6,7 +6,7 @@ ); do commit=$(echo $item | cut -f1 -d,) version=$(echo $item | cut -f2 -d,) - last_tagged=$(git tag --list --contains $commit 2>/dev/null) + last_tagged=$(git tag --list --contains $commit | head -n 1 2>/dev/null) if [ ! -z "$last_tagged" ];then echo "Current tagged version: $last_tagged" break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2014-09-16 20:39:43.000000000 +0200 +++ new/kiwi/.revision 2014-09-16 14:54:54.000000000 +0200 @@ -1 +1 @@ -246e906b77d90a76df5872eeea1c911ac611524e +e5780ac3778a5cef2c3e17f76e0750ca079dd730 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2014-09-08 20:54:44.000000000 +0200 +++ new/kiwi/metadata/KIWIConfig.xml 2014-10-27 12:16:13.000000000 +0100 @@ -308,6 +308,7 @@ <file name="libjpeg"/> <file name="libkms"/> <file name="libaio"/> + <file name="libdrm"/> </strip> </initrd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2014-10-20 08:29:10.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2014-10-26 10:15:14.000000000 +0100 @@ -843,11 +843,6 @@ # Just the first media is usually bootable at SUSE my $is_bootable = 0; if(-d "$this->{m_basesubdir}->{$cd}/boot") { - if(!$iso->makeIsoEFIBootable()) { - my $msg = 'Creating fat image for efi iso boot failed ' - . 'not efi bootable'; - $this->logMsg('W', $msg); - } if(!$iso->callBootMethods()) { my $msg = 'Creating boot methods failed, medium maybe ' . 'not be bootable'; @@ -1323,6 +1318,7 @@ print $XML $this->{m_appdata}; print $XML "</$appdata_type>\n"; $XML -> close (); + return $this; } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2014-10-22 11:50:20.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2014-10-30 12:38:56.000000000 +0100 @@ -1835,7 +1835,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.01.16"; + $data{Version} = "7.01.17"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2014-10-06 21:29:00.000000000 +0200 +++ new/kiwi/modules/KIWIIsoLinux.pm 2014-10-27 15:18:11.000000000 +0100 @@ -404,6 +404,8 @@ $para.= " -no-emul-boot"; $para.= " -boot-load-size 1"; $para.= " -b $loader"; + $para.= " -c $boot/boot.catalog"; + $para.= " -hide $boot/boot.catalog -hide-joliet $boot/boot.catalog"; $this -> {params} = $para; return $this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2014-10-22 11:19:41.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2014-10-30 11:59:29.000000000 +0100 @@ -2749,6 +2749,7 @@ local cmdline local timeout local vesa + local loader_type="grub2" #====================================== # vesa hex => resolution table #-------------------------------------- @@ -2886,6 +2887,7 @@ echo "GRUB_USE_INITRDEFI=true" >> $inst_default_grub ;; esac + loader_type="grub2-efi" fi #====================================== # write vesa vga setup @@ -2917,7 +2919,7 @@ #-------------------------------------- mkdir -p $destsPrefix/etc/sysconfig local sysb=$destsPrefix/etc/sysconfig/bootloader - echo "LOADER_TYPE=\"grub2\"" > $sysb + echo "LOADER_TYPE=\"$loader_type\"" > $sysb echo "LOADER_LOCATION=\"mbr\"" >> $sysb echo "DEFAULT_APPEND=\"$cmdline\"" >> $sysb echo "FAILSAFE_APPEND=\"$failsafe $cmdline\"" >> $sysb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-13.2-JeOS/config.xml new/kiwi/template/ix86/suse-13.2-JeOS/config.xml --- old/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-08-25 20:24:41.000000000 +0200 +++ new/kiwi/template/ix86/suse-13.2-JeOS/config.xml 2014-10-30 12:37:38.000000000 +0100 @@ -46,14 +46,14 @@ </type> </preferences> <preferences profiles="vmxFlavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.2" format="vmdk" bootloader="grub2" kernelcmdline="splash" bootpartition="false"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-13.2" format="vmdk" bootloader="grub2" kernelcmdline="splash" bootpartition="false" firmware="efi"> <systemdisk name="systemVG"/> <machine memory="512" guestOS="suse" HWversion="4"> <vmdisk id="0" controller="ide"/> <vmnic driver="e1000" interface="0" mode="bridged"/> </machine> </type> - <type image="oem" filesystem="ext3" boot="oemboot/suse-13.2" installiso="true" bootloader="grub2" kernelcmdline="splash"> + <type image="oem" filesystem="ext3" boot="oemboot/suse-13.2" installiso="true" bootloader="grub2" kernelcmdline="splash" firmware="efi"> <oemconfig> <oem-systemsize>2048</oem-systemsize> <oem-swap>true</oem-swap> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libva for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package libva for openSUSE:Factory checked in at 2014-11-03 13:11:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libva (Old) and /work/SRC/openSUSE:Factory/.libva.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libva" Changes: -------- --- /work/SRC/openSUSE:Factory/libva/libva.changes 2013-09-30 17:53:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libva.new/libva.changes 2014-11-03 13:11:33.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Oct 30 10:34:39 UTC 2014 - sndirsch(a)suse.com + +- added baselibs.conf as source to specfile in order to make factory + happy + +------------------------------------------------------------------- +Mon Oct 27 07:59:19 UTC 2014 - sndirsch(a)suse.com + +- update to version 1.4.1; most important features/changes since + release 1.2.1: + * API: add support for VP8 encoding + * API: drop VAEntrypointMax enumeration + * API: add STE filter to the VPP pipeline + * API: add H.264 MVC profiles for decoding and encoding + * API: add buffer export interfaces for interop with 3rdparty APIs (EGL, OCL) + * API: add suppor for encoder quality level + * API: add attribute usage hint flag + * Enhancement for VA trace utility + * Add support for DRM Render-Nodes (Andrey Larionov) +- removed obsolete patch libva-fix-rpmlint-error-no-return-in-non-void.patch + +------------------------------------------------------------------- Old: ---- libva-1.2.1.tar.bz2 libva-fix-rpmlint-error-no-return-in-non-void.patch New: ---- libva-1.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libva.spec ++++++ --- /var/tmp/diff_new_pack.3UIK1u/_old 2014-11-03 13:11:34.000000000 +0100 +++ /var/tmp/diff_new_pack.3UIK1u/_new 2014-11-03 13:11:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libva # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -25,14 +25,14 @@ %endif Name: libva -Version: 1.2.1 +Version: 1.4.1 Release: 0 Summary: Video Acceleration (VA) API for Linux License: MIT Group: System/Libraries Url: http://freedesktop.org/wiki/Software/vaapi Source0: http://www.freedesktop.org/software/vaapi/releases/libva/%{name}-%{version}… -Patch1: libva-fix-rpmlint-error-no-return-in-non-void.patch +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: gcc-c++ @@ -174,7 +174,6 @@ %prep %setup -q -%patch1 -p1 %build [ -d m4 ] || mkdir m4 ++++++ libva-1.2.1.tar.bz2 -> libva-1.4.1.tar.bz2 ++++++ ++++ 45516 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2014-11-03 13:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2014-10-09 12:52:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2014-11-03 13:11:27.000000000 +0100 @@ -1,0 +2,22 @@ +Wed Oct 29 20:28:18 UTC 2014 - andreas.stieger(a)gmx.de + +- git 2.1.3: + * Some MUAs mangled a line in a message that begins with "From " + to ">From " when writing to a mailbox file and feeding such an + input to "git am" used to lose such a line. + * "git daemon" (with NO_IPV6 build configuration) used to + incorrectly use the hostname even when gethostbyname() + reported that the given hostname is not found. + * Newer versions of 'meld' breaks the auto-detection we use to + see if they are new enough to support the `--output` option. + * "git pack-objects" forgot to disable the codepath to generate + object recheability bitmap when it needs to split the resulting + pack. + * "gitweb" used deprecated CGI::startfrom, which was removed from + CGI.pm as of 4.04; use CGI::start_from instead. + * "git log" documentation had an example section marked up not + quite correctly, which passed AsciiDoc but failed with + AsciiDoctor. + * Also contains some documentation updates. + +------------------------------------------------------------------- Old: ---- git-2.1.2.tar.xz New: ---- git-2.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.ayxL4v/_old 2014-11-03 13:11:28.000000000 +0100 +++ /var/tmp/diff_new_pack.ayxL4v/_new 2014-11-03 13:11:28.000000000 +0100 @@ -20,7 +20,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git -Version: 2.1.2 +Version: 2.1.3 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 ++++++ git-2.1.2.tar.xz -> git-2.1.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/Documentation/RelNotes/2.1.3.txt new/git-2.1.3/Documentation/RelNotes/2.1.3.txt --- old/git-2.1.2/Documentation/RelNotes/2.1.3.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.3/Documentation/RelNotes/2.1.3.txt 2014-10-29 20:46:17.000000000 +0100 @@ -0,0 +1,26 @@ +Git v2.1.3 Release Notes +======================== + + * Some MUAs mangled a line in a message that begins with "From " to + ">From " when writing to a mailbox file and feeding such an input to + "git am" used to lose such a line. + + * "git daemon" (with NO_IPV6 build configuration) used to incorrectly + use the hostname even when gethostbyname() reported that the given + hostname is not found. + + * Newer versions of 'meld' breaks the auto-detection we use to see if + they are new enough to support the `--output` option. + + * "git pack-objects" forgot to disable the codepath to generate + object recheability bitmap when it needs to split the resulting + pack. + + * "gitweb" used deprecated CGI::startfrom, which was removed from + CGI.pm as of 4.04; use CGI::start_from instead. + + * "git log" documentation had an example section marked up not + quite correctly, which passed AsciiDoc but failed with + AsciiDoctor. + +Also contains some documentation updates. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/Documentation/config.txt new/git-2.1.3/Documentation/config.txt --- old/git-2.1.2/Documentation/config.txt 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/Documentation/config.txt 2014-10-29 20:46:17.000000000 +0100 @@ -1754,6 +1754,15 @@ if the file has been updated, otherwise the user is prompted to indicate the success of the merge. +mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` + by inspecting the output of `meld --help`. Configuring + `mergetool.meld.hasOutput` will make Git skip these checks and + use the configured value instead. Setting `mergetool.meld.hasOutput` + to `true` tells Git to unconditionally use the `--output` option, + and `false` avoids using `--output`. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/Documentation/git-tag.txt new/git-2.1.3/Documentation/git-tag.txt --- old/git-2.1.2/Documentation/git-tag.txt 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/Documentation/git-tag.txt 2014-10-29 20:46:17.000000000 +0100 @@ -42,7 +42,7 @@ GnuPG key for signing. The configuration variable `gpg.program` is used to specify custom GnuPG binary. -Tag objects (created with `-a`, `s`, or `-u`) are called "annotated" +Tag objects (created with `-a`, `-s`, or `-u`) are called "annotated" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a "lightweight" tag is simply a name for an object (usually a commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/Documentation/git.txt new/git-2.1.3/Documentation/git.txt --- old/git-2.1.2/Documentation/git.txt 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/Documentation/git.txt 2014-10-29 20:46:17.000000000 +0100 @@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.1.2/git.html[documentation for release 2.1.2] +* link:v2.1.3/git.html[documentation for release 2.1.3] * release notes for + link:RelNotes/2.1.3.txt[2.1.3], link:RelNotes/2.1.2.txt[2.1.2], link:RelNotes/2.1.1.txt[2.1.1], link:RelNotes/2.1.0.txt[2.1]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/Documentation/pretty-formats.txt new/git-2.1.3/Documentation/pretty-formats.txt --- old/git-2.1.2/Documentation/pretty-formats.txt 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/Documentation/pretty-formats.txt 2014-10-29 20:46:17.000000000 +0100 @@ -95,7 +95,7 @@ The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing -p<n> for traditional diff input.<< --------- +------- + The placeholders are: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/GIT-VERSION-GEN new/git-2.1.3/GIT-VERSION-GEN --- old/git-2.1.2/GIT-VERSION-GEN 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/GIT-VERSION-GEN 2014-10-29 20:46:17.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.1.2 +DEF_VER=v2.1.3 LF=' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/RelNotes new/git-2.1.3/RelNotes --- old/git-2.1.2/RelNotes 2014-11-03 13:11:29.000000000 +0100 +++ new/git-2.1.3/RelNotes 2014-11-03 13:11:29.000000000 +0100 @@ -1 +1 @@ -symbolic link to Documentation/RelNotes/2.1.2.txt +symbolic link to Documentation/RelNotes/2.1.3.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/builtin/mailinfo.c new/git-2.1.3/builtin/mailinfo.c --- old/git-2.1.2/builtin/mailinfo.c 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/builtin/mailinfo.c 2014-10-29 20:46:17.000000000 +0100 @@ -288,6 +288,22 @@ line->buf[len] == ':' && isspace(line->buf[len + 1]); } +static int is_format_patch_separator(const char *line, int len) +{ + static const char SAMPLE[] = + "From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n"; + const char *cp; + + if (len != strlen(SAMPLE)) + return 0; + if (!skip_prefix(line, "From ", &cp)) + return 0; + if (strspn(cp, "0123456789abcdef") != 40) + return 0; + cp += 40; + return !memcmp(SAMPLE + (cp - line), cp, strlen(SAMPLE) - (cp - line)); +} + static int check_header(const struct strbuf *line, struct strbuf *hdr_data[], int overwrite) { @@ -329,7 +345,7 @@ /* for inbody stuff */ if (starts_with(line->buf, ">From") && isspace(line->buf[5])) { - ret = 1; /* Should this return 0? */ + ret = is_format_patch_separator(line->buf + 1, line->len - 1); goto check_header_out; } if (starts_with(line->buf, "[PATCH]") && isspace(line->buf[7])) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/builtin/pack-objects.c new/git-2.1.3/builtin/pack-objects.c --- old/git-2.1.2/builtin/pack-objects.c 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/builtin/pack-objects.c 2014-10-29 20:46:17.000000000 +0100 @@ -812,6 +812,7 @@ fixup_pack_header_footer(fd, sha1, pack_tmp_name, nr_written, sha1, offset); close(fd); + write_bitmap_index = 0; } if (!pack_to_stdout) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/configure new/git-2.1.3/configure --- old/git-2.1.2/configure 2014-09-30 21:00:41.000000000 +0200 +++ new/git-2.1.3/configure 2014-10-29 20:46:17.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for git 2.1.2. +# Generated by GNU Autoconf 2.69 for git 2.1.3. # # Report bugs to <git(a)vger.kernel.org>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='git' PACKAGE_TARNAME='git' -PACKAGE_VERSION='2.1.2' -PACKAGE_STRING='git 2.1.2' +PACKAGE_VERSION='2.1.3' +PACKAGE_STRING='git 2.1.3' PACKAGE_BUGREPORT='git(a)vger.kernel.org' PACKAGE_URL='' @@ -1251,7 +1251,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures git 2.1.2 to adapt to many kinds of systems. +\`configure' configures git 2.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1312,7 +1312,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of git 2.1.2:";; + short | recursive ) echo "Configuration of git 2.1.3:";; esac cat <<\_ACEOF @@ -1451,7 +1451,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -git configure 2.1.2 +git configure 2.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1931,7 +1931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by git $as_me 2.1.2, which was +It was created by git $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7734,7 +7734,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by git $as_me 2.1.2, which was +This file was extended by git $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7791,7 +7791,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -git config.status 2.1.2 +git config.status 2.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/daemon.c new/git-2.1.3/daemon.c --- old/git-2.1.2/daemon.c 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/daemon.c 2014-10-29 20:46:17.000000000 +0100 @@ -573,20 +573,21 @@ static char addrbuf[HOST_NAME_MAX + 1]; hent = gethostbyname(hostname); - - ap = hent->h_addr_list; - memset(&sa, 0, sizeof sa); - sa.sin_family = hent->h_addrtype; - sa.sin_port = htons(0); - memcpy(&sa.sin_addr, *ap, hent->h_length); - - inet_ntop(hent->h_addrtype, &sa.sin_addr, - addrbuf, sizeof(addrbuf)); - - free(canon_hostname); - canon_hostname = xstrdup(hent->h_name); - free(ip_address); - ip_address = xstrdup(addrbuf); + if (hent) { + ap = hent->h_addr_list; + memset(&sa, 0, sizeof sa); + sa.sin_family = hent->h_addrtype; + sa.sin_port = htons(0); + memcpy(&sa.sin_addr, *ap, hent->h_length); + + inet_ntop(hent->h_addrtype, &sa.sin_addr, + addrbuf, sizeof(addrbuf)); + + free(canon_hostname); + canon_hostname = xstrdup(hent->h_name); + free(ip_address); + ip_address = xstrdup(addrbuf); + } #endif } } @@ -834,7 +835,6 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlist *socklist) { int socknum = 0; - int maxfd = -1; char pbuf[NI_MAXSERV]; struct addrinfo hints, *ai0, *ai; int gai; @@ -902,9 +902,6 @@ ALLOC_GROW(socklist->list, socklist->nr + 1, socklist->alloc); socklist->list[socklist->nr++] = sockfd; socknum++; - - if (maxfd < sockfd) - maxfd = sockfd; } freeaddrinfo(ai0); @@ -943,7 +940,7 @@ } if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) { - logerror("Could not listen to %s: %s", + logerror("Could not bind to %s: %s", ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)), strerror(errno)); close(sockfd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/git.spec new/git-2.1.3/git.spec --- old/git-2.1.2/git.spec 2014-09-30 21:00:41.000000000 +0200 +++ new/git-2.1.3/git.spec 2014-10-29 20:46:17.000000000 +0100 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} Summary: Core git tools License: GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/gitweb/gitweb.perl new/git-2.1.3/gitweb/gitweb.perl --- old/git-2.1.2/gitweb/gitweb.perl 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/gitweb/gitweb.perl 2014-10-29 20:46:17.000000000 +0100 @@ -4100,7 +4100,7 @@ if ($use_pathinfo) { $action .= "/".esc_url($project); } - print $cgi->startform(-method => "get", -action => $action) . + print $cgi->start_form(-method => "get", -action => $action) . "<div class=\"search\">\n" . (!$use_pathinfo && $cgi->input({-name=>"p", -value=>$project, -type=>"hidden"}) . "\n") . @@ -5510,7 +5510,7 @@ } print "<div class=\"projsearch\">\n"; - print $cgi->startform(-method => 'get', -action => $my_uri) . + print $cgi->start_form(-method => 'get', -action => $my_uri) . $cgi->hidden(-name => 'a', -value => 'project_list') . "\n"; print $cgi->hidden(-name => 'pf', -value => $project_filter). "\n" if (defined $project_filter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/mergetools/meld new/git-2.1.3/mergetools/meld --- old/git-2.1.2/mergetools/meld 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/mergetools/meld 2014-10-29 20:46:17.000000000 +0100 @@ -18,13 +18,18 @@ check_unchanged } -# Check whether 'meld --output <file>' is supported +# Check whether we should use 'meld --output <file>' check_meld_for_output_version () { meld_path="$(git config mergetool.meld.path)" meld_path="${meld_path:-meld}" - if "$meld_path" --help 2>&1 | grep -e --output >/dev/null + if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) then + : use configured value + elif "$meld_path" --help 2>&1 | + grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null + then + : old ones mention --output and new ones just say OPTION... meld_has_output_option=true else meld_has_output_option=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/t/t5100/embed-from.expect new/git-2.1.3/t/t5100/embed-from.expect --- old/git-2.1.2/t/t5100/embed-from.expect 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.3/t/t5100/embed-from.expect 2014-10-29 20:46:17.000000000 +0100 @@ -0,0 +1,5 @@ +Author: Commit Author +Email: commit(a)example.com +Subject: patch subject +Date: Sat, 13 Sep 2014 21:13:23 -0400 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/t/t5100/embed-from.in new/git-2.1.3/t/t5100/embed-from.in --- old/git-2.1.2/t/t5100/embed-from.in 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.3/t/t5100/embed-from.in 2014-10-29 20:46:17.000000000 +0100 @@ -0,0 +1,13 @@ +From 1234567890123456789012345678901234567890 Mon Sep 17 00:00:00 2001 +From: Email Author <email(a)example.com> +Date: Sun, 25 May 2008 00:38:18 -0700 +Subject: [PATCH] email subject + +>From 1234567890123456789012345678901234567890 Mon Sep 17 00:00:00 2001 +From: Commit Author <commit(a)example.com> +Date: Sat, 13 Sep 2014 21:13:23 -0400 +Subject: patch subject + +patch body +--- +patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/t/t5100/quoted-from.expect new/git-2.1.3/t/t5100/quoted-from.expect --- old/git-2.1.2/t/t5100/quoted-from.expect 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.3/t/t5100/quoted-from.expect 2014-10-29 20:46:17.000000000 +0100 @@ -0,0 +1,3 @@ +>From the depths of history, we are stuck with the +flaky mbox format. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/t/t5100/quoted-from.in new/git-2.1.3/t/t5100/quoted-from.in --- old/git-2.1.2/t/t5100/quoted-from.in 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.3/t/t5100/quoted-from.in 2014-10-29 20:46:17.000000000 +0100 @@ -0,0 +1,10 @@ +From 1234567890123456789012345678901234567890 Mon Sep 17 00:00:00 2001 +From: Author Name <somebody(a)example.com> +Date: Sun, 25 May 2008 00:38:18 -0700 +Subject: [PATCH] testing quoted >From + +>From the depths of history, we are stuck with the +flaky mbox format. + +--- +patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/t/t5100-mailinfo.sh new/git-2.1.3/t/t5100-mailinfo.sh --- old/git-2.1.2/t/t5100-mailinfo.sh 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/t/t5100-mailinfo.sh 2014-10-29 20:46:17.000000000 +0100 @@ -89,4 +89,22 @@ ' +test_expect_success 'mailinfo finds headers after embedded From line' ' + mkdir embed-from && + git mailsplit -oembed-from "$TEST_DIRECTORY"/t5100/embed-from.in && + test_cmp "$TEST_DIRECTORY"/t5100/embed-from.in embed-from/0001 && + git mailinfo embed-from/msg embed-from/patch \ + <embed-from/0001 >embed-from/out && + test_cmp "$TEST_DIRECTORY"/t5100/embed-from.expect embed-from/out +' + +test_expect_success 'mailinfo on message with quoted >From' ' + mkdir quoted-from && + git mailsplit -oquoted-from "$TEST_DIRECTORY"/t5100/quoted-from.in && + test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.in quoted-from/0001 && + git mailinfo quoted-from/msg quoted-from/patch \ + <quoted-from/0001 >quoted-from/out && + test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.expect quoted-from/msg +' + test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/t/t5310-pack-bitmaps.sh new/git-2.1.3/t/t5310-pack-bitmaps.sh --- old/git-2.1.2/t/t5310-pack-bitmaps.sh 2014-09-30 21:00:40.000000000 +0200 +++ new/git-2.1.3/t/t5310-pack-bitmaps.sh 2014-10-29 20:46:17.000000000 +0100 @@ -170,4 +170,13 @@ ) ' +test_expect_success 'splitting packs does not generate bogus bitmaps' ' + test-genrandom foo $((1024 * 1024)) >rand && + git add rand && + git commit -m "commit with big file" && + git -c pack.packSizeLimit=500k repack -adb && + git init --bare no-bitmaps.git && + git -C no-bitmaps.git fetch .. HEAD +' + test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.2/version new/git-2.1.3/version --- old/git-2.1.2/version 2014-09-30 21:00:41.000000000 +0200 +++ new/git-2.1.3/version 2014-10-29 20:46:17.000000000 +0100 @@ -1 +1 @@ -2.1.2 +2.1.3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sqlite3 for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package sqlite3 for openSUSE:Factory checked in at 2014-11-03 13:11:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sqlite3 (Old) and /work/SRC/openSUSE:Factory/.sqlite3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sqlite3" Changes: -------- --- /work/SRC/openSUSE:Factory/sqlite3/sqlite3.changes 2014-10-23 14:19:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sqlite3.new/sqlite3.changes 2014-11-03 13:11:22.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Oct 29 21:03:11 UTC 2014 - andreas.stieger(a)gmx.de + +- SQLite 3.8.7.1: + * In PRAGMA journal_mode=TRUNCATE mode, call fsync() immediately + after truncating the journal file to ensure that the + transaction is durable across a power loss. + * Fix an assertion fault that can occur when updating the NULL + value of a field at the end of a table that was added using + ALTER TABLE ADD COLUMN. + * Do not attempt to use the strchrnul() function from the + standard C library unless the HAVE_STRCHRNULL compile-time + option is set. + * Fix a couple of problems associated with running an UPDATE or + DELETE on a VIEW with a rowid in the WHERE clause. + +------------------------------------------------------------------- Old: ---- sqlite-autoconf-3080700.tar.gz sqlite-doc-3080700.zip New: ---- sqlite-autoconf-3080701.tar.gz sqlite-doc-3080701.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sqlite3.spec ++++++ --- /var/tmp/diff_new_pack.f8AvLV/_old 2014-11-03 13:11:23.000000000 +0100 +++ /var/tmp/diff_new_pack.f8AvLV/_new 2014-11-03 13:11:23.000000000 +0100 @@ -21,9 +21,9 @@ %define oname sqlite Name: %pname -Version: 3.8.7 +Version: 3.8.7.1 Release: 0 -%define tarversion 3080700 +%define tarversion 3080701 Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain Group: Productivity/Databases/Servers ++++++ sqlite-autoconf-3080700.tar.gz -> sqlite-autoconf-3080701.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqlite-autoconf-3080700/configure new/sqlite-autoconf-3080701/configure --- old/sqlite-autoconf-3080700/configure 2014-10-17 13:38:34.000000000 +0200 +++ new/sqlite-autoconf-3080701/configure 2014-10-29 15:13:39.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sqlite 3.8.7. +# Generated by GNU Autoconf 2.69 for sqlite 3.8.7.1. # # Report bugs to <http://www.sqlite.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.8.7' -PACKAGE_STRING='sqlite 3.8.7' +PACKAGE_VERSION='3.8.7.1' +PACKAGE_STRING='sqlite 3.8.7.1' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1313,7 +1313,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.8.7 to adapt to many kinds of systems. +\`configure' configures sqlite 3.8.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.8.7:";; + short | recursive ) echo "Configuration of sqlite 3.8.7.1:";; esac cat <<\_ACEOF @@ -1489,7 +1489,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.8.7 +sqlite configure 3.8.7.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1813,7 +1813,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.8.7, which was +It was created by sqlite $as_me 3.8.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2631,7 +2631,7 @@ # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.8.7' + VERSION='3.8.7.1' cat >>confdefs.h <<_ACEOF @@ -13196,7 +13196,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.8.7, which was +This file was extended by sqlite $as_me 3.8.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13253,7 +13253,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sqlite config.status 3.8.7 +sqlite config.status 3.8.7.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqlite-autoconf-3080700/configure.ac new/sqlite-autoconf-3080701/configure.ac --- old/sqlite-autoconf-3080700/configure.ac 2014-10-17 13:38:32.000000000 +0200 +++ new/sqlite-autoconf-3080701/configure.ac 2014-10-29 15:13:37.000000000 +0100 @@ -8,7 +8,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.8.7, http://www.sqlite.org) +AC_INIT(sqlite, 3.8.7.1, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) # Use automake. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqlite-autoconf-3080700/sqlite3.c new/sqlite-autoconf-3080701/sqlite3.c --- old/sqlite-autoconf-3080700/sqlite3.c 2014-10-17 13:38:32.000000000 +0200 +++ new/sqlite-autoconf-3080701/sqlite3.c 2014-10-29 15:13:37.000000000 +0100 @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.8.7. By combining all the individual C code files into this +** version 3.8.7.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -231,9 +231,9 @@ ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.8.7" +#define SQLITE_VERSION "3.8.7.1" #define SQLITE_VERSION_NUMBER 3008007 -#define SQLITE_SOURCE_ID "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4" +#define SQLITE_SOURCE_ID "2014-10-29 13:59:56 3b7b72c4685aa5cf5e675c2c47ebec10d9704221" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -20756,11 +20756,7 @@ ** the glibc version so the glibc version is definitely preferred. */ #if !defined(HAVE_STRCHRNUL) -# if defined(linux) -# define HAVE_STRCHRNUL 1 -# else -# define HAVE_STRCHRNUL 0 -# endif +# define HAVE_STRCHRNUL 0 #endif @@ -42806,6 +42802,14 @@ rc = SQLITE_OK; }else{ rc = sqlite3OsTruncate(pPager->jfd, 0); + if( rc==SQLITE_OK && pPager->fullSync ){ + /* Make sure the new file size is written into the inode right away. + ** Otherwise the journal might resurrect following a power loss and + ** cause the last transaction to roll back. See + ** https://bugzilla.mozilla.org/show_bug.cgi?id=1072773 + */ + rc = sqlite3OsSync(pPager->jfd, pPager->syncFlags); + } } pPager->journalOff = 0; }else if( pPager->journalMode==PAGER_JOURNALMODE_PERSIST @@ -71443,7 +71447,7 @@ if( pOp->p4type==P4_MEM ){ sqlite3VdbeMemShallowCopy(pDest, pOp->p4.pMem, MEM_Static); }else{ - MemSetTypeFlag(pDest, MEM_Null); + sqlite3VdbeMemSetNull(pDest); } goto op_column_out; } @@ -93757,7 +93761,7 @@ assert( nKey==nPk ); /* OP_Found will use an unpacked key */ assert( !IsVirtual(pTab) ); if( aToOpen[iDataCur-iTabCur] ){ - assert( pPk!=0 ); + assert( pPk!=0 || pTab->pSelect!=0 ); sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, addrBypass, iKey, nKey); VdbeCoverage(v); } @@ -111281,8 +111285,8 @@ /* Top of the update loop */ if( okOnePass ){ - if( aToOpen[iDataCur-iBaseCur] ){ - assert( pPk!=0 ); + if( aToOpen[iDataCur-iBaseCur] && !isView ){ + assert( pPk ); sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelBreak, regKey, nKey); VdbeCoverageNeverTaken(v); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqlite-autoconf-3080700/sqlite3.h new/sqlite-autoconf-3080701/sqlite3.h --- old/sqlite-autoconf-3080700/sqlite3.h 2014-10-17 13:38:32.000000000 +0200 +++ new/sqlite-autoconf-3080701/sqlite3.h 2014-10-29 15:13:37.000000000 +0100 @@ -107,9 +107,9 @@ ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.8.7" +#define SQLITE_VERSION "3.8.7.1" #define SQLITE_VERSION_NUMBER 3008007 -#define SQLITE_SOURCE_ID "2014-10-17 11:24:17 e4ab094f8afce0817f4074e823fabe59fc29ebb4" +#define SQLITE_SOURCE_ID "2014-10-29 13:59:56 3b7b72c4685aa5cf5e675c2c47ebec10d9704221" /* ** CAPI3REF: Run-Time Library Version Numbers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqlite-autoconf-3080700/tea/configure new/sqlite-autoconf-3080701/tea/configure --- old/sqlite-autoconf-3080700/tea/configure 2014-10-17 13:38:35.000000000 +0200 +++ new/sqlite-autoconf-3080701/tea/configure 2014-10-29 15:13:40.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sqlite 3.8.7. +# Generated by GNU Autoconf 2.69 for sqlite 3.8.7.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.8.7' -PACKAGE_STRING='sqlite 3.8.7' +PACKAGE_VERSION='3.8.7.1' +PACKAGE_STRING='sqlite 3.8.7.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1292,7 +1292,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.8.7 to adapt to many kinds of systems. +\`configure' configures sqlite 3.8.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.8.7:";; + short | recursive ) echo "Configuration of sqlite 3.8.7.1:";; esac cat <<\_ACEOF @@ -1455,7 +1455,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.8.7 +sqlite configure 3.8.7.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1866,7 +1866,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.8.7, which was +It was created by sqlite $as_me 3.8.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9365,7 +9365,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.8.7, which was +This file was extended by sqlite $as_me 3.8.7.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9418,7 +9418,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sqlite config.status 3.8.7 +sqlite config.status 3.8.7.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sqlite-autoconf-3080700/tea/configure.in new/sqlite-autoconf-3080701/tea/configure.in --- old/sqlite-autoconf-3080700/tea/configure.in 2014-10-17 13:38:34.000000000 +0200 +++ new/sqlite-autoconf-3080701/tea/configure.in 2014-10-29 15:13:39.000000000 +0100 @@ -19,7 +19,7 @@ # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([sqlite], [3.8.7]) +AC_INIT([sqlite], [3.8.7.1]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit live555 for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package live555 for openSUSE:Factory checked in at 2014-11-03 13:11:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live555 (Old) and /work/SRC/openSUSE:Factory/.live555.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "live555" Changes: -------- --- /work/SRC/openSUSE:Factory/live555/live555.changes 2014-10-05 20:30:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.live555.new/live555.changes 2014-11-03 13:11:14.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Oct 29 22:16:12 UTC 2014 - olaf(a)aepfle.de + +- BuildRequire pkg-config to get rpm Provides/Requires pkgconfig(live555) + +------------------------------------------------------------------- +Mon Oct 6 13:25:05 UTC 2014 - aloisio(a)gmx.com + +- Added support for pkg-config by creating the relevant .pc file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live555.spec ++++++ --- /var/tmp/diff_new_pack.giLf7b/_old 2014-11-03 13:11:15.000000000 +0100 +++ /var/tmp/diff_new_pack.giLf7b/_new 2014-11-03 13:11:15.000000000 +0100 @@ -19,7 +19,7 @@ Name: live555 Version: 2014.09.22 -Release: 1.1 +Release: 1.2 Summary: LIVE555 Streaming Media License: LGPL-2.1 Group: System/Libraries @@ -28,6 +28,7 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: %{name}-fpic.patch BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,8 +65,20 @@ cp -rL $fld/include/* %{buildroot}%{_includedir}/$fld done -%clean -rm -rf %{buildroot} +# creates support file for pkg-config +mkdir %{buildroot}/%{_libdir}/pkgconfig +tee %{buildroot}/%{_libdir}/pkgconfig/live555.pc << "EOF" +prefix=%{_prefix} +exec_prefix=${prefix} +libdir=${exec_prefix}/%{_lib} +includedir=${prefix}/include + +Name: live555 +Description: Multimedia streaming libraries +Version: %{version} +Libs: -L${libdir} -lliveMedia -lUsageEnvironment -lgroupsock -lBasicUsageEnvironment +Cflags: -I${includedir} -I${includedir}/liveMedia -I${includedir}/UsageEnvironment -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment +EOF %files devel %defattr(-,root,root) @@ -74,5 +87,6 @@ %{_includedir}/groupsock/ %{_includedir}/BasicUsageEnvironment/ %{_includedir}/UsageEnvironment/ +%{_libdir}/pkgconfig/live555.pc %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wget for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package wget for openSUSE:Factory checked in at 2014-11-03 13:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wget (Old) and /work/SRC/openSUSE:Factory/.wget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wget" Changes: -------- --- /work/SRC/openSUSE:Factory/wget/wget.changes 2014-06-19 13:19:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wget.new/wget.changes 2014-11-03 13:11:12.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Oct 29 20:37:47 UTC 2014 - andreas.stieger(a)gmx.de + +- GNU wget 1.16: + This release contains a fix for symlink attack which could allow + a malicious ftp server to create arbitrary files, directories or + symbolic links and set their permissions when retrieving a + directory recursively through FTP. [CVE-2014-4877] [boo#902709] + * No longer create local symbolic links by default + --retr-symlinks=no option restores previous behaviour + * Use libpsl for verifying cookie domains. + * Default progress bar output changed. + * Introduce --show-progress to force display the progress bar. + * Introduce --no-config. The wgetrc files will not be read. + * Introduce --start-pos to allow starting downloads from a specified position. + * Fix a problem with ISA Server Proxy and keep-alive connections. +- refresh wget-libproxy.patch for upstream changes +- make some dependencies only required for testsuite optional + +------------------------------------------------------------------- Old: ---- wget-1.15.tar.xz wget-1.15.tar.xz.sig New: ---- wget-1.16.tar.xz wget-1.16.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wget.spec ++++++ --- /var/tmp/diff_new_pack.wezBc2/_old 2014-11-03 13:11:13.000000000 +0100 +++ /var/tmp/diff_new_pack.wezBc2/_new 2014-11-03 13:11:13.000000000 +0100 @@ -19,7 +19,7 @@ %bcond_with regression_tests Name: wget -Version: 1.15 +Version: 1.16 Release: 0 Summary: A Tool for Mirroring FTP and HTTP Servers License: GPL-3.0+ @@ -42,10 +42,11 @@ BuildRequires: libidn-devel BuildRequires: makeinfo BuildRequires: openssl-devel +%if %{with regression_tests} # For the Testsuite BuildRequires: perl-HTTP-Daemon BuildRequires: perl-IO-Socket-SSL - +%endif BuildRequires: pkg-config BuildRequires: xz PreReq: %install_info_prereq @@ -59,7 +60,7 @@ %setup -q %patch0 %if 0%{suse_version} > 1110 -%patch1 +%patch1 -p1 %endif %patch5 -p1 %patch6 ++++++ wget-1.15.tar.xz -> wget-1.16.tar.xz ++++++ ++++ 140935 lines of diff (skipped) ++++++ wget-libproxy.patch ++++++ --- /var/tmp/diff_new_pack.wezBc2/_old 2014-11-03 13:11:14.000000000 +0100 +++ /var/tmp/diff_new_pack.wezBc2/_new 2014-11-03 13:11:14.000000000 +0100 @@ -1,11 +1,18 @@ -Index: configure.ac +--- + configure.ac | 16 ++++++++++++++++ + src/Makefile.am | 2 +- + src/retr.c | 37 +++++++++++++++++++++++++++++++++++++ + tests/Makefile.am | 1 + + 4 files changed, 55 insertions(+), 1 deletion(-) + +Index: wget-1.16/configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -338,6 +338,22 @@ else - fi +--- wget-1.16.orig/configure.ac 2014-10-29 20:41:01.000000000 +0000 ++++ wget-1.16/configure.ac 2014-10-29 20:41:05.000000000 +0000 +@@ -366,6 +366,22 @@ else fi + +dnl +dnl libproxy support +dnl @@ -25,31 +32,24 @@ dnl ********************************************************************** dnl Checks for IPv6 dnl ********************************************************************** -Index: src/Makefile.am +Index: wget-1.16/src/Makefile.am =================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am +--- wget-1.16.orig/src/Makefile.am 2014-10-29 20:41:01.000000000 +0000 ++++ wget-1.16/src/Makefile.am 2014-10-29 20:41:05.000000000 +0000 @@ -37,7 +37,7 @@ endif # The following line is losing on some versions of make! - DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" --LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) -+LIBS = @LIBICONV@ @LIBINTL@ @libproxy_LIBS@ @LIBS@ $(LIB_CLOCK_GETTIME) + DEFS += -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\" +-LIBS += $(LIBICONV) $(LIBINTL) $(LIB_CLOCK_GETTIME) ++LIBS += $(LIBICONV) $(LIBINTL) $(libproxy_LIBS) $(LIB_CLOCK_GETTIME) EXTRA_DIST = css.l css.c css_.c build_info.c.in -Index: tests/Makefile.am +Index: wget-1.16/src/retr.c =================================================================== ---- tests/Makefile.am.orig -+++ tests/Makefile.am -@@ -37,1 +37,1 @@ --LIBS = @LIBICONV@ @LIBINTL@ @LIBS@ $(LIB_CLOCK_GETTIME) -+LIBS = @LIBICONV@ @LIBINTL@ @libproxy_LIBS@ @LIBS@ $(LIB_CLOCK_GETTIME) -Index: src/retr.c -=================================================================== ---- src/retr.c.orig -+++ src/retr.c -@@ -54,6 +54,10 @@ as that of the covered work. */ +--- wget-1.16.orig/src/retr.c 2014-10-29 20:41:01.000000000 +0000 ++++ wget-1.16/src/retr.c 2014-10-29 20:41:05.000000000 +0000 +@@ -57,6 +57,10 @@ as that of the covered work. */ #include "html-url.h" #include "iri.h" @@ -60,7 +60,7 @@ /* Total size of downloaded files. Used to enforce quota. */ SUM_SIZE_INT total_downloaded_bytes; -@@ -1182,7 +1186,40 @@ getproxy (struct url *u) +@@ -1266,7 +1270,40 @@ getproxy (struct url *u) break; } if (!proxy || !*proxy) @@ -101,5 +101,15 @@ /* Handle shorthands. `rewritten_storage' is a kludge to allow getproxy() to return static storage. */ - - +Index: wget-1.16/tests/Makefile.am +=================================================================== +--- wget-1.16.orig/tests/Makefile.am 2014-10-29 20:41:40.000000000 +0000 ++++ wget-1.16/tests/Makefile.am 2014-10-29 20:42:18.000000000 +0000 +@@ -33,6 +33,7 @@ + # Version: $(VERSION) + # + ++LIBS += $(libproxy_LIBS) + + ../src/wget$(EXEEXT): + cd ../src && $(MAKE) $(AM_MAKEFLAGS) ++++++ wget.keyring ++++++ Files /var/tmp/diff_new_pack.wezBc2/_old and /var/tmp/diff_new_pack.wezBc2/_new differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vaapi-intel-driver for openSUSE:Factory
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package vaapi-intel-driver for openSUSE:Factory checked in at 2014-11-03 13:11:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vaapi-intel-driver (Old) and /work/SRC/openSUSE:Factory/.vaapi-intel-driver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vaapi-intel-driver" Changes: -------- --- /work/SRC/openSUSE:Factory/vaapi-intel-driver/vaapi-intel-driver.changes 2013-07-12 20:58:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vaapi-intel-driver.new/vaapi-intel-driver.changes 2014-11-03 13:11:06.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 27 08:26:40 UTC 2014 - sndirsch(a)suse.com + +- Update to 1.4.1; changes since release 1.2.0: + * support for more GPUs + * bunch of fixes + * new features + +------------------------------------------------------------------- Old: ---- libva-intel-driver-1.2.0.tar.bz2 New: ---- libva-intel-driver-1.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vaapi-intel-driver.spec ++++++ --- /var/tmp/diff_new_pack.rD52in/_old 2014-11-03 13:11:07.000000000 +0100 +++ /var/tmp/diff_new_pack.rD52in/_new 2014-11-03 13:11:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package vaapi-intel-driver # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -19,7 +19,7 @@ %define srcname libva-intel-driver Name: vaapi-intel-driver -Version: 1.2.0 +Version: 1.4.1 Release: 0 Summary: Intel Driver for Video Acceleration (VA) API for Linux License: MIT and EPL-1.0 ++++++ libva-intel-driver-1.2.0.tar.bz2 -> libva-intel-driver-1.4.1.tar.bz2 ++++++ ++++ 91257 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin for openSUSE:13.1:Update
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:13.1:Update checked in at 2014-11-03 12:34:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/phpMyAdmin (Old) and /work/SRC/openSUSE:13.1:Update/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.fbvw7Q/_old 2014-11-03 12:34:10.000000000 +0100 +++ /var/tmp/diff_new_pack.fbvw7Q/_new 2014-11-03 12:34:10.000000000 +0100 @@ -1 +1 @@ -<link package='phpMyAdmin.3035' cicount='copy' /> +<link package='phpMyAdmin.3090' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin for openSUSE:12.3:Update
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:12.3:Update checked in at 2014-11-03 12:34:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/phpMyAdmin (Old) and /work/SRC/openSUSE:12.3:Update/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.UDbEOZ/_old 2014-11-03 12:34:08.000000000 +0100 +++ /var/tmp/diff_new_pack.UDbEOZ/_new 2014-11-03 12:34:08.000000000 +0100 @@ -1 +1 @@ -<link package='phpMyAdmin.3035' cicount='copy' /> +<link package='phpMyAdmin.3090' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin.3090 for openSUSE:12.3:Update
by root＠hilbert.suse.de 03 Nov '14

03 Nov '14

Hello community, here is the log from the commit of package phpMyAdmin.3090 for openSUSE:12.3:Update checked in at 2014-11-03 12:34:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/phpMyAdmin.3090 (Old) and /work/SRC/openSUSE:12.3:Update/.phpMyAdmin.3090.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin.3090" Changes: -------- New Changes file: --- /dev/null 2014-10-24 22:03:51.036034256 +0200 +++ /work/SRC/openSUSE:12.3:Update/.phpMyAdmin.3090.new/phpMyAdmin.changes 2014-11-03 12:34:08.000000000 +0100 @@ -0,0 +1,1605 @@ +------------------------------------------------------------------- +Tue Oct 21 22:59:45 UTC 2014 - andreas.stieger(a)gmx.de + +- phpMyAdmin 4.1.14.6 [boo#902154] [CVE-2014-8326] + This release fixes cross-site scripting vulnerabilities in the + SQL debug output and server monitor pages. This developer option + is not enabled by default. + - sf#4562 [security] XSS in debug SQL output + - sf#4563 [security] XSS in monitor query analyzer + +------------------------------------------------------------------- +Wed Oct 1 20:26:14 UTC 2014 - andreas.stieger(a)gmx.de + +- phpMyAdmin 4.1.14.5 [bnc#899452] [CVE-2014-7217] + Contains a fix for a cross-site scripting vulnerability in the + table search and table structure pages which could be trigged + with a crafted ENUM value + - sf#4544 [security] XSS vulnerabilities in table search and + table structure pages + +------------------------------------------------------------------- +Sun Sep 14 21:27:03 UTC 2014 - chris(a)computersalat.de + +- fix for bnc#896635 + * update to 4.1.14.4 (2014-09-13) + * PMASA-2014-10 (CVE-2014-6300, CWE-661 CWE-352) + http://www.phpmyadmin.net/home_page/security/PMASA-2014-10.php + - sf#4530 [security] DOM based XSS that results to a CSRF + that creates a ROOT account in certain conditions + +------------------------------------------------------------------- +Mon Aug 18 19:09:54 UTC 2014 - andreas.stieger(a)gmx.de + +- phpMyAdmin 4.1.14.3 [bnc#892401] + This update addresses several vulnerabilities discovered in + phpMyAdmin as well as a number of non-security issues. + * sf#4501 [security] XSS in table browse page + * sf#4502 [security] Self-XSS in enum value editor + * sf#4503 [security] Self-XSSes in monitor + * sf#4505 [security] XSS in view operations page + * sf#4504 [security] Self-XSS in query charts + * sf#4517 [security] XSS in relation view + (From 4.1.14.2): + * sf#4488 [security] XSS injection due to unescaped table name + (triggers) + * sf#4492 [security] XSS in AJAX confirmation messages + * sf#4491 [security] Missing validation for accessing User groups + feature + (From 4.1.14.1): + * sf#4464 [security] XSS injection due to unescaped db/table + name in navigation hiding +- Numerous non-security bugfixes from 4.1.14.0 through 4.1.9.0 as + listed at + https://github.com/phpmyadmin/phpmyadmin/blob/MAINT_4_1_14/ChangeLog + +------------------------------------------------------------------- +Wed Feb 26 23:06:27 UTC 2014 - chris(a)computersalat.de + +- fix for bnc#864917 + * PMASA-2014-1 ( CVE-2014-1879, CWE-661 CWE-79) + * update to >= 4.1.7 +- update to 4.1.8 (2014-02-22) + * sf#4276 Login loop on session expiry + * sf#4249 Incorrect number of result rows for SQL with subqueries + * sf#4275 Broken Link to php extension manual + * sf#4053 List of procedures is not displayed after executing with Enter + * sf#4081 Setup page content shifted to the right edge of its tabs + * sf#4284 Reordering a column erases comments for other columns + * sf#4286 Open "Browse" in a new tab + * sf#4287 Printview - Always one column too much + * sf#4288 Expand database (+ icon) after timeout doesn't do anything + * sf#4285 Fixed CSS for setup + * Fixed altering table to DOUBLE/FLOAT field + * sf#4292 Success message and failure message being shown together + * sf#4293 opening new tab (using selflink) for import.php based actions + results in error and logout + +------------------------------------------------------------------- +Wed Aug 7 12:28:30 UTC 2013 - chris(a)computersalat.de + +- fix for bnc#833731 + * PMASA-2013-10 (CVE-2013-5029 CWE-661 CWE-693) + http://www.phpmyadmin.net/home_page/security/PMASA-2013-10.php +- update to 4.0.5 (2013-08-04) + + sf#3977 Not detected configuration storage + + sf#3970 Pressing enter in the filter field reloads page + + sf#3984 Cannot insert in this table (PHP < 5.4) + + sf#3989 Reloading privileges does not update the interface + + sf#3960 NavigationBarIconic config not honored + + sf#3985 Call to undefined function mb_detect_encoding + + sf#4007 Analyze option not shown for InnoDB tables + + sf#4015 Forcing a storage engine for configuration storage + + bug Incorrect Drizzle 7 detection + + sf#4019 Create database if not exists (export): add an option to the + interface to enable generating CREATE DATABASE and USE (false by default) + + sf#4012 Crash on CSV file import + + sf#4009 Statistic Monitor shows only last 3 digits in graph + + sf#3998 Non-permanent SQL history not working + + sf#3578 Transformations for text/plain on a BLOB column + + [security] Improved protection against cross framing, see PMASA-2013-10 + (CVE-2013-5029 CWE-661 CWE-693) + + Reinstated configuration directive: AllowThirdPartyFraming + +------------------------------------------------------------------- +Mon Jul 29 20:23:38 UTC 2013 - chris(a)computersalat.de + +- fix for bnc#831896 + * multiple XSS issues (+ a SQL injection and full path disclosure flaw) + * fix for PMASA-2013-8 (CWE-661, CWE-79) + * fix for PMASA-2013-9 (CWE-661 CWE-79 CWE-80) + * fix for PMASA-2013-11 (CWE-300 CWE-79) + * fix for PMASA-2013-12 (CWE-661 CWE-200) + * fix for PMASA-2013-14 (CWE-661 CWE-79) + * fix for PMASA-2013-15 (CWE-661 CWE-89 CWE-269) +- update to 3.5.8.2 (2013-07-28) + * [security] Fix self-XSS in "Showing rows", see PMASA-2013-8 + * [security] Fix self-XSS in Display chart, see PMASA-2013-9 + * [security] Fix stored XSS in Server status monitor, see PMASA-2013-9 + * [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9 + * [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9 + * [security] JSON content type header for version_check.php, see PMASA-2013-9 + * [security] Backport fix for jQuery issue #9521 from jQuery 1.6.3, see PMASA-2013-9 + * [security] Fix full path disclosure, see PMASA-2013-12 + * [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 + * [security] Fix control user SQL injection in schema_export.php, see PMASA-2013-15 + * [security] Fix self-XSS in schema export, see PMASA-2013-14 + * [security] Fix unencoded json object, see PMASA-2013-11 + +------------------------------------------------------------------- +Wed Jun 12 22:06:24 UTC 2013 - chris(a)computersalat.de + +- update to 3.5.8.1 (2013-04-24) + * [security] Remote code execution (preg_replace), reported by Janek Vind + (see PMASA-2013-2) + * [security] Locally Saved SQL Dump File Multiple File Extension Remote Code + Execution, reported by Janek Vind (see PMASA-2013-3) +- fix for bnc#824301 + * PMASA-2013-2 (CVE-2013-3238) +- fix for bnc#824302 + * PMASA-2013-3 (CVE-2013-3239) +- update to 3.5.8 (2013-04-08) + * sf#3828 MariaDB reported as MySQL + * sf#3854 Incorrect header for Safari 6.0 + * sf#3705 Attempt to open trigger for edit gives NULL + * Use HTML5 DOCTYPE + * [security] Self-XSS on GIS visualisation page, reported by Janek Vind + see PMASA-2013-1 + * sf#3800 Incorrect keyhandler behaviour #2 +- fix for bnc#814678 + * PMASA-2013-1 (CVE-2013-1937) + +------------------------------------------------------------------- +Mon Feb 4 17:34:24 CET 2013 - draht(a)suse.de + +- update to 3.5.6.0 (2013-01-28) + * sf#3593604 [status] Erroneous advisor rule + * sf#3596070 [status] localStorage broken in server status monitor + * sf#3598736 [routines] Editing a procedure with special characters + * sf#3600322 [core] Visualize GIS data throws Fatal Error + * sf#3599362 [core] Double-escaped error message + * sf#3776 [cookies] Login without auth on second server + +------------------------------------------------------------------- +Wed Jan 16 23:17:50 UTC 2013 - chris(a)computersalat.de + +- update to 3.5.5.0 (2012-12-21) + * sf#3563824 [export] Support Apache's mod_deflate + * sf#3585523 [interface] Inline query editing broken after row update + * sf#3586389 [setup] Cannot switch language in /setup + * sf#3585695 [CSS] Font size in inline query editor is way too big + * sf#3588354 [l10n] Portuguese Language not displaying correctly + * sf#3591412 [status] Live charts don't work for non-default server + * sf[core] Proxy ajax calls to pma.net to avoid browser notices + * sf#3593534 [tracking] Structure Snapshot on tracked view renders + invalid SQL + * sf#3544366 [events] Event comments not saved + +------------------------------------------------------------------- +Sat Dec 15 15:23:00 UTC 2012 - chris(a)computersalat.de + +- update to 3.5.4.0 (2012-11-16) + * sf#3570212 [edit] uuid_short() is a no-arguments function + * sf#3569577 [edit] Add routine parameter headers not valid for + "function" + * sf#3575799 [search] Various search operators not working as + expected + * sf#3576322 [search] Invalid select query generated for tables with + ENUM fields + * sf#3577468 [display] Incorrect imagejpeg Syntax Breaks Image + Transformation + * sf#3578776 [search] Editing SQL not possible when no records found + * sf#3571970 [interface] Display chart and number of rows to plot + * sf#3582631 [core] Wrong redirect url caused cookies error with + ForceSSL + +------------------------------------------------------------------- +Mon Nov 5 11:40:16 UTC 2012 - chris(a)computersalat.de ++++ 1408 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.phpMyAdmin.3090.new/phpMyAdmin.changes New: ---- phpMyAdmin-4.1.14.6-all-languages.tar.bz2 phpMyAdmin-config.patch phpMyAdmin-rpmlintrc phpMyAdmin.changes phpMyAdmin.http phpMyAdmin.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ # # spec file for package phpMyAdmin # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: phpMyAdmin %define apxs %{_sbindir}/apxs2 %define ap_sysconfdir %(%{apxs} -q SYSCONFDIR) %define ap_serverroot %(%{apxs} -q PREFIX) %define ap_docroot %(%{apxs} -q PREFIX)/htdocs %define pma_config %{_sysconfdir}/%{name}/config.inc.php %if 0%{?suse_version} %define ap_usr wwwrun %define ap_grp www %else %define ap_usr nobody %define ap_grp nogroup %endif Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends Version: 4.1.14.6 Release: 0 Url: http://www.phpMyAdmin.net Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-lan… Source1: %{name}.http Patch0: %{name}-config.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwgen coreutils sed grep BuildRequires: apache2-devel BuildRequires: python-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif # Requires: mod_php_any Requires: php-bz2 Requires: php-gd Requires: php-iconv Requires: php-mbstring Requires: php-mcrypt Requires: php-mysql Requires: php-session Requires: php-zlib Recommends: php5-zip %description phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a single database. To accomplish the latter you'll need a properly set up MySQL user who can read/write only the desired database. It's up to you to look up the appropriate part in the MySQL manual. Currently phpMyAdmin can: * browse and drop databases, tables, views, fields and indexes * create, copy, drop, rename and alter databases, tables, fields and indexes * maintenance server, databases and tables, with proposals on server configuration * execute, edit and bookmark any SQL-statement, even batch-queries * load text files into tables * create^1 and read dumps of tables * export^1 data to various formats: CSV, XML, PDF, ISO/IEC 26300 - OpenDocument Text and Spreadsheet, Word, Excel and L^AT[E]X formats * import data and MySQL structures from Microsoft Excel and OpenDocument spreadsheets, as well as XML, CSV, and SQL files * administer multiple servers * manage MySQL users and privileges * check referential integrity in MyISAM tables * using Query-by-example (QBE), create complex queries automatically connecting required tables * create PDF graphics of your Database layout * search globally in a database or a subset of it * transform stored data into any format using a set of predefined functions, like displaying BLOB-data as image or download-link * track changes on databases, tables and views * support InnoDB tables and foreign keys (see FAQ 3.6) * support mysqli, the improved MySQL extension (see FAQ 1.17) * communicate in 57 different languages * synchronize two databases residing on the same as well as remote servers (see FAQ 9.1) %prep %setup -q -n %{name}-%{version}-all-languages ## rpmlint: # wrong-file-end-of-line-encoding %{__perl} -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php %patch0 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; find . -type f -name '*.orig' -exec rm {} \; %build %install #%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name} %{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name} %{__cp} -dR *.css *.php *.ico js libraries locale themes \ $RPM_BUILD_ROOT%{ap_docroot}/%{name} # install config to config dir %{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php # fix libraries/vendor_config.php %{__sed} -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \ $RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/vendor_config.php # fix libraries/common.inc.php #%%{__sed} -i -e "s,@PMA_Config@,%%{_sysconfdir}/%%{name}/config.inc.php,g" \ # $RPM_BUILD_ROOT%%{ap_docroot}/%%{name}/libraries/common.inc.php # generate file list find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST %{__install} -D -m0644 %{S:1} $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf # fix paths in http config %{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \ -e "s,@docdir@,%{_docdir},g" $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf # rpmlint stuff %if 0%{?suse_version} > 1020 %fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/libraries %fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/themes %endif # Fix python-bytecode-inconsistent-mtime rm -rf doc/_ext/configext.pyc pushd doc/_ext %py_compile ./ popd %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 # set PmaAbsoluteUri ### generate blowfish secret %{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \ -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} %restart_on_update apache2 %postun %restart_on_update apache2 %clean %{__rm} -rf $RPM_BUILD_ROOT %files -f FILELIST %defattr(644,root,root,755) %doc ChangeLog %doc LICENSE README RELEASE-DATE* %doc examples doc %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php %dir %{ap_docroot}/%{name} %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf %changelog ++++++ phpMyAdmin-config.patch ++++++ Index: config.sample.inc.php =================================================================== --- config.sample.inc.php.orig +++ config.sample.inc.php @@ -11,10 +11,51 @@ */ /* + * Your phpMyAdmin url + * + * Complete the variable below with the full url ie + * https://www.your_web.net/path_to_your_phpMyAdmin_directory/ + * + * It must contain characters that are valid for a URL, and the path is + * case sensitive on some Web servers, for example Unix-based servers. + * + * In most cases you can leave this variable empty, as the correct value + * will be detected automatically. However, we recommend that you do + * test to see that the auto-detection code works in your system. A good + * test is to browse a table, then edit a row and save it. There will be + * an error message if phpMyAdmin cannot auto-detect the correct value. + * + * If the auto-detection code does work properly, you can set to true the + * $cfg['PmaAbsoluteUri_DisableWarning'] variable below. + */ +$cfg['PmaAbsoluteUri'] = ''; + +/* * This is needed for cookie based authentication to encrypt password in * cookie + * YOU MUST FILL IN THIS FOR COOKIE AUTH! + */ +$cfg['blowfish_secret'] = ''; + +/* + * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set + * You should use this if and ONLY if the PmaAbsoluteUri auto-detection + * works perfectly. + */ +$cfg['PmaAbsoluteUri_DisableWarning'] = false; + +/* + * Disable the default warning that is displayed on the DB Details Structure page if + * any of the required Tables for the relationfeatures could not be found + */ +$cfg['PmaNoRelation_DisableWarning'] = false; + +/* + * Disable the default warning that is displayed if Suhosin is detected + * + * @global boolean $cfg['SuhosinDisableWarning'] */ -$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$cfg['SuhosinDisableWarning'] = true; /* * Servers configuration @@ -25,47 +66,247 @@ $i = 0; * First server */ $i++; -/* Authentication type */ -$cfg['Servers'][$i]['auth_type'] = 'cookie'; -/* Server parameters */ -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -/* Select mysql if your server does not have mysqli */ -$cfg['Servers'][$i]['extension'] = 'mysqli'; -$cfg['Servers'][$i]['AllowNoPassword'] = false; +// MySQL hostname or IP address +$cfg['Servers'][$i]['host'] = 'localhost'; + +// MySQL port - leave blank for default port +$cfg['Servers'][$i]['port'] = ''; + +// Path to the socket - leave blank for default socket +$cfg['Servers'][$i]['socket'] = ''; + +// Use SSL for connecting to MySQL server? +$cfg['Servers'][$i]['ssl'] = false; + +// How to connect to MySQL server ('tcp' or 'socket') +$cfg['Servers'][$i]['connect_type'] = 'socket'; + +// The PHP MySQL extension to use ('mysql' or 'mysqli') +$cfg['Servers'][$i]['extension'] = 'mysqli'; + +// Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0) +$cfg['Servers'][$i]['compress'] = false; + +// Authentication method (config, http or cookie based)? +$cfg['Servers'][$i]['auth_type'] = 'cookie'; + +// MySQL user +$cfg['Servers'][$i]['user'] = 'root'; + +// MySQL password (only needed with 'config' auth_type) +$cfg['Servers'][$i]['password'] = ''; + +// Allow access without password +$cfg['Servers'][$i]['AllowNoPassword'] = false; + +// whether to allow root login +$cfg['Servers'][$i]['AllowRoot'] = true; + +// Session to use for 'signon' authentication method +$cfg['Servers'][$i]['SignonSession'] = ''; + +// URL where to redirect user to login for 'signon' authentication method +$cfg['Servers'][$i]['SignonURL'] = ''; + +// URL where to redirect user after logout +$cfg['Servers'][$i]['LogoutURL'] = ''; + +// If set to a db-name, only this db is displayed in left frame +// It may also be an array of db-names, where sorting order is relevant. +$cfg['Servers'][$i]['only_db'] = ''; + +// Verbose name for this host - leave blank to show the hostname +$cfg['Servers'][$i]['verbose'] = ''; + +// set to false if you know that your pma_* tables +// are up to date. This prevents compatibility +// checks and thereby increases performance. +$cfg['Servers'][$i]['verbose_check'] = true; + +// Host authentication order, leave blank to not use +$cfg['Servers'][$i]['AllowDeny']['order'] = ''; + +// Host authentication rules, leave blank for defaults +$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); /* * phpMyAdmin configuration storage settings. */ +$cfg['Servers'][$i]['controlhost'] = 'localhost'; + +// MySQL control user settings (this user must have read-only +// access to the "mysql/user" and "mysql/db" tables). +// The controluser is also used for all relational features (pmadb) +$cfg['Servers'][$i]['controluser'] = ''; + +// The password needed for the controluser to login +// (see $cfg['Servers'][$i]['controluser']) +$cfg['Servers'][$i]['controlpass'] = ''; + +// Database used for Relation, Bookmark and PDF Features +// (see _docdir/examples/create_tables.sql) +// - leave blank for no support +// DEFAULT: 'phpmyadmin' +$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; + +// Bookmark table +// - leave blank for no bookmark support +// DEFAULT: 'pma_bookmark' +$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; + +// table to describe the relation between links (see doc) +// - leave blank for no relation-links support +// DEFAULT: 'pma_relation' +$cfg['Servers'][$i]['relation'] = 'pma__relation'; + +// table to describe the display fields +// - leave blank for no display fields support +// DEFAULT: 'pma_table_info' +$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; + +// table to describe the tables position for the PDF schema +// - leave blank for no PDF schema support +// DEFAULT: 'pma_table_coords' +$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; + +// table to describe pages of relationpdf +// - leave blank if you don't want to use this +// DEFAULT: 'pma_pdf_pages' +$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; + +// table to store column information +// - leave blank for no column comments/mime types +// DEFAULT: 'pma_column_info' +$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; + +// table to store SQL history +// - leave blank for no SQL query history +// DEFAULT: 'pma_history' +$cfg['Servers'][$i]['history'] = 'pma__history'; + +// Table to store user interface enhancement data. +// - Leave blank to disable. +// DEFAULT: 'pma_table_uiprefs' +$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; + +// Table to store version/change tracking data +// - leave blank to disable +// DEFAULT: 'pma_tracking' +$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; + +// Table in which to store information for the designer feature. +// DEFAULT: 'pma_designer_coords' +$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; + +// Table to store user preferences -- allows users to set most +// preferences by themselves and store them in the phpMyAdmin +// configuration storage database. +// If you don't allow for storing preferences in pmadb, users can +// still personalize phpMyAdmin, but settings will be saved in +// browser's local storage, or, it is is unavailable, until the end +// of session. +// DEFAULT: 'pma_userconfig' +$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; + +// Table to store a list of recently used tables to be shown in the +// left navigation frame. It helps you to jump across table directly, +// without the need to select the database, and then select the table. +// Using $cfg['LeftRecentTable'] you can configure the maximum number +// of recent tables shown. +// Without configuring the storage, you can still access the recently +// used tables, but it will disappear after you logout. +// DEFAULT: 'pma_recent' +$cfg['Servers'][$i]['recent'] = 'pma__recent'; + +// You can create different user groups with menu items attached to them. +// Users can be assigned to these groups and the logged in user +// would only see menu items configured to the usergroup he is assigned to. +// To do this it needs two tables “usergroups” (storing allowed menu items for each user group) +// and “users” (storing users and their assignments to user groups). +// DEFAULT: 'pma_users' +// DEFAULT: 'pma_usergroups' +$cfg['Servers'][$i]['users'] = 'pma__users'; +$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; + +// You can hide/show items in the navigation tree. +// DEFAULT: 'pma_navigationhiding' +$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; -/* User used to manipulate with storage */ -// $cfg['Servers'][$i]['controlhost'] = ''; -// $cfg['Servers'][$i]['controlport'] = ''; -// $cfg['Servers'][$i]['controluser'] = 'pma'; -// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; - -/* Storage database and tables */ -// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -// $cfg['Servers'][$i]['relation'] = 'pma__relation'; -// $cfg['Servers'][$i]['table_info'] = 'pma__table_info'; -// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; -// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; -// $cfg['Servers'][$i]['column_info'] = 'pma__column_info'; -// $cfg['Servers'][$i]['history'] = 'pma__history'; -// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; -// $cfg['Servers'][$i]['tracking'] = 'pma__tracking'; -// $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; -// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; -// $cfg['Servers'][$i]['recent'] = 'pma__recent'; -// $cfg['Servers'][$i]['users'] = 'pma__users'; -// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; /* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; +// The name of the file containing Swekey ids and login names for +// hardware authentication. Leave the string empty to deactivate this +// feature. +// see _docdir/examples/swekey.sample.conf +//$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma.conf'; + + +/*************************************** + * Second Server + */ + +/* +$i++; +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['port'] = ''; +$cfg['Servers'][$i]['socket'] = ''; +$cfg['Servers'][$i]['ssl'] = false; +$cfg['Servers'][$i]['connect_type'] = 'socket'; +$cfg['Servers'][$i]['extension'] = 'mysqli'; +$cfg['Servers'][$i]['compress'] = false; +$cfg['Servers'][$i]['auth_type'] = 'cookie'; +$cfg['Servers'][$i]['user'] = 'root'; +$cfg['Servers'][$i]['password'] = ''; +$cfg['Servers'][$i]['AllowNoPassword'] = false; +$cfg['Servers'][$i]['AllowRoot'] = true; +$cfg['Servers'][$i]['SignonSession'] = ''; +$cfg['Servers'][$i]['SignonURL'] = ''; +$cfg['Servers'][$i]['LogoutURL'] = ''; +$cfg['Servers'][$i]['only_db'] = ''; +$cfg['Servers'][$i]['verbose'] = ''; +$cfg['Servers'][$i]['verbose_check'] = true; +$cfg['Servers'][$i]['AllowDeny']['order'] = ''; +$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); +*/ /* + * phpMyAdmin configuration storage settings. + */ + +/* +$cfg['Servers'][$i]['controlhost'] = 'localhost'; +$cfg['Servers'][$i]['controluser'] = ''; +$cfg['Servers'][$i]['controlpass'] = ''; +$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; +$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; +$cfg['Servers'][$i]['relation'] = 'pma__relation'; +$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; +$cfg['Servers'][$i]['table_coords'] = 'pma__table_cords'; +$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; +$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; +$cfg['Servers'][$i]['history'] = 'pma__history'; +$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; +$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; +$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; +$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; +$cfg['Servers'][$i]['recent'] = 'pma__recent'; +$cfg['Servers'][$i]['users'] = 'pma__users'; +$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; +$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; +$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf'; +*/ + +// If you have more than one server configured, you can set $cfg['ServerDefault'] +// to any one of them to autoconnect to that server when phpMyAdmin is started, +// or set it to 0 to be given a list of servers without logging in +// If you have only one server configured, $cfg['ServerDefault'] *MUST* be +// set to that server. + +// Default server (0 = no default server) +$cfg['ServerDefault'] = 1; +$cfg['Server'] = '0'; +unset($cfg['Servers'][0]); + +/*************************************** * End of servers configuration */ Index: libraries/vendor_config.php =================================================================== --- libraries/vendor_config.php.orig +++ libraries/vendor_config.php @@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) { * Path to changelog file, can be gzip compressed. Useful when you want to * have documentation somewhere else, eg. /usr/share/doc. */ -define('CHANGELOG_FILE', './ChangeLog'); +define('CHANGELOG_FILE', '@docdir@/ChangeLog'); /** * Path to license file. Useful when you want to have documentation somewhere * else, eg. /usr/share/doc. */ -define('LICENSE_FILE', './LICENSE'); +define('LICENSE_FILE', '@docdir@/LICENSE'); /** * Path to config file generated using setup script. */ -define('SETUP_CONFIG_FILE', './config/config.inc.php'); +define('SETUP_CONFIG_FILE', '@sysconfdir@/config.inc.php'); /** * Whether setup requires writable directory where config @@ -46,7 +46,7 @@ define('CONFIG_DIR', './'); /** * Filename of a configuration file. */ -define('CONFIG_FILE', CONFIG_DIR . 'config.inc.php'); +define('CONFIG_FILE', SETUP_CONFIG_FILE ); /** * Filename of custom header file. ++++++ phpMyAdmin-rpmlintrc ++++++ addFilter("files-duplicated-waste") addFilter("files-duplicate") ++++++ phpMyAdmin.http ++++++ <Directory @ap_docroot@/@name@> Options FollowSymLinks AllowOverride None <IfModule mod_php5.c> php_admin_flag register_globals off php_admin_flag magic_quotes_gpc off php_admin_flag allow_url_include off php_admin_flag allow_url_fopen off php_admin_flag zend.ze1_compatibility_mode off php_admin_flag safe_mode Off php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@" # customize suhosin php_admin_value suhosin.post.max_array_index_length 256 php_admin_value suhosin.post.max_totalname_length 8192 php_admin_value suhosin.post.max_vars 2048 php_admin_value suhosin.request.max_array_index_length 256 php_admin_value suhosin.request.max_totalname_length 8192 php_admin_value suhosin.request.max_vars 2048 </IfModule> </Directory> <Directory @ap_docroot@/@name@/libraries> Order allow,deny Deny from all </Directory> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0