openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2011
- 1 participants
- 1792 discussions
Hello community,
here is the log from the commit of package bind for openSUSE:11.4
checked in at Sun Feb 27 12:40:39 CET 2011.
--------
--- old-versions/11.4/all/bind/bind.changes 2010-12-11 22:56:30.000000000 +0100
+++ 11.4/bind/bind.changes 2011-02-24 11:17:19.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Feb 24 11:14:09 CET 2011 - ug(a)suse.de
+
+- fixed security issue
+ VUL-0: bind: IXFR or DDNS update combined with high query rate
+ DoS vulnerability (CVE-2011-0414 bnc#674431)
+- version to 9.7.3
+
+-------------------------------------------------------------------
+Wed Jan 5 16:58:06 CET 2011 - meissner(a)suse.de
+
+- ifdef the sysvinit specific prereqs for openSUSE 11.4 and later
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
bind-9.7.2P3.tar.gz
New:
----
bind-9.7.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bind.spec ++++++
--- /var/tmp/diff_new_pack.4Sq0ci/_old 2011-02-27 12:39:45.000000000 +0100
+++ /var/tmp/diff_new_pack.4Sq0ci/_new 2011-02-27 12:39:45.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package bind (Version 9.7.2P3)
+# spec file for package bind
#
-# 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,13 +20,13 @@
Name: bind
%define pkg_name bind
-%define pkg_vers 9.7.2P3
+%define pkg_vers 9.7.3
BuildRequires: openldap2-devel
BuildRequires: libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel
BuildRequires: krb5-devel
Summary: Domain Name System (DNS) Server (named)
-Version: 9.7.2P3
-Release: 2
+Version: 9.7.3
+Release: 1.<RELEASE2>
License: BSD3c(or similar) ; MIT License (or similar)
Group: Productivity/Networking/DNS/Servers
Provides: dns_daemon bind8 bind9
@@ -172,7 +172,9 @@
Requires: %{name}-chrootenv
Provides: dns_daemon
PreReq: /usr/sbin/groupadd /usr/sbin/useradd
+%if %suse_version > 1131
PreReq: sysvinit(network) sysvinit(syslog)
+%endif
%description lwresd
Bind-lwresd provides resolution services to local clients using a
@@ -219,7 +221,7 @@
%patch -p1
%patch1 -p1
%patch2 -p0
-%patch4 -p1
+%patch4 -p0
%patch5 -p0
#%patch50
%if 0%{?suse_version} >= 1000
++++++ bind-9.7.2P3.tar.gz -> bind-9.7.3.tar.gz ++++++
old-versions/11.4/all/bind/bind-9.7.2P3.tar.gz 11.4/bind/bind-9.7.3.tar.gz differ: char 5, line 1
++++++ perl-path.diff ++++++
--- /var/tmp/diff_new_pack.4Sq0ci/_old 2011-02-27 12:39:45.000000000 +0100
+++ /var/tmp/diff_new_pack.4Sq0ci/_new 2011-02-27 12:39:45.000000000 +0100
@@ -1,30 +1,24 @@
-Index: bind-9.6.1P1/bin/tests/t_api.pl
-===================================================================
---- bind-9.6.1P1.orig/bin/tests/t_api.pl
-+++ bind-9.6.1P1/bin/tests/t_api.pl
+--- bin/tests/t_api.pl
++++ bin/tests/t_api.pl 2011/02/24 08:53:35
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1999-2001 Internet Software Consortium.
-Index: bind-9.6.1P1/contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl
-===================================================================
---- bind-9.6.1P1.orig/contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl
-+++ bind-9.6.1P1/contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl
+--- contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl
++++ contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl 2011/02/24 08:53:13
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl -w
+#! /usr/bin/perl -w
- # $Id: generate_normalize_data.pl,v 1.1.1.1 2003/06/04 00:27:55 marka Exp $
+ # $Id: generate_nameprep_data.pl,v 1.1.1.1 2003-06-04 00:27:54 marka Exp $
#
- # Copyright (c) 2000,2001 Japan Network Information Center.
-Index: bind-9.6.1P1/contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl
-===================================================================
---- bind-9.6.1P1.orig/contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl
-+++ bind-9.6.1P1/contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl
+ # Copyright (c) 2001 Japan Network Information Center. All rights reserved.
+--- contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl
++++ contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl 2011/02/24 08:53:24
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl -w
+#! /usr/bin/perl -w
- # $Id: generate_nameprep_data.pl,v 1.1.1.1 2003/06/04 00:27:54 marka Exp $
+ # $Id: generate_normalize_data.pl,v 1.1.1.1 2003-06-04 00:27:55 marka Exp $
#
- # Copyright (c) 2001 Japan Network Information Center. All rights reserved.
+ # Copyright (c) 2000,2001 Japan Network Information Center.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package autoyast2 for openSUSE:11.4
checked in at Sun Feb 27 12:39:23 CET 2011.
--------
--- old-versions/11.4/all/autoyast2/autoyast2.changes 2011-02-03 17:01:53.000000000 +0100
+++ 11.4/autoyast2/autoyast2.changes 2011-02-25 13:02:04.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb 23 08:20:27 CET 2011 - jsrain(a)suse.cz
+
+- do not reread target map if target system is already mounted
+ during upgrade (bnc#673033)
+- 2.20.9
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
autoyast2-2.20.8.tar.bz2
New:
----
autoyast2-2.20.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.Y7aYem/_old 2011-02-27 12:39:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Y7aYem/_new 2011-02-27 12:39:03.000000000 +0100
@@ -19,11 +19,11 @@
Name: autoyast2
-Version: 2.20.8
-Release: 1
+Version: 2.20.9
+Release: 1.<RELEASE2>
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.20.8.tar.bz2
+Source0: autoyast2-2.20.9.tar.bz2
Prefix: /usr
@@ -65,8 +65,8 @@
%package installation
License: GPLv2+
-Version: 2.20.8
-Release: 1
+Version: 2.20.9
+Release: 1.<RELEASE2>
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
# API for Disabled Modules (ProductControl)
@@ -82,7 +82,7 @@
generated with the autoyast2 package.
%prep
-%setup -n autoyast2-2.20.8
+%setup -n autoyast2-2.20.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -258,4 +258,5 @@
%dir /var/adm/autoinstall/cache
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
+
%changelog
++++++ autoyast2-2.20.8.tar.bz2 -> autoyast2-2.20.9.tar.bz2 ++++++
++++ 4445 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.8/VERSION new/autoyast2-2.20.9/VERSION
--- old/autoyast2-2.20.8/VERSION 2011-02-03 16:57:17.000000000 +0100
+++ new/autoyast2-2.20.9/VERSION 2011-02-25 12:49:50.000000000 +0100
@@ -1 +1 @@
-2.20.8
+2.20.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.8/configure.in new/autoyast2-2.20.9/configure.in
--- old/autoyast2-2.20.8/configure.in 2011-02-03 16:58:21.000000000 +0100
+++ new/autoyast2-2.20.9/configure.in 2011-02-25 13:00:13.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.20.8, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.20.9, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.8"
+VERSION="2.20.9"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <ug(a)suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.20.8/src/clients/inst_autosetup_upgrade.ycp new/autoyast2-2.20.9/src/clients/inst_autosetup_upgrade.ycp
--- old/autoyast2-2.20.8/src/clients/inst_autosetup_upgrade.ycp 2011-01-27 09:39:15.000000000 +0100
+++ new/autoyast2-2.20.9/src/clients/inst_autosetup_upgrade.ycp 2011-02-25 12:48:30.000000000 +0100
@@ -209,9 +209,9 @@
Progress::NextStage();
- Storage::ReReadTargetMap();
-
if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) {
+ // reread only if target system is not yet initialized (bnc#673033)
+ Storage::ReReadTargetMap();
if (`abort == WFM::CallFunction("inst_update_partition_auto", []))
return `abort;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package acpica for openSUSE:11.4
checked in at Sun Feb 27 12:38:21 CET 2011.
--------
--- old-versions/11.4/all/acpica/acpica.changes 2011-01-14 16:02:04.000000000 +0100
+++ 11.4/acpica/acpica.changes 2011-02-24 16:32:20.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 24 15:31:07 UTC 2011 - trenn(a)novell.com
+
+- Add possibility to see changes via new -s param: -r [ -s sleep ]
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ acpica.spec ++++++
--- /var/tmp/diff_new_pack.UGNDIr/_old 2011-02-27 12:37:59.000000000 +0100
+++ /var/tmp/diff_new_pack.UGNDIr/_new 2011-02-27 12:37:59.000000000 +0100
@@ -21,7 +21,7 @@
Name: acpica
Url: http://acpica.org
Version: 20110112
-Release: 1
+Release: 4.<RELEASE2>
License: Intel ACPICA
%define src_dir acpica-unix-%{version}
%define dmp_ver 20101221
++++++ ec_access.c ++++++
--- /var/tmp/diff_new_pack.UGNDIr/_old 2011-02-27 12:38:00.000000000 +0100
+++ /var/tmp/diff_new_pack.UGNDIr/_new 2011-02-27 12:38:00.000000000 +0100
@@ -28,6 +28,7 @@
*/
static int read_mode = -1;
+static int sleep_time;
static int write_byte_offset = -1;
static int read_byte_offset = -1;
static uint8_t write_value = -1;
@@ -35,16 +36,18 @@
void usage(char progname[], int exit_status)
{
printf("Usage:\n");
- printf("1) %s -r\n", basename(progname));
+ printf("1) %s -r [-s sleep]\n", basename(progname));
printf("2) %s -b byte_offset\n", basename(progname));
printf("3) %s -w byte_offset -v value\n\n", basename(progname));
- puts("\t-r or --read -- Dump EC registers");
- puts("\t-b or --byte byte_offset -- Read value "
+ puts("\t-r [-s sleep] : Dump EC registers");
+ puts("\t If sleep is given, sleep x seconds,");
+ puts("\t re-read EC registers and show changes");
+ puts("\t-b offset : Read value"
" at byte_offset (in hex)");
- puts("\t-w or --write byte_offset -v or --value value -- "
+ puts("\t-w offset -v value : "
"Write value at byte_offset");
- puts("\t-h or --help -- Print this help\n\n");
+ puts("\t-h : Print this help\n\n");
puts("Offsets and values are in hexadecimal number sytem.");
puts("The offset and value must be between 0 and 0xff.");
exit(exit_status);
@@ -53,21 +56,8 @@
void parse_opts(int argc, char *argv[])
{
int c;
- struct option long_options[] = {
- {"read", 0, 0, 'r'},
- {"byte", 0, 0, 'b'},
- {"write", 1, 0, 'w'},
- {"value", 1, 0, 'v'},
- {"help", 0, 0, 'h'},
- {0, 0, 0, 0}
- };
-
- while (1) {
- c = getopt_long(argc, argv, "rb:w:v:h",
- long_options, NULL);
- if (c == -1)
- break;
+ while ((c = getopt(argc, argv, "rs:b:w:v:h")) != -1) {
switch (c) {
case 'r':
@@ -75,6 +65,17 @@
usage (argv[0], EXIT_FAILURE);
read_mode = 1;
break;
+ case 's':
+ if (read_mode != -1 && read_mode != 1)
+ usage (argv[0], EXIT_FAILURE);
+
+ sleep_time = atoi(optarg);
+ if (sleep_time <= 0) {
+ sleep_time = 0;
+ usage(argv[0], EXIT_FAILURE);
+ printf("Bad sleep time: %s\n", optarg);
+ }
+ break;
case 'b':
if (read_mode != -1)
usage (argv[0], EXIT_FAILURE);
@@ -127,6 +128,7 @@
void dump_ec(int fd)
{
char buf[EC_SPACE_SIZE];
+ char buf2[EC_SPACE_SIZE];
int byte_off, bytes_read;
bytes_read = read(fd, buf, EC_SPACE_SIZE);
@@ -137,14 +139,40 @@
if (bytes_read != EC_SPACE_SIZE)
fprintf(stderr, "Could only read %d bytes\n", bytes_read);
- printf("\t00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n");
+ printf(" 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
+ for (byte_off = 0; byte_off < bytes_read; byte_off++) {
+ if ((byte_off % 16) == 0)
+ printf("\n%.2X: ", byte_off);
+ printf(" %.2x ", (uint8_t)buf[byte_off]);
+ }
+ printf("\n");
+
+ if (!sleep_time)
+ return;
+
+ printf("\n");
+ lseek(fd, 0, SEEK_SET);
+ sleep(sleep_time);
+
+ bytes_read = read(fd, buf2, EC_SPACE_SIZE);
+
+ if (bytes_read == -1)
+ err(EXIT_FAILURE, "Could not read from %s\n", SYSFS_PATH);
+
+ if (bytes_read != EC_SPACE_SIZE)
+ fprintf(stderr, "Could only read %d bytes\n", bytes_read);
+
+ printf(" 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
for (byte_off = 0; byte_off < bytes_read; byte_off++) {
if ((byte_off % 16) == 0)
- printf("\n%.2X: \t", byte_off);
- printf("%.2x ", (uint8_t)buf[byte_off]);
+ printf("\n%.2X: ", byte_off);
+
+ if (buf[byte_off] == buf2[byte_off])
+ printf(" %.2x ", (uint8_t)buf2[byte_off]);
+ else
+ printf("*%.2x ", (uint8_t)buf2[byte_off]);
}
printf("\n");
- sync();
}
void read_ec_val(int fd, int byte_offset)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:11.4
checked in at Sun Feb 27 12:37:46 CET 2011.
--------
--- old-versions/11.4/all/MozillaFirefox/MozillaFirefox.changes 2011-02-09 08:47:19.000000000 +0100
+++ 11.4/MozillaFirefox/MozillaFirefox.changes 2011-02-23 10:27:44.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 23 07:52:04 UTC 2011 - wr(a)rosenauer.org
+
+- update to version 4.0b12
+- rebased patches
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
firefox-4.0b11-source.tar.bz2
l10n-4.0b11.tar.bz2
New:
----
firefox-4.0b12-source.tar.bz2
l10n-4.0b12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.SVvCIb/_old 2011-02-27 12:36:30.000000000 +0100
+++ /var/tmp/diff_new_pack.SVvCIb/_new 2011-02-27 12:36:30.000000000 +0100
@@ -31,15 +31,15 @@
BuildRequires: wireless-tools
%endif
%if 0%{?use_xulrunner}
-BuildRequires: %{xulrunner}-devel = 2.0b11
+BuildRequires: %{xulrunner}-devel = 2.0b12
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: %{mainver}b11
-Release: 1
+Version: %{mainver}b12
+Release: 1.<RELEASE2>
Provides: web_browser
Provides: firefox = %{version}-%{release}
Provides: firefox = %{mainver}
-%define releasedate 2011020300
+%define releasedate 2011022200
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -137,7 +137,7 @@
%package translations-other
Summary: Extra translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;cy;el;en_ZA;eo;et;eu;fy_NL;ga_IE;gd;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk)
+Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu)
Group: System/Localization
Requires: %{name} = %{version}
Obsoletes: %{name}-translations < %{version}-%{release}
++++++ compare-locales.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/Checks.py new/compare-locales/lib/Mozilla/Checks.py
--- old/compare-locales/lib/Mozilla/Checks.py 2011-02-04 10:10:07.000000000 +0100
+++ new/compare-locales/lib/Mozilla/Checks.py 2011-02-23 09:14:08.000000000 +0100
@@ -37,6 +37,7 @@
import re
import itertools
+import codecs
from difflib import SequenceMatcher
from xml import sax
try:
@@ -52,7 +53,7 @@
pattern = None
def use(self, file):
- return self.pattern.match(file)
+ return self.pattern.match(file.file)
def check(self, refEnt, l10nEnt):
'''Given the reference and localized Entities, performs checks.
@@ -187,30 +188,40 @@
class DTDChecker(Checker):
- '''Tests to run on DTD files.
+ """Tests to run on DTD files.
Uses xml.sax for the heavy lifting of xml parsing.
The code tries to parse until it doesn't find any unresolved entities
anymore. If it finds one, it tries to grab the key, and adds an empty
<!ENTITY key ""> definition to the header.
- '''
+ """
pattern = re.compile('.*\.dtd$')
eref = re.compile('&(%s);' % DTDParser.Name)
tmpl = '''<!DOCTYPE elem [%s]>
-<elem>
-%s
-</elem>
+<elem>%s</elem>
'''
xmllist = set(('amp', 'lt', 'gt', 'apos', 'quot'))
+ # Setup for XML parser, with default and text-only content handler
+ parser = sax.make_parser()
+ class TextContent(sax.handler.ContentHandler):
+ textcontent = ''
+ def characters(self, content):
+ self.textcontent += content
+
+ defaulthandler = sax.handler.ContentHandler()
+ texthandler = TextContent()
+
+ processContent = None
+
def check(self, refEnt, l10nEnt):
- '''Try to parse the refvalue inside a dummy element, and keep
+ """Try to parse the refvalue inside a dummy element, and keep
track of entities that we need to define to make that work.
Return a checker that offers just those entities.
- '''
+ """
refValue, l10nValue = refEnt.val, l10nEnt.val
# find entities the refValue references,
# reusing markup from DTDParser.
@@ -218,9 +229,13 @@
for m in self.eref.finditer(refValue)) \
- self.xmllist
entities = ''.join('<!ENTITY %s "">' % s for s in sorted(reflist))
- parser = sax.make_parser()
+ if self.processContent is None:
+ self.parser.setContentHandler(self.defaulthandler)
+ else:
+ self.texthandler.textcontent = ''
+ self.parser.setContentHandler(self.texthandler)
try:
- parser.parse(StringIO(self.tmpl % (entities, refValue.encode('utf-8'))))
+ self.parser.parse(StringIO(self.tmpl % (entities, refValue.encode('utf-8'))))
except sax.SAXParseException, e:
yield ('warning',
(0,0),
@@ -237,29 +252,106 @@
if reflist:
warntmpl += ' (%s known)' % ', '.join(sorted(reflist))
try:
- parser.parse(StringIO(self.tmpl % (_entities, l10nValue.encode('utf-8'))))
+ if self.processContent is not None:
+ self.texthandler.textcontent = ''
+ self.parser.parse(StringIO(self.tmpl % (_entities, l10nValue.encode('utf-8'))))
except sax.SAXParseException, e:
# xml parse error, yield error
# sometimes, the error is reported on our fake closing
# element, make that the end of the last line
- lnr = e.getLineNumber() - 2
+ lnr = e.getLineNumber() - 1
lines = l10nValue.splitlines()
if lnr > len(lines):
lnr = len(lines)
col = len(lines[lnr-1])
else:
col = e.getColumnNumber()
+ if lnr == 1:
+ col -= len("<elem>") # first line starts with <elem>, substract
yield ('error', (lnr, col), ' '.join(e.args))
for key in missing:
yield ('warning', (0,0), warntmpl % key)
+ if self.processContent is not None:
+ for t in self.processContent(self.texthandler.textcontent):
+ yield t
-__checks = [DTDChecker(), PropertiesChecker()]
+
+class PrincessAndroid(DTDChecker):
+ """Checker for the string values that Android puts into an XML container.
+
+ http://developer.android.com/guide/topics/resources/string-resource.html#Fo…
+ has more info. Check for unescaped apostrophes and bad unicode escapes.
+ """
+ quoted = re.compile("(?P<q>[\"']).*(?P=q)$")
+ def unicode_escape(self, str):
+ """Helper method to try to decode all unicode escapes in a string.
+
+ This code uses the standard python decode for unicode-escape, but that's
+ somewhat tricky, as its input needs to be ascii. To get to ascii, the
+ unicode string gets converted to ascii with backslashreplace, i.e.,
+ all non-ascii unicode chars get unicode escaped. And then we try to roll
+ all of that back.
+ Now, when that hits an error, that's from the original string, and we need
+ to search for the actual error position in the original string, as the
+ backslashreplace code changes string positions quite badly. See also the
+ last check in TestAndroid.test_android_dtd, with a lengthy chinese string.
+ """
+ val = str.encode('ascii', 'backslashreplace')
+ try:
+ val.decode('unicode-escape')
+ except UnicodeDecodeError, e:
+ args = list(e.args)
+ badstring = args[1][args[2]:args[3]]
+ i = str.rindex(badstring, 0, args[3])
+ args[2] = i
+ args[3] = i + len(badstring)
+ raise UnicodeDecodeError(*args)
+ def use(self, file):
+ """Use this Checker only for DTD files in embedding/android."""
+ return (file.module == "embedding/android") and DTDChecker.pattern.match(file.file)
+ def processContent(self, val):
+ """Actual check code.
+ Check for unicode escapes and unescaped quotes and apostrophes, if string's not quoted.
+ """
+ # first, try to decode unicode escapes
+ try:
+ self.unicode_escape(val)
+ except UnicodeDecodeError, e:
+ yield ('error', e.args[2], e.args[4])
+ # check for unescaped single or double quotes.
+ # first, see if the complete string is single or double quoted, that changes the rules
+ m = self.quoted.match(val)
+ if m:
+ q = m.group('q')
+ offset = 0
+ val = val[1:-1] # strip quotes
+ else:
+ q = "[\"']"
+ offset = -1
+ stray_quot = re.compile(r"[\\\\]*(%s)" % q)
+
+ for m in stray_quot.finditer(val):
+ if len(m.group(0)) % 2:
+ # found an unescaped single or double quote, which message?
+ msg = m.group(1) == '"' and u"Quotes in Android DTDs need escaping with \\\" or \\u0022, or put string in apostrophes." \
+ or u"Apostrophes in Android DTDs need escaping with \\' or \\u0027, or use \u2019, or put string in quotes."
+ yield ('error', m.end(0)+offset, msg)
+
+
+class __checks:
+ props = PropertiesChecker()
+ android_dtd = PrincessAndroid()
+ dtd = DTDChecker()
def getChecks(file):
- checks = map(lambda c: c.check, filter(lambda c: c.use(file), __checks))
- def _checks(refEnt, l10nEnt):
- return itertools.chain(*[c(refEnt, l10nEnt) for c in checks])
- return _checks
+ check = None
+ if __checks.props.use(file):
+ check = __checks.props.check
+ elif __checks.android_dtd.use(file):
+ check = __checks.android_dtd.check
+ elif __checks.dtd.use(file):
+ check = __checks.dtd.check
+ return check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/CompareLocales.py new/compare-locales/lib/Mozilla/CompareLocales.py
--- old/compare-locales/lib/Mozilla/CompareLocales.py 2011-02-04 10:10:07.000000000 +0100
+++ new/compare-locales/lib/Mozilla/CompareLocales.py 2011-02-23 09:14:08.000000000 +0100
@@ -425,9 +425,9 @@
f.write(''.join(map(ensureNewline,trailing)))
f.close()
def notify(self, category, file, data):
- '''Check filterObserver for the found data, and if it's
+ """Check filterObserver for the found data, and if it's
not to ignore, notify observers.
- '''
+ """
rv = self.filterObserver.notify(category, file, data)
if rv == 'ignore':
return rv
@@ -441,7 +441,7 @@
def compare(self, ref_file, l10n):
try:
p = Parser.getParser(ref_file.file)
- checks = Checks.getChecks(ref_file.file)
+ checks = Checks.getChecks(ref_file)
except UserWarning:
# no comparison, XXX report?
return
@@ -575,7 +575,7 @@
# overload this if needed
pass
-def compareApp(app, otherObserver = None, merge_stage = None):
+def compareApp(app, otherObserver = None, merge_stage = None, clobber = False):
'''Compare locales set in app.
Optional arguments are:
@@ -584,6 +584,8 @@
The return values of that callback are ignored.
- merge_stage. A directory to be used for staging the output of
l10n-merge.
+ - clobber. Clobber the module subdirectories of the merge dir as we go.
+ Use wisely, as it might cause data loss.
'''
o = Observer()
cc = ContentComparer(o)
@@ -592,6 +594,12 @@
cc.set_merge_stage(merge_stage)
o.filter = app.filter
for module, reference, locales in app:
+ if merge_stage is not None and clobber:
+ # if clobber and merge is on, remove the stage for the module if it exists
+ clobberdir = os.path.join(merge_stage, module)
+ if os.path.exists(clobberdir):
+ shutil.rmtree(clobberdir)
+ print "clobbered " + clobberdir
dc = DirectoryCompare(reference)
dc.setWatcher(cc)
for locale, localization in locales:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/tests/unitChecks.py new/compare-locales/lib/Mozilla/tests/unitChecks.py
--- old/compare-locales/lib/Mozilla/tests/unitChecks.py 2011-02-04 10:10:07.000000000 +0100
+++ new/compare-locales/lib/Mozilla/tests/unitChecks.py 2011-02-23 09:14:08.000000000 +0100
@@ -1,29 +1,30 @@
import unittest
from Mozilla.Checks import getChecks
-from Mozilla.Parser import getParser
+from Mozilla.Parser import getParser, Entity
+from Mozilla.Paths import File
class BaseHelper(unittest.TestCase):
- filename = None
+ file = None
refContent = None
def setUp(self):
- p = getParser(self.filename)
+ p = getParser(self.file.file)
p.readContents(self.refContent)
self.refs = [e for e in p]
def _test(self, content, refWarnOrErrors):
- p = getParser(self.filename)
+ p = getParser(self.file.file)
p.readContents(content)
l10n = [e for e in p]
- checks = getChecks(self.filename)
+ checks = getChecks(self.file)
found = tuple(checks(self.refs[0], l10n[0]))
self.assertEqual(found, refWarnOrErrors)
class TestPlurals(BaseHelper):
- filename = 'foo.properties'
+ file = File('foo.properties', 'foo.properties')
refContent = '''# LOCALIZATION NOTE (downloadsTitleFiles): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
# #1 number of files
@@ -60,18 +61,147 @@
class TestDTDs(BaseHelper):
- filename = 'foo.dtd'
+ file = File('foo.dtd', 'foo.dtd')
refContent = '''<!ENTITY foo "This is 'good'">
'''
def testWarning(self):
self._test('''<!ENTITY foo "This is ¬ good">
''',
(('warning',(0,0),'Referencing unknown entity `not`'),))
+ def testErrorFirstLine(self):
+ self._test('''<!ENTITY foo "This is </bad> stuff">
+''',
+ (('error',(1,10),'mismatched tag'),))
+ def testErrorSecondLine(self):
+ self._test('''<!ENTITY foo "This is
+ </bad>
+stuff">
+''',
+ (('error',(2,4),'mismatched tag'),))
def testXMLEntity(self):
self._test('''<!ENTITY foo "This is "good"">
''',
tuple())
+class TestAndroid(unittest.TestCase):
+ """Test Android checker
+
+ Make sure we're hitting our extra rules only if
+ we're passing in a DTD file in the embedding/android module.
+ """
+ apos_msg = u"Apostrophes in Android DTDs need escaping with \\' or \\u0027, " + \
+ u"or use \u2019, or put string in quotes."
+ quot_msg = u"Quotes in Android DTDs need escaping with \\\" or \\u0022, " + \
+ u"or put string in apostrophes."
+ def getEntity(self, v):
+ return Entity(v, lambda s: s, (0, len(v)), (), (0, 0), (), (), (0, len(v)), ())
+ def test_android_dtd(self):
+ """Testing the actual android checks. The logic is involved, so this is a lot
+ of nitty gritty detail tests.
+ """
+ f = File("embedding/android/strings.dtd", "strings.dtd", "embedding/android")
+ checks = getChecks(f)
+ # good string
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # dtd warning
+ l10n = self.getEntity("plain localized string &ref;")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('warning', (0, 0), 'Referencing unknown entity `ref`'),))
+ # no report on stray ampersand or quote, if not completely quoted
+ for i in xrange(3):
+ # make sure we're catching unescaped apostrophes, try 0..5 backticks
+ l10n = self.getEntity("\\"*(2*i) + "'")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 2*i, self.apos_msg),))
+ l10n = self.getEntity("\\"*(2*i + 1) + "'")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # make sure we don't report if apos string is quoted
+ l10n = self.getEntity('"' + "\\"*(2*i) + "'\"")
+ tpl = tuple(checks(ref, l10n))
+ self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl)))
+ l10n = self.getEntity('"' + "\\"*(2*i+1) + "'\"")
+ tpl = tuple(checks(ref, l10n))
+ self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl)))
+ # make sure we're catching unescaped quotes, try 0..5 backticks
+ l10n = self.getEntity("\\"*(2*i) + "\"")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 2*i, self.quot_msg),))
+ l10n = self.getEntity("\\"*(2*i + 1) + "'")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # make sure we don't report if quote string is single quoted
+ l10n = self.getEntity("'" + "\\"*(2*i) + "\"'")
+ tpl = tuple(checks(ref, l10n))
+ self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl)))
+ l10n = self.getEntity('"' + "\\"*(2*i+1) + "'\"")
+ tpl = tuple(checks(ref, l10n))
+ self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl)))
+ # check for mixed quotes and ampersands
+ l10n = self.getEntity("'\"")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 0, self.apos_msg),
+ ('error', 1, self.quot_msg)))
+ l10n = self.getEntity("''\"'")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 1, self.apos_msg),))
+ l10n = self.getEntity('"\'""')
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 2, self.quot_msg),))
+
+ # broken unicode escape
+ l10n = self.getEntity("Some broken \u098 unicode")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 12, 'truncated \\uXXXX escape'),))
+ # broken unicode escape, try to set the error off
+ l10n = self.getEntity(u"\u9690"*14+"\u006"+" "+"\u0064")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 14, 'truncated \\uXXXX escape'),))
+ def test_android_prop(self):
+ f = File("embedding/android/strings.properties", "strings.properties", "embedding/android")
+ checks = getChecks(f)
+ # good plain string
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # no dtd warning
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string &ref;")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # no report on stray ampersand
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string with apos: '")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # report on bad printf
+ ref = self.getEntity("string with %s")
+ l10n = self.getEntity("string with %S")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('error', 0, 'argument 1 `S` should be `s`'),))
+ def test_non_android_dtd(self):
+ f = File("browser/strings.dtd", "strings.dtd", "browser")
+ checks = getChecks(f)
+ # good string
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+ # dtd warning
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string &ref;")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ (('warning', (0, 0), 'Referencing unknown entity `ref`'),))
+ # no report on stray ampersand
+ ref = self.getEntity("plain string")
+ l10n = self.getEntity("plain localized string with apos: '")
+ self.assertEqual(tuple(checks(ref, l10n)),
+ ())
+
if __name__ == '__main__':
unittest.main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/scripts/compare-locales new/compare-locales/scripts/compare-locales
--- old/compare-locales/scripts/compare-locales 2011-02-04 10:10:07.000000000 +0100
+++ new/compare-locales/scripts/compare-locales 2011-02-23 09:14:08.000000000 +0100
@@ -57,6 +57,12 @@
'localization. [default: en-US]')
parser.add_option('-m', '--merge',
help='Use this directory to stage merged files')
+parser.add_option('--clobber-merge', action="store_true", default=False, dest='clobber',
+ help="""WARNING: DATALOSS.
+Use this option with care. If specified, the merge directory will
+be clobbered for each module. That means, the subdirectory will
+be completely removed, any files that were there are lost.
+Be careful to specify the right merge directory when using this option.""")
parser.add_option('--json', action='store_true', dest='json',
help='Dump just summary as exhibit JSON')
@@ -73,7 +79,11 @@
app = EnumerateApp(inipath, l10nbase, locales)
app.reference = options.reference
-o = compareApp(app, merge_stage = options.merge)
+try:
+ o = compareApp(app, merge_stage = options.merge, clobber = options.clobber)
+except (OSError, IOError), e:
+ print "FAIL: " + str(e)
+ parser.exit(2)
so = {}
if options.json:
so['type']='application/json'
++++++ firefox-4.0b11-source.tar.bz2 -> firefox-4.0b12-source.tar.bz2 ++++++
old-versions/11.4/all/MozillaFirefox/firefox-4.0b11-source.tar.bz2 11.4/MozillaFirefox/firefox-4.0b12-source.tar.bz2 differ: char 11, line 1
++++++ firefox-browser-css.patch ++++++
--- /var/tmp/diff_new_pack.SVvCIb/_old 2011-02-27 12:36:30.000000000 +0100
+++ /var/tmp/diff_new_pack.SVvCIb/_new 2011-02-27 12:36:30.000000000 +0100
@@ -9,13 +9,13 @@
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
-@@ -990,16 +990,30 @@ toolbar[iconsize="small"] #feed-button {
+@@ -954,16 +954,30 @@ toolbar[iconsize="small"] #feed-button {
}
- .urlbar-over-link-host-label,
- .urlbar-over-link-path-label {
- padding: 0;
- margin: 0;
+ #urlbar-display {
+ margin-top: 0;
+ margin-bottom: 0;
+ color: GrayText;
}
+#PopupAutoCompleteRichResult .autocomplete-richlistitem {
++++++ firefox-kde.patch ++++++
--- /var/tmp/diff_new_pack.SVvCIb/_old 2011-02-27 12:36:31.000000000 +0100
+++ /var/tmp/diff_new_pack.SVvCIb/_new 2011-02-27 12:36:31.000000000 +0100
@@ -23,7 +23,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1066 @@
+@@ -0,0 +1,1077 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -151,7 +151,7 @@
+ <menu id="context_tabViewMenu" label="&moveToGroup.label;"
+ accesskey="&moveToGroup.accesskey;">
+ <menupopup id="context_tabViewMenuPopup"
-+ onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);">
++ onpopupshowing="if (event.target == this) TabView.moveToGroupPopupShowing(event);">
+ <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
+ <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;"
+ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
@@ -493,6 +493,8 @@
+ defaultmode="icons" mode="icons"
+#ifdef WINCE
+ defaulticonsize="small" iconsize="small"
++#else
++ iconsize="large"
+#endif
+ tabsontop="true"
+ persist="tabsontop">
@@ -868,7 +870,16 @@
+ tooltiptext="&listAllTabs.label;"
+ removable="true">
+ <menupopup id="alltabs-popup"
-+ position="after_end"/>
++ position="after_end">
++ <menuitem id="menu_tabview"
++ class="menuitem-iconic"
++ key="key_tabview"
++ label="&viewTabGroups.label;"
++ command="Browser:ToggleTabView"
++ observes="tabviewGroupsNumber"
++ keepme="true"/>
++ <menuseparator id="alltabs-popup-separator" keepme="true"/>
++ </menupopup>
+ </toolbarbutton>
+
+ <toolbarbutton id="tabs-closebutton"
@@ -1026,7 +1037,7 @@
+ <toolbarbutton id="addonbar-closebutton"
+ tooltiptext="&addonBarCloseButton.tooltip;"
+ oncommand="setToolbarVisibility(this.parentNode, false);"/>
-+ <statusbar id="status-bar"/>
++ <statusbar id="status-bar" ordinal="1000"/>
+ </toolbar>
+ </vbox>
+
@@ -1096,7 +1107,7 @@
@@ -22,16 +22,18 @@ browser.jar:
* content/browser/aboutHome.css (content/aboutHome.css)
content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png)
- content/browser/aboutHome-restore-icon-rtl.png (content/aboutHome-restore-icon-rtl.png)
+ content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png)
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
* content/browser/browser.css (content/browser.css)
++++++ firefox-shellservice.patch ++++++
--- /var/tmp/diff_new_pack.SVvCIb/_old 2011-02-27 12:36:31.000000000 +0100
+++ /var/tmp/diff_new_pack.SVvCIb/_new 2011-02-27 12:36:31.000000000 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent e46704258210bc68bc65773f60a0d32cb2ce767d
+# Parent 948830682920db68e4b039f5babc34dea0040415
Bug 611953 - GNOME 3.0 readiness (based on patch 3)
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -217,7 +217,7 @@
nsresult rv;
- nsCOMPtr<nsIGIOService> giovfs =
- do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
-- NS_ENSURE_SUCCESS(rv, rv);
+- NS_ENSURE_SUCCESS(rv, NS_OK);
+ unsigned int i;
nsCOMPtr<nsIStringBundleService> bundleService =
++++++ l10n-4.0b11.tar.bz2 -> l10n-4.0b12.tar.bz2 ++++++
old-versions/11.4/all/MozillaFirefox/l10n-4.0b11.tar.bz2 11.4/MozillaFirefox/l10n-4.0b12.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package yast2-apparmor for openSUSE:Factory
checked in at Fri Feb 25 15:42:58 CET 2011.
--------
--- yast2-apparmor/yast2-apparmor.changes 2010-09-02 15:21:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-apparmor/yast2-apparmor.changes 2011-02-24 15:36:39.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Feb 24 14:31:56 UTC 2011 - lslezak(a)suse.cz
+
+- use perl-macros only in opensSUSE 11.4 (or newer)
+- 2.20.1
+
+-------------------------------------------------------------------
+Fri Feb 11 23:29:22 UTC 2011 - opensuse(a)cboltz.de
+
+- add BuildRequires: perl-macros and %{perl_requires} to ensure
+ Notify.pm is in @INC (bnc#670650#c1)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-apparmor-2.20.0.tar.bz2
New:
----
yast2-apparmor-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-apparmor.spec ++++++
--- /var/tmp/diff_new_pack.sJIt9H/_old 2011-02-25 15:42:47.000000000 +0100
+++ /var/tmp/diff_new_pack.sJIt9H/_new 2011-02-25 15:42:47.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-apparmor (Version 2.20.0)
+# spec file for package yast2-apparmor
#
-# 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
@@ -19,11 +19,11 @@
Name: yast2-apparmor
-Version: 2.20.0
+Version: 2.20.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-apparmor-2.20.0.tar.bz2
+Source0: yast2-apparmor-2.20.1.tar.bz2
Prefix: /usr
@@ -39,6 +39,12 @@
BuildRequires: yast2 yast2-devtools
+%if 0%{?suse_version} >= 1140
+# openSUSE-11.4 or newer
+BuildRequires: perl-macros
+%{perl_requires}
+%endif
+
%description
Yast2 forms and components for the management of Novell AppArmor
profiles.
@@ -47,7 +53,7 @@
SubDomain.
%prep
-%setup -n yast2-apparmor-2.20.0
+%setup -n yast2-apparmor-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-apparmor-2.20.0.tar.bz2 -> yast2-apparmor-2.20.1.tar.bz2 ++++++
++++ 4335 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.20.0/VERSION new/yast2-apparmor-2.20.1/VERSION
--- old/yast2-apparmor-2.20.0/VERSION 2010-09-02 14:56:55.000000000 +0200
+++ new/yast2-apparmor-2.20.1/VERSION 2011-02-24 15:33:33.000000000 +0100
@@ -1 +1 @@
-2.20.0
+2.20.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-apparmor-2.20.0/configure.in new/yast2-apparmor-2.20.1/configure.in
--- old/yast2-apparmor-2.20.0/configure.in 2010-08-31 17:45:26.000000000 +0200
+++ new/yast2-apparmor-2.20.1/configure.in 2011-02-24 15:35:24.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-apparmor, 2.19.0, http://bugs.opensuse.org/, yast2-apparmor)
+AC_INIT(yast2-apparmor, 2.20.1, http://bugs.opensuse.org/, yast2-apparmor)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.0"
+VERSION="2.20.1"
RPMNAME="yast2-apparmor"
MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package perl-HTML-Tagset for openSUSE:Factory
checked in at Fri Feb 25 15:42:25 CET 2011.
--------
--- perl-HTML-Tagset/perl-HTML-Tagset.changes 2010-11-30 20:26:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/perl-HTML-Tagset/perl-HTML-Tagset.changes 2011-02-25 14:24:00.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 25 13:21:51 UTC 2011 - chris(a)computersalat.de
+
+- recreated by cpanspec 1.78.03
+- noarch pkg
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-HTML-Tagset.spec ++++++
--- /var/tmp/diff_new_pack.DURxUT/_old 2011-02-25 15:41:40.000000000 +0100
+++ /var/tmp/diff_new_pack.DURxUT/_new 2011-02-25 15:41:40.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package perl-HTML-Tagset (Version 3.20)
+# spec file for package perl-HTML-Tagset
#
-# 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
@@ -15,47 +15,55 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: perl-HTML-Tagset
Version: 3.20
-Release: 53
-AutoReqProv: on
+Release: 59
+License: GPL+ or Artistic
+%define cpan_name HTML-Tagset
+Summary: Data tables useful in parsing HTML
+Url: http://search.cpan.org/dist/HTML-Tagset/
Group: Development/Libraries/Perl
-License: Artistic
-Url: http://cpan.org/modules/by-module/HTML/
-Summary: Data Tables Useful for Dealing with HTML
-Source: HTML-Tagset-%{version}.tar.bz2
+#Source: http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz
+Source: %{cpan_name}-%{version}.tar.bz2
+BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: perl
+BuildRequires: perl-macros
%{perl_requires}
-BuildRequires: perl perl-macros
%description
-Data tables useful for dealing with HTML.
+This module contains several data tables useful in various kinds of HTML
+parsing operations.
+
+Note that all tag names used are lowercase.
+
+In the following documentation, a "hashset" is a hash being used as a set
+-- the hash conveys that its keys are there, and the actual values
+associated with the keys are not significant. (But what values are there,
+are always true.)
%prep
-%setup -n HTML-Tagset-%{version} -q
+%setup -q -n %{cpan_name}-%{version}
%build
-perl Makefile.PL
-make %{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__make} %{?_smp_mflags}
%check
-make test
+%{__make} test
%install
-make DESTDIR=$RPM_BUILD_ROOT install_vendor
+%perl_make_install
%perl_process_packlist
+%perl_gen_filelist
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
-%files
-%defattr(-,root,root)
-%doc README Changes
-%doc %{_mandir}/man3/*
-%{perl_vendorlib}/HTML
-%{perl_vendorarch}/auto/HTML
+%files -f %{name}.files
+%defattr(644,root,root,755)
+%doc Changes README
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory
checked in at Fri Feb 25 15:41:07 CET 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2011-02-24 15:23:45.704322000 +0100
@@ -0,0 +1,769 @@
+-------------------------------------------------------------------
+Wed Feb 23 12:10:46 UTC 2011 - chris(a)computersalat.de
+
+- update to 3.3.9.2
+ - [security] SQL injection, see PMASA-2011-2
+- 3.3.9.1 (2011-02-08)
+ - [security] Path disclosure, see PMASA-2011-1
+- add macros for ap_usr, ap_grp
+- fix perm on sysconfdir
+ o 0750,root,www
+
+-------------------------------------------------------------------
+Thu Jan 27 20:14:40 UTC 2011 - chris(a)computersalat.de
+
+- update to 3.3.9
+ - bug [doc] Fix references to MySQL doc
+ - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand
+ - bug #3103853 [js] Double quotes were not escaped in generated js
+ - bug #3077463 [core] Events were not copied when copying/renaming database
+ - bug #1762306 [core] Copy database with view of a view
+ - patch #3117535 [replication] Add quotes to database in initial statement,
+ thanks to Craig Duncan - duncan3dc
+ - bug #3112614 [pdf schema] Scratchboard for PDF pages not working
+ - bug #3125606 [parser] Query for table "level" causes strange display
+ - bug #3127904 [parser] Close all opened round brackets indents
+- removed Authors from spec
+
+-------------------------------------------------------------------
+Fri Dec 3 23:04:41 UTC 2010 - chris(a)computersalat.de
+
+- update to 3.3.8.1
+ - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
+- rework config patch
+ o add AllowNoPassword
+
+-------------------------------------------------------------------
+Wed Oct 27 10:23:50 UTC 2010 - javier(a)opensuse.org
+
+- update to 3.3.8
+ - bug #3059311 [import] BIGINT field type added to table analysis
+ - [core] Update library PHPExcel to version 1.7.4
+ - bug #3062455 [core] copy procedures and routines before tables
+ - bug #3062455 [export] with SQL, export procedures and routines before tables
+ - bug #3056023 [import] USE query not working
+ - bug #3038193 [display] Error when editing row with GEOMETRY column
+ - bug #3062454 [interface] Display routines/events also when no tables are defin
+ed
+ - support ARIA storage engine as well as its previous name MARIA
+
+
+-------------------------------------------------------------------
+Wed Sep 22 14:03:14 CEST 2010 - mcihar(a)suse.cz
+
+- update to 3.3.7
+
+-------------------------------------------------------------------
+Wed Jul 7 14:48:50 UTC 2010 - chris(a)computersalat.de
+
+- update to version 3.3.4
+- bug #2996161 [import] properly escape import value
+- bug #2998889 [import] Import button does not work in Catalan
+- [browse] Fix handling of sort order if only column is specified.
++ [lang] Greek update, thanks to Panagiotis Papazoglou - panos78
++ [lang] Updated lot of translation based on work done in master branch.
+- bug #3008411 [databases] Last dropped database remains active in navi
+- bug #2986383 [parser] Not all data being shown / counted
+- bug [synchronize] Rows were deleted in target table regardless of the
+ "Would you like to delete..." option
+- bug [privileges] List of tables not shown when the db name has a wildcard
+- bug #3011126 [display] Edit link missing after long query
+- patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period,
+ thanks to Isaac Bennetch - ibennetch
+- [engines] Fix getting InnoDB status.
+- bug #2986422 [import] Results for query are not displayed
+
+-------------------------------------------------------------------
+Fri May 21 16:59:50 UTC 2010 - chris(a)computersalat.de
+
+- update to version 3.3.3
+ - patch #2982480 [navi] Do not group if there would be one table in group
+ - patch #2983492 [sync] When asking to synchronize Structure and Data,
+ only Structure is done
+ - patch #2984893 [engines] InnoDB storage page emits a warning
+ - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work
+ - bug #2983066 [interface] Flush table on table operations shows the query twice
+ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in
+ designer
+ - bug #2983062, patch #2989408 [engines] Fix warnings when changing table
+ engine to Maria
+ - bug #2974067 [display] non-binary fields shown as hex
+ - bug #2983065 [operations] Error when changing from Maria to MyISAM engine
+ - bug #2975408 [tracking] Data too long for column data_sql
+ - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL
+ - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for
+ which editing is protected
+ - bug #2994168 [structure] Show auto_increment in uppercase
+ - bug #2993970 [pdf schema] Page numbering in Table of Contents
+- 3.3.2.0 (2010-04-13)
+ - patch #2969449 [core] Name for MERGE engine varies depending on the
+ MySQL version, thanks to Dieter Adriaenssens - ruleant
+ - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing
+ - bug #2967366 [Structure] Some results of Propose table structure are
+ shown in hex
+ - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
+ - [navi] Changed link to git repository on main page
+ - bug #2972232 [menu] Import menu tab not present on main page
+ - patch #2976790 [menu] Go to the upper level after table DROP,
+ thanks to Kaarel Nummert - kaarelnu
+ - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_
+ - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut
+ - patch #2979234 [import] Create tables with current charset and collation.
+ - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS.
+ - bug #2973280 [export] Proper handling of temporary directory in XLS export.
+ - bug #2980582 [interface] Properly format server status parameter.
+ - bug #2973949 [session] SQL History broken (revert patch #2899969),
+ thanks to Dieter Adriaenssens - ruleant
+ - [doc] Be more specific about problems with Suhosin.
+
+-------------------------------------------------------------------
+Fri Mar 26 00:41:30 UTC 2010 - chris(a)computersalat.de
+
+- update to version 3.3.1
+ - bug #2941037 [core] Database structure not sorted by table correctly
+ - bug #2948492 [interface] Slide effect masks some fields on search page
+ - bug #2959746 [interface] Unknown table status: TABLE_TYPE
+ - bug #2953050 [export] export VIEW as SQL includes INSERT statement
+ - bug #2942032 [core] Cannot detect PmaAbsoluteUri correctly on Windows
+ - bug #2961609 [auth] Potential information disclosure at login page
+ - patch #2961540 [export] Do not export data of MERGE table,
+ thanks to Dieter Adriaenssens - ruleant
+ - bug #2961198 [parser] Querying a table named "data"
+ - bug #2931429 [structure] Editing long triggers
+ - bug #2970769 [structure] Incorrect reference to mootools-more.js
+- cleanup spec
+ - fixed HEADER
+ - sort TAGS
+ - some macros (ap_...)
+ - updated description
+ - added postun
+ o restart_on_update apache2
+- some rpmlint stuff
+ - fdupes
+- reworked patches
+ - removed blowfish_secret
+ - removed mysqli.patch
+ - added config patch
+ o mods to vendor_config
+- replaced Source1
+ phpmyadmin.conf > phpMyAdmin.http
+- config.inc.php to /etc/phpMyAdmin
+
+-------------------------------------------------------------------
+Wed Mar 10 21:41:47 UTC 2010 - javier(a)opensuse.org
+
+- Updated to 3.3.0
+ + rfe #2308632 [edit] Use hex for (var)binary fields
+ + patch #2794819 [navi] Filter for displayed table names
+ - bug #2794840 [core] Cannot redeclare pma_tableheader()
+ - rfe #2726479 [core] configurable maximal length of URL
+ + patch #2724755 [display] Full/partial text links (big T) are back
+ - bug [display] handle NavigationBarIconic as documented for navi buttons
+ + rfe #2726479 [export] Export tables preselect
+ + patch #2805828 [export] PHP array export plugin
+ + patch #2798592 [import] Progress bar
+ - bug [gui] Generate Password not working for 'Change Login Information', only for 'Change password'
+ + [lang] Arabic update
+ + rfe #2822190 [structure] BOOLEAN is standard SQL
+ + [lang] German update
+ + rfe #2813867 [structure] Default sorting order in list of tables
+ + [import] Added MySQL type-detection functionality to import library
+ + [import] Added ODS, Excel XLS, Excel XLSX, and XML import modules
+ + [export] Added Excel XLSX export module
+ + [core] Added ability for tracking changes made through phpMyAdmin
+ + rfe #2839504 [engines] Support InnoDB plugin's new row formats
+ + [core] Added ability for synchronizing databases among servers.
+ + [lang] #2843101 Dutch update
+ + [lang] Galician update
+ + [export] Added MediaWiki export module
+ + [lang] Turkish update
+ + [auth] Add custom port configuration in signon
+ - [core] Removed context from the error handler
+ - bug #2883633 [export] Export of InnoDB table is incomplete
+ + rfe #2862575 [status] Order query statistics by % desc, skip rows with 0
+ + rfe #2823686 [interface] Increase default height of query window
+ + rfe #2129902 [structure] Don't hide indexes
+ + patch #2812070 [interface] Allow selecting a range of rows by holding shift
+ + [lang] Russian update, thanks to Victor Volkov
+ + [lang] Greek update, thanks to Panagiotis Papazoglou
+ + [lang] Norwegian update, thanks to Sven-Erik Andersen
+ - bug #2929958 [import] Cannot import (French interface)
+ - [security] Use X-Frame-Options header to protect against ClickJacking.
+ + [lang] Finnish update, thanks to Jouni Kahkonen
+ + [lang] Lithuanian update, thanks to Rytis Slatkevicius - rytis_s
+ - bug #2931939 [status] Seeing "m" as unit is confusing
+ - bug #2926613 [edit] Copy database shows errors when DB has foreign key
+ + [lang] Catalan update, thanks to Xavier Navarro
+
++++ 572 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes
calling whatdependson for head-i586
New:
----
phpMyAdmin-3.3.8-config.patch
phpMyAdmin-3.3.9.2-all-languages.tar.bz2
phpMyAdmin.changes
phpMyAdmin.http
phpMyAdmin.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
#
# spec file for package phpMyAdmin
#
# 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
# 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/
#
# norootforbuild
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
Version: 3.3.9.2
Release: 1
License: GPLv2+
Group: Productivity/Networking/Web/Frontends
Url: http://www.phpMyAdmin.net
Source0: %{name}-%{version}-all-languages.tar.bz2
Source1: %{name}.http
Patch0: %{name}-3.3.8-config.patch
#Patch1: %{name}-2.11.0rc1-blowfish_secret.patch
#Patch2: %{name}-3.1.0-mysqli.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwgen coreutils sed grep
BuildRequires: apache2-devel
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
#
Requires: mod_php_any php-bz2 php-gd php-iconv
Requires: php-mbstring php-mcrypt php-mysql php-session 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
%patch0 -p1
find . -type d -exec chmod 755 {} \;
find . -type f -exec chmod 644 {} \;
find . -type f -name '*.orig' -exec rm {} \;
rm lang/*.sh
%{__rm} libraries/.htaccess
%build
%install
#%{__install} -d -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
%{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name}
%{__cp} -dR *.css *.php *.html *.ico js lang libraries pmd 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 -s ${RPM_BUILD_ROOT}
%endif
%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}
%postun
%restart_on_update apache2
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%files -f FILELIST
%defattr(644,root,root,755)
%doc CREDITS ChangeLog Documentation.* docs.css
%doc LICENSE README RELEASE-DATE* TODO translators.html
%doc scripts/*.sql
%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-3.3.8-config.patch ++++++
diff -ruN phpMyAdmin-3.3.8-all-languages-orig/config.sample.inc.php phpMyAdmin-3.3.8-all-languages/config.sample.inc.php
--- phpMyAdmin-3.3.8-all-languages-orig/config.sample.inc.php 2010-10-25 18:21:44.000000000 +0200
+++ phpMyAdmin-3.3.8-all-languages/config.sample.inc.php 2010-12-03 23:58:26.000000000 +0100
@@ -2,71 +2,278 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* phpMyAdmin sample configuration, you can use it as base for
- * manual configuration. For easier setup you can use setup/
+ * manual configuration. For easier setup you can use scripts/setup.php
*
* All directives are explained in Documentation.html and on phpMyAdmin
* wiki <http://wiki.phpmyadmin.net>.
+ */
+
+/**
+ * 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.
*
- * @version $Id$
- * @package phpMyAdmin
+ * 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'] = 'https://@FQDN@/phpMyAdmin/';
-/*
- * This is needed for cookie based authentication to encrypt password in
- * cookie
+
+/**
+ * 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['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$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;
+
+/**
+ * The 'cookie' auth_type uses blowfish algorithm to encrypt the password. If
+ * at least one server configuration uses 'cookie' auth_type, enter here a
+ * passphrase that will be used by blowfish.
+ */
+$cfg['blowfish_secret'] = '';
+
+
+
+/*******************************************************************************
* Servers configuration
*/
$i = 0;
-/*
- * First server
+/***************************************
+ * 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 mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
-
-/* rajk - for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-
-/* User for advanced features */
-// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
-/* Advanced phpMyAdmin features */
-// $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]['tracking'] = 'pma_tracking';
-// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
-/* Contrib / Swekey authentication */
-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
+// 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;
+
+// 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'] = '';
+$cfg['Servers'][$i]['controlpass'] = '';
+
+// Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['auth_type'] = 'http';
+
+// 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;
+
+// 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'] = '';
+
+// Database used for Relation, Bookmark and PDF Features
+// (see scripts/create_tables.sql)
+// - leave blank for no support
+// DEFAULT: 'phpmyadmin'
+$cfg['Servers'][$i]['pmadb'] = '';
+
+// Bookmark table
+// - leave blank for no bookmark support
+// DEFAULT: 'pma_bookmark'
+$cfg['Servers'][$i]['bookmarktable'] = '';
+
+// table to describe the relation between links (see doc)
+// - leave blank for no relation-links support
+// DEFAULT: 'pma_relation'
+$cfg['Servers'][$i]['relation'] = '';
+
+// table to describe the display fields
+// - leave blank for no display fields support
+// DEFAULT: 'pma_table_info'
+$cfg['Servers'][$i]['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'] = '';
+
+// 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'] = '';
+
+// table to store column information
+// - leave blank for no column comments/mime types
+// DEFAULT: 'pma_column_info'
+$cfg['Servers'][$i]['column_info'] = '';
+
+// table to store SQL history
+// - leave blank for no SQL query history
+// DEFAULT: 'pma_history'
+$cfg['Servers'][$i]['history'] = '';
+
+// 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;
+
+// whether to allow root login
+$cfg['Servers'][$i]['AllowRoot'] = 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();
+
+
+/***************************************
+ * Second Server
+ */
+
+/**
+$i++;
+$cfg['Servers'][$i]['host'] = '';
+$cfg['Servers'][$i]['port'] = '';
+$cfg['Servers'][$i]['socket'] = '';
+$cfg['Servers'][$i]['ssl'] = false;
+$cfg['Servers'][$i]['connect_type'] = 'tcp';
+$cfg['Servers'][$i]['extension'] = 'mysqli';
+$cfg['Servers'][$i]['compress'] = false;
+$cfg['Servers'][$i]['controluser'] = '';
+$cfg['Servers'][$i]['controlpass'] = '';
+$cfg['Servers'][$i]['auth_type'] = 'http';
+$cfg['Servers'][$i]['user'] = 'root';
+$cfg['Servers'][$i]['password'] = '';
+$cfg['Servers'][$i]['AllowNoPassword'] = false;
+$cfg['Servers'][$i]['SignonSession'] = '';
+$cfg['Servers'][$i]['SignonURL'] = '';
+$cfg['Servers'][$i]['LogoutURL'] = '';
+$cfg['Servers'][$i]['only_db'] = '';
+$cfg['Servers'][$i]['verbose'] = '';
+$cfg['Servers'][$i]['pmadb'] = '';
+$cfg['Servers'][$i]['bookmarktable'] = '';
+$cfg['Servers'][$i]['relation'] = '';
+$cfg['Servers'][$i]['table_info'] = '';
+$cfg['Servers'][$i]['table_coords'] = '';
+$cfg['Servers'][$i]['pdf_pages'] = '';
+$cfg['Servers'][$i]['column_info'] = '';
+$cfg['Servers'][$i]['history'] = '';
+$cfg['Servers'][$i]['verbose_check'] = true;
+$cfg['Servers'][$i]['AllowRoot'] = true;
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
+ */
+
+// 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
*/
-/*
- * Directories for saving/loading files from server
+
+/*******************************************************************************
+ * Language and character set conversion settings
*/
+
+// Default language to use, if not browser-defined or user-defined
+$cfg['DefaultLang'] = 'utf-8';
+
+// Default connection collation (used for MySQL >= 4.1)
+$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
+
+// Default character set to use for recoding of MySQL queries, does not take
+// any effect when character sets recoding is switched off by
+// $cfg['AllowAnywhereRecoding'] or in language file
+// (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
+$cfg['DefaultCharset'] = 'utf-8';
+
+// Allow character set recoding of MySQL queries, must be also enabled in language
+// file to make harder using other language files than Unicode.
+// Default value is false to avoid problems on servers without the iconv
+// extension and where dl() is not supported
+$cfg['AllowAnywhereRecoding'] = false;
+
+// You can select here which functions will be used for character set conversion.
+// Possible values are:
+// auto - automatically use available one (first is tested iconv, then
+// recode)
+// iconv - use iconv or libiconv functions
+// recode - use recode_string function
+$cfg['RecodingEngine'] = 'auto';
+
+
+/*******************************************************************************
+ * Web server upload/save/import directories
+ */
+
+// Directory for uploaded files that can be executed by phpMyAdmin.
+// For example './upload'. Leave empty for no upload directory support.
+// Use %u for username inclusion.
$cfg['UploadDir'] = '';
+
+// Directory where phpMyAdmin can save exported data on server.
+// For example './save'. Leave empty for no save directory support.
+// Use %u for username inclusion.
$cfg['SaveDir'] = '';
+// Directory where phpMyAdmin can save temporary files.
+// This is needed for MS Excel export, see documentation how to enable that.
+$cfg['TempDir'] = '';
+
?>
diff -ruN phpMyAdmin-3.3.8-all-languages-orig/libraries/common.inc.php phpMyAdmin-3.3.8-all-languages/libraries/common.inc.php
--- phpMyAdmin-3.3.8-all-languages-orig/libraries/common.inc.php 2010-10-25 18:21:44.000000000 +0200
+++ phpMyAdmin-3.3.8-all-languages/libraries/common.inc.php 2010-12-03 23:56:45.000000000 +0100
@@ -536,7 +536,7 @@
* force reading of config file, because we removed sensitive values
* in the previous iteration
*/
-$_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php');
+$_SESSION['PMA_Config'] = new PMA_Config('@PMA_Config@');
if (!defined('PMA_MINIMUM_COMMON')) {
$_SESSION['PMA_Config']->checkPmaAbsoluteUri();
diff -ruN phpMyAdmin-3.3.8-all-languages-orig/libraries/config.default.php phpMyAdmin-3.3.8-all-languages/libraries/config.default.php
--- phpMyAdmin-3.3.8-all-languages-orig/libraries/config.default.php 2010-10-25 18:21:44.000000000 +0200
+++ phpMyAdmin-3.3.8-all-languages/libraries/config.default.php 2010-12-03 23:56:45.000000000 +0100
@@ -136,7 +136,7 @@
*
* @global string $cfg['Servers'][$i]['extension']
*/
-$cfg['Servers'][$i]['extension'] = 'mysql';
+$cfg['Servers'][$i]['extension'] = 'mysqli';
/* rajk - added for blobstreaming */
$cfg['Servers'][$i]['bs_garbage_threshold'] = '';
diff -ruN phpMyAdmin-3.3.8-all-languages-orig/libraries/vendor_config.php phpMyAdmin-3.3.8-all-languages/libraries/vendor_config.php
--- phpMyAdmin-3.3.8-all-languages-orig/libraries/vendor_config.php 2010-10-25 18:21:44.000000000 +0200
+++ phpMyAdmin-3.3.8-all-languages/libraries/vendor_config.php 2010-12-03 23:56:45.000000000 +0100
@@ -15,18 +15,18 @@
* 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
++++++ 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@"
</IfModule>
</Directory>
<Directory @ap_docroot@/@name@/libraries>
Order allow,deny
Deny from all
</Directory>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package logwatch for openSUSE:Factory
checked in at Fri Feb 25 15:30:43 CET 2011.
--------
--- logwatch/logwatch.changes 2011-02-01 12:26:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/logwatch/logwatch.changes 2011-02-25 12:51:22.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 25 12:36:14 CET 2011 - pth(a)suse.de
+
+- Add patch to fix the handling of special characters in log files
+ (CVE-2011-1018, bnc#674984).
+- Make files in Logwatch_Dmeventd_Setup_Files tarball 644 and
+ repack with bzip2.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
Logwatch_Dmeventd_Setup_Files.tgz
New:
----
Logwatch_Dmeventd_Setup_Files.tar.bz2
logwatch-CVE-2011-1018.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ logwatch.spec ++++++
--- /var/tmp/diff_new_pack.s10aZ3/_old 2011-02-25 15:29:15.000000000 +0100
+++ /var/tmp/diff_new_pack.s10aZ3/_new 2011-02-25 15:29:15.000000000 +0100
@@ -27,18 +27,19 @@
Name: logwatch
Summary: Analyzes and Reports on system logs
Version: 7.3.6
-Release: 75
+Release: 80
License: MIT License (or similar)
Group: System/Monitoring
Url: http://www.logwatch.org
BuildArch: noarch
Source0: logwatch-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
-Source2: Logwatch_Dmeventd_Setup_Files.tgz
+Source2: Logwatch_Dmeventd_Setup_Files.tar.bz2
Patch0: logwatch-firewall.patch
Patch1: logwatch-full_path_to_sendmail.patch
Patch2: logwatch-timestamp_in_var.patch
Patch3: logwatch-make_save_work.patch
+Patch4: logwatch-CVE-2011-1018.patch
Requires: perl textutils sh-utils grep mailx cron %date_manip_pkg
BuildRequires: dos2unix
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,6 +63,7 @@
%patch1
%patch2
%patch3
+%patch4
dos2unix scripts/services/courier
%build
++++++ logwatch-CVE-2011-1018.patch ++++++
Index: scripts/logwatch.pl
===================================================================
--- scripts/logwatch.pl.orig 2011-02-25 12:30:40.934525836 +0100
+++ scripts/logwatch.pl 2011-02-25 12:34:45.979948361 +0100
@@ -845,6 +845,10 @@ foreach $LogFile (@LogFileList) {
my $DestFile = $TempDir . $LogFile . "-archive";
my $Archive;
foreach $Archive (@{$LogFileData{$LogFile}{'archives'}}) {
+ if ($Archive =~ /'/) {
+ print "File $Archive has invalid embedded quotes. File ignored.\n";
+ next;
+ }
my $CheckTime;
# We need to find out what's the earliest log we need
my @time_t = TimeBuild();
@@ -872,18 +876,18 @@ foreach $LogFile (@LogFileList) {
#These system calls are not secure but we are getting closer
#What needs to go is all the pipes and instead we need a command loop
#For each filter to apply -mgt
- my $arguments = "$Archive >> $DestFile";
+ my $arguments = "'${Archive}' >> $DestFile";
system("$Config{'pathtozcat'} $arguments") == 0
or die "system $Config{'pathtozcat'} failed: $?"
} elsif (($Archive =~ m/bz2$/) && (-f "$Archive")) {
#These system calls are not secure but we are getting closer
#What needs to go is all the pipes and instead we need a command loop
#For each filter to apply -mgt
- my $arguments = "$Archive 2>/dev/null >> $DestFile";
+ my $arguments = "'${Archive}' 2>/dev/null >> $DestFile";
system("$Config{'pathtobzcat'} $arguments") == 0
or die "system $Config{'pathtobzcat'} failed: $?"
- } elsif (-f "$Archive") {
- my $arguments = "$Archive >> $DestFile";
+ } elsif (-f "$Archive") && (-s "$Archive")) {
+ my $arguments = "'${Archive}' >> $DestFile";
system("$Config{'pathtocat'} $arguments") == 0
or die "system $Config{'pathtocat'} failed: $?"
} #End if/elsif existence
@@ -895,6 +899,10 @@ foreach $LogFile (@LogFileList) {
foreach my $ThisFile (@FileList) {
#Existence check for files -mgt
next unless (-f $ThisFile);
+ if ($ThisFile =~ /'/) {
+ print "File $ThisFile has invalid embedded quotes. File ignored.\n";
+ next;
+ }
if (! -r $ThisFile) {
print "File $ThisFile is not readable. Check permissions.";
if ($> != 0) {
@@ -903,7 +911,7 @@ foreach $LogFile (@LogFileList) {
print "\n";
next;
}
- $FileText .= ($ThisFile . " ");
+ $FileText .= ("'" . $ThisFile . "' ");
} #End foreach ThisFile
# remove the ENV entries set by previous service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package lv2core for openSUSE:Factory
checked in at Fri Feb 25 15:28:55 CET 2011.
--------
--- lv2core/lv2core.changes 2011-01-14 14:02:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/lv2core/lv2core.changes 2011-02-24 14:35:49.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 23 10:09:22 UTC 2011 - davejplater(a)gmail.com
+
+- Required python-redland for lv2config
+- Added man page for lv2config
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
lv2config.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lv2core.spec ++++++
--- /var/tmp/diff_new_pack.J44GOA/_old 2011-02-25 15:28:40.000000000 +0100
+++ /var/tmp/diff_new_pack.J44GOA/_new 2011-02-25 15:28:40.000000000 +0100
@@ -20,7 +20,7 @@
Name: lv2core
Version: 4.0pre1
-Release: 1
+Release: 6
Summary: Core package for LV2 plugin system
Group: Development/Tools/Other
@@ -28,6 +28,7 @@
Url: http://lv2plug.in/
Source0: http://lv2plug.in/spec/%{name}-%{version}.tar.bz2
+Source1: lv2config.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: doxygen gcc-c++ graphviz pkg-config python-base
@@ -36,6 +37,7 @@
%else
BuildRequires: libredland-devel
%endif
+Requires: python-redland
%description
LV2 is a standard for plugins and matching host applications,
@@ -48,6 +50,15 @@
but any system with LV2 plugins should have the LV2 bundle contained in
this package installed somewhere in the LV2 path
(it contains plugin classes and other useful information).
+The LV2 header (lv2.h) and core bundle (lv2core.lv2) are maintained by
+
+Authors
+-------
+David Robillard <d(a)drobilla.net>
+Steve Harris <steve(a)plugin.org.uk>
+with the input and help of many others.
+Thanks to all members of the free software community who made LV2 possible.
+
%package devel
License: LGPLv2.1+ ; X11 MIT ; GPLv2+ ; BSD3c
@@ -58,12 +69,21 @@
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
+The LV2 header (lv2.h) and core bundle (lv2core.lv2) are maintained by
+
+Authors
+-------
+David Robillard <d(a)drobilla.net>
+Steve Harris <steve(a)plugin.org.uk>
+with the input and help of many others.
+Thanks to all members of the free software community who made LV2 possible.
%prep
%setup -q
%build
+export LV2_PATH=%{_libdir}/lv2
export CFLAGS="%{optflags} -fPIC -ggdb"
export CXXFLAGS="$CFLAGS"
autowaf/waf -vv \
@@ -78,6 +98,11 @@
%install
autowaf/waf install --destdir=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
+# Install man page made with a modified help2man page combined with text from README.
+mkdir -p %{buildroot}/%{_mandir}/man1
+cp -v %{S:1} %{buildroot}/%{_mandir}/man1/
+# We need to own the directory /usr/include/lv2
+mkdir -p %{buildroot}%{_includedir}/lv2
%clean
rm -rf %{buildroot}
@@ -88,12 +113,14 @@
%files
%defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING ChangeLog INSTALL README
%{_bindir}/lv2config
+%{_mandir}/man1/lv2config.1.gz
%files devel
%defattr(-,root,root,-)
%{_includedir}/lv2.h
+%dir %{_includedir}/lv2
%dir %{_libdir}/lv2/lv2core.lv2/
%dir %{_libdir}/lv2/
%{_libdir}/pkgconfig/lv2core.pc
++++++ lv2config.1 ++++++
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
.TH LV2CONFIG "1" "February 2011" "LV2CONFIG " "User Commands"
.SH NAME
LV2CONFIG \- manual page for LV2CONFIG
.SH SYNOPSIS
.B lv2config - Build the default system lv2 include directories, /usr/include/lv2 and /usr/local/include/lv2
.B lv2config INCLUDEDIR - Build an lv2 include directory tree at INCLUDEDIR for all extensions found in $LV2_PATH.
.B lv2config BUNDLESDIR INCLUDEDIR - Build an lv2 include directory tree at INCLUDEDIR for all extensions found in bundles under BUNDLESDIR.
.SH DESCRIPTION
.IP
LV2 is a standard for plugins and matching host applications, primarily
targeted at audio processing and generation.
.PP
LV2 is a successor to LADSPA, created to address the limitations of LADSPA
which many applications have outgrown. Compared to LADSPA, all plugin data
is moved from the code to a separate data file, and the code has been made as
generic as possible. As a result, LV2 can be independently extended
(retaining compatibility wherever possible), and virtually any feasible
plugin features can be implemented in an LV2 plugin.
.IP
More information about LV2 can be found at <http://lv2plug.in>.
.PP
This package is the "core" LV2 specification in usual source package form.
The major version of this package refers to the LV2 specification revision
contained, while the minor version refers only to this package.
.IP
Application authors aren't required to depend on this package (including lv2.h
in source distributions is acceptable) but any system with LV2 plugins should
have the LV2 bundle contained in this package installed somewhere in the LV2
path (it contains plugin classes and other useful information).
.PP
Please see README file for installation instructions (this package doesn't
really fit into the usual 'library', 'program', etc. categories).
.PP
Distributions are encouraged to include this package.
.IP
-- David Robillard <d(a)drobilla.net>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package nbd for openSUSE:Factory
checked in at Fri Feb 25 15:28:12 CET 2011.
--------
--- nbd/nbd.changes 2009-08-05 12:02:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/nbd/nbd.changes 2011-02-25 12:41:13.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 25 12:40:16 CET 2011 - ms(a)suse.de
+
+- Update to nbd-2.9.20:
+ * Documentation update
+ * Fix buffer size checking (bnc #674281)
+ * Extend test suite and fix named exports
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nbd-2.9.13-close.diff
nbd-2.9.13-doc.diff
nbd-2.9.13-warn.diff
nbd-2.9.13.tar.bz2
New:
----
nbd-2.9.20-close.diff
nbd-2.9.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nbd.spec ++++++
--- /var/tmp/diff_new_pack.GNA8c9/_old 2011-02-25 15:26:22.000000000 +0100
+++ /var/tmp/diff_new_pack.GNA8c9/_new 2011-02-25 15:26:22.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package nbd (Version 2.9.13)
+# spec file for package nbd
#
-# Copyright (c) 2009 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
@@ -21,16 +21,14 @@
Name: nbd
BuildRequires: doxygen glib2-devel
PreReq: %insserv_prereq coreutils
-Version: 2.9.13
-Release: 2
-License: GPL v2 or later
+Version: 2.9.20
+Release: 1
+License: GPLv2+
Group: Productivity/Networking/Other
AutoReqProv: on
Source: %{name}-%{version}.tar.bz2
Source2: init.nbd-server
-Patch2: nbd-2.9.13-warn.diff
-Patch3: nbd-2.9.13-doc.diff
-Patch4: nbd-2.9.13-close.diff
+Patch2: nbd-2.9.20-close.diff
Summary: Network Block Device Server and Client Utilities
Url: http://nbd.sourceforge.net/
Prefix: /usr
@@ -65,7 +63,7 @@
Paul Clements <Paul.Clements(a)steeleye.com>
%package doc
-License: GPL v2 or later
+License: GPLv2+
Summary: Network Block Device Server and Client Utilities
Group: Productivity/Networking/Other
Requires: nbd = %{version}
@@ -97,14 +95,9 @@
%prep
%setup
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-touch nbd-client.8
%build
-autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
-#export CFLAGS="$RPM_OPT_FLAGS"
./configure --with-gnu-ld --prefix=/usr --mandir=%{_mandir} \
--infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \
--program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux
++++++ nbd-2.9.13-close.diff -> nbd-2.9.20-close.diff ++++++
--- nbd/nbd-2.9.13-close.diff 2009-08-05 12:02:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/nbd/nbd-2.9.20-close.diff 2011-02-25 12:41:12.000000000 +0100
@@ -1,5 +1,5 @@
---- nbd-2.9.13/nbd-client.c 2009-08-05 11:52:04.000000000 +0200
-+++ nbd-2.9.13/nbd-client.c 2009-08-05 11:54:20.000000000 +0200
+--- nbd-2.9.20/nbd-client.c 2009-08-05 11:52:04.000000000 +0200
++++ nbd-2.9.20/nbd-client.c 2009-08-05 11:54:20.000000000 +0200
@@ -62,6 +62,7 @@
len=read(fd, buf, 256);
buf[len-1]='\0';
++++++ nbd-2.9.13.tar.bz2 -> nbd-2.9.20.tar.bz2 ++++++
++++ 20760 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