openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
January 2014
- 1 participants
- 1358 discussions
Hello community,
here is the log from the commit of package pam for openSUSE:Factory checked in at 2014-01-30 19:24:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam (Old)
and /work/SRC/openSUSE:Factory/.pam.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam/pam.changes 2014-01-11 11:12:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pam.new/pam.changes 2014-01-30 19:24:26.000000000 +0100
@@ -1,0 +2,23 @@
+Mon Jan 27 17:05:11 CET 2014 - kukuk(a)suse.de
+
+- Add pam_loginuid-log_write_errors.diff: log significant loginuid
+ write errors
+- pam_xauth-sigpipe.diff: avoid potential SIGPIPE when writing to
+ xauth process
+
+-------------------------------------------------------------------
+Mon Jan 27 15:14:34 CET 2014 - kukuk(a)suse.de
+
+- Update to current git (Linux-PAM-git-20140127.diff), which
+ obsoletes pam_loginuid-part1.diff, pam_loginuid-part2.diff and
+ Linux-PAM-git-20140109.diff.
+ - Fix gratuitous use of strdup and x_strdup
+ - pam_xauth: log fatal errors preventing xauth process execution
+ - pam_loginuid: cleanup loginuid buffer initialization
+ - libpam_misc: fix an inconsistency in handling memory allocation errors
+ - pam_limits: fix utmp->ut_user handling
+ - pam_mkhomedir: check and create home directory for the same user
+ - pam_limits: detect and ignore stale utmp entries
+- Disable pam_userdb (remove db-devel from build requires)
+
+-------------------------------------------------------------------
Old:
----
Linux-PAM-git-20140109.diff
pam_loginuid-part1.diff
pam_loginuid-part2.diff
New:
----
Linux-PAM-git-20140127.diff
pam_loginuid-log_write_errors.diff
pam_xauth-sigpipe.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam.spec ++++++
--- /var/tmp/diff_new_pack.fuNH3t/_old 2014-01-30 19:24:27.000000000 +0100
+++ /var/tmp/diff_new_pack.fuNH3t/_new 2014-01-30 19:24:27.000000000 +0100
@@ -24,7 +24,6 @@
BuildRequires: audit-devel
BuildRequires: bison
BuildRequires: cracklib-devel
-BuildRequires: db-devel
BuildRequires: flex
#BuildRequires: pkgconfig(libtirpc)
%if %{enable_selinux}
@@ -53,9 +52,9 @@
Source8: etc.environment
Source9: baselibs.conf
Patch0: fix-man-links.dif
-Patch1: Linux-PAM-git-20140109.diff
-Patch2: pam_loginuid-part1.diff
-Patch3: pam_loginuid-part2.diff
+Patch1: Linux-PAM-git-20140127.diff
+Patch2: pam_loginuid-log_write_errors.diff
+Patch3: pam_xauth-sigpipe.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -275,7 +274,7 @@
/%{_lib}/security/pam_unix_auth.so
/%{_lib}/security/pam_unix_passwd.so
/%{_lib}/security/pam_unix_session.so
-/%{_lib}/security/pam_userdb.so
+#/%{_lib}/security/pam_userdb.so
/%{_lib}/security/pam_warn.so
/%{_lib}/security/pam_wheel.so
/%{_lib}/security/pam_xauth.so
++++++ Linux-PAM-git-20140109.diff -> Linux-PAM-git-20140127.diff ++++++
++++ 992 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/pam/Linux-PAM-git-20140109.diff
++++ and /work/SRC/openSUSE:Factory/.pam.new/Linux-PAM-git-20140127.diff
++++++ pam_loginuid-log_write_errors.diff ++++++
commit 256b50e1fce2f785f1032a1949dd2d1dbc17e250
Author: Dmitry V. Levin <ldv(a)altlinux.org>
Date: Sun Jan 19 14:12:59 2014 +0000
pam_loginuid: log significant loginuid write errors
* modules/pam_loginuid/pam_loginuid.c (set_loginuid): Log those errors
during /proc/self/loginuid update that are not ignored.
modules/pam_loginuid/pam_loginuid.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/modules/pam_loginuid/pam_loginuid.c b/modules/pam_loginuid/pam_loginuid.c
index c476f7b..73c42f9 100644
--- a/modules/pam_loginuid/pam_loginuid.c
+++ b/modules/pam_loginuid/pam_loginuid.c
@@ -75,8 +75,8 @@ static int set_loginuid(pam_handle_t *pamh, uid_t uid)
rc = PAM_IGNORE;
}
if (rc != PAM_IGNORE) {
- pam_syslog(pamh, LOG_ERR,
- "Cannot open /proc/self/loginuid: %m");
+ pam_syslog(pamh, LOG_ERR, "Cannot open %s: %m",
+ "/proc/self/loginuid");
}
return rc;
}
@@ -88,8 +88,14 @@ static int set_loginuid(pam_handle_t *pamh, uid_t uid)
goto done; /* already correct */
}
if (lseek(fd, 0, SEEK_SET) == 0 && ftruncate(fd, 0) == 0 &&
- pam_modutil_write(fd, loginuid, count) == count)
+ pam_modutil_write(fd, loginuid, count) == count) {
rc = PAM_SUCCESS;
+ } else {
+ if (rc != PAM_IGNORE) {
+ pam_syslog(pamh, LOG_ERR, "Error writing %s: %m",
+ "/proc/self/loginuid");
+ }
+ }
done:
close(fd);
return rc;
_______________________________________________
linux-pam-commits mailing list
linux-pam-commits(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/linux-pam-commits
++++++ pam_xauth-sigpipe.diff ++++++
commit 47db675c910a065fa9602753a904b050b0322f29
Author: Dmitry V. Levin <ldv(a)altlinux.org>
Date: Fri Jan 24 13:38:38 2014 +0000
pam_xauth: avoid potential SIGPIPE when writing to xauth process
Similar issue in pam_unix was fixed by commit Linux-PAM-0-73~8.
* modules/pam_xauth/pam_xauth.c (run_coprocess): In the parent process,
close the read end of input pipe after writing to its write end.
modules/pam_xauth/pam_xauth.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/modules/pam_xauth/pam_xauth.c b/modules/pam_xauth/pam_xauth.c
index 7075547..c7ce55a 100644
--- a/modules/pam_xauth/pam_xauth.c
+++ b/modules/pam_xauth/pam_xauth.c
@@ -179,12 +179,12 @@ run_coprocess(pam_handle_t *pamh, const char *input, char **output,
}
/* We're the parent, so close the other ends of the pipes. */
- close(ipipe[0]);
close(opipe[1]);
/* Send input to the process (if we have any), then send an EOF. */
if (input) {
(void)pam_modutil_write(ipipe[1], input, strlen(input));
}
+ close(ipipe[0]); /* close here to avoid possible SIGPIPE above */
close(ipipe[1]);
/* Read data output until we run out of stuff to read. */
_______________________________________________
linux-pam-commits mailing list
linux-pam-commits(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/linux-pam-commits
--
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 malaga-suomi for openSUSE:Factory checked in at 2014-01-30 19:23:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/malaga-suomi (Old)
and /work/SRC/openSUSE:Factory/.malaga-suomi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "malaga-suomi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/malaga-suomi/malaga-suomi.changes 2013-01-12 07:51:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.malaga-suomi.new/malaga-suomi.changes 2014-01-30 19:23:53.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Jan 26 09:41:20 UTC 2014 - tchvatal(a)suse.com
+
+- Version bump to 1.15 moving to new upstream location:
+ * tons of new words and bugs fixed.
+
+-------------------------------------------------------------------
Old:
----
suomi-malaga-1.12.tar.bz2
New:
----
suomi-malaga-1.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ malaga-suomi.spec ++++++
--- /var/tmp/diff_new_pack.iUXCKm/_old 2014-01-30 19:23:54.000000000 +0100
+++ /var/tmp/diff_new_pack.iUXCKm/_new 2014-01-30 19:23:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package malaga-suomi
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,15 @@
#
-Name: malaga-suomi
%define _name suomi-malaga
-Version: 1.12
+Name: malaga-suomi
+Version: 1.15
Release: 0
-Source: %{_name}-%{version}.tar.bz2
-Url: http://voikko.sourceforge.net/
Summary: Description of Finnish Morphology Written in Malaga
License: GPL-2.0+
Group: Productivity/Text/Spell
+Url: http://voikko.puimula.org/
+Source: http://www.puimula.org/voikko-sources/%{_name}/%{_name}-%{version}.tar.gz
BuildRequires: malaga
BuildRequires: python-xml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -37,14 +37,14 @@
%setup -q -n %{_name}-%{version}
%build
-CFLAGS="$RPM_OPT_FLAGS" \
-CXXFLAGS="$RPM_OPT_FLAGS" \
+CFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
make voikko %{?_smp_mflags}
%install
-make voikko-install DESTDIR=$RPM_BUILD_ROOT%{_datadir}/malaga/1/mor-standard
+make voikko-install DESTDIR=%{buildroot}%{_datadir}/malaga/1/mor-standard
# compat symlinks
-cd $RPM_BUILD_ROOT%{_datadir}/malaga
+cd %{buildroot}%{_datadir}/malaga
ln -s -t. 1/mor-standard/*
%files
--
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 llvm for openSUSE:Factory checked in at 2014-01-30 19:17:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/llvm (Old)
and /work/SRC/openSUSE:Factory/.llvm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "llvm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/llvm/llvm.changes 2013-10-21 15:12:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.llvm.new/llvm.changes 2014-01-30 19:17:35.000000000 +0100
@@ -1,0 +2,109 @@
+Fri Jan 24 13:15:48 UTC 2014 - idonmez(a)suse.com
+
+- Remove non-existing doc subpackage
+
+-------------------------------------------------------------------
+Fri Jan 24 09:23:08 UTC 2014 - idonmez(a)suse.com
+
+- Add a dependency on ncurses-devel since libLLVM now links to
+ tinfo.
+
+-------------------------------------------------------------------
+Tue Jan 14 13:57:57 UTC 2014 - idonmez(a)suse.com
+
+- Add 32bit libclang bnc#857131
+
+-------------------------------------------------------------------
+Tue Jan 7 08:47:50 UTC 2014 - idonmez(a)suse.com
+
+- Update to final llvm 3.4 release
+ * See http://llvm.org/releases/3.4/docs/ReleaseNotes.html for
+ complete changelog.
+
+-------------------------------------------------------------------
+Tue Dec 24 13:47:24 UTC 2013 - idonmez(a)suse.com
+
+- Update to final release candidate (r197980)
+
+-------------------------------------------------------------------
+Sat Dec 21 18:20:20 UTC 2013 - idonmez(a)suse.com
+
+- Update to r197866 from release_34 branch
+
+-------------------------------------------------------------------
+Tue Dec 17 11:31:23 UTC 2013 - idonmez(a)suse.com
+
+- Update to r197490 from release_34 branch
+
+-------------------------------------------------------------------
+Thu Dec 12 10:43:42 UTC 2013 - idonmez(a)suse.com
+
+- Update to r197142 from release_34 branch
+- Disable assertions again now that PPC64 backend is fixed
+
+-------------------------------------------------------------------
+Tue Dec 10 09:48:59 UTC 2013 - idonmez(a)suse.com
+
+- Update to r196899 from release_34 branch
+- Remove compiler_rt-r196612.patch, merged upstream
+
+-------------------------------------------------------------------
+Mon Dec 9 11:42:44 UTC 2013 - idonmez(a)suse.com
+
+- Add compiler_rt-r196612.patch to fix ubsan failures on i586
+
+-------------------------------------------------------------------
+Mon Dec 9 08:54:48 UTC 2013 - idonmez(a)suse.com
+
+- Update to r196762 from release_34 branch
+
+-------------------------------------------------------------------
+Thu Dec 5 13:10:13 UTC 2013 - idonmez(a)suse.com
+
+- Update to r196503 from release_34 branch to get compiler_rt fixes
+
+-------------------------------------------------------------------
+Thu Dec 5 08:31:52 UTC 2013 - idonmez(a)suse.com
+
+- Update to r196487 from release_34 branch to get compiler_rt fixes
+
+-------------------------------------------------------------------
+Wed Dec 4 13:33:55 UTC 2013 - idonmez(a)suse.com
+
+- Ship cmake files for llvm (needed for lldb and such)
+
+-------------------------------------------------------------------
+Wed Dec 4 10:07:59 UTC 2013 - idonmez(a)suse.com
+
+- Update to r196371 from release_34 branch
+
+-------------------------------------------------------------------
+Wed Dec 4 03:27:29 UTC 2013 - termim(a)gmail.com
+
+- install python binding to libclang
+
+-------------------------------------------------------------------
+Mon Dec 1 08:42:08 UTC 2013 - idonmez(a)suse.com
+
+- Update to r196358 from llvm 3.4 branch
+- Add asan-disable-hugemalloctest.patch to disable
+ ASAN HugeMallocTest, it requires 4.1+ GB of RAM.
+- Refresh patches
+ * aarch64-suse-support.patch
+ * arm_suse_support.diff
+ * assume-opensuse.patch
+ * default-to-i586.patch
+- Drop upstream patches
+ * llvm-disable-pretty-stack-trace.patch
+ * r189852.diff
+ * unreachable-code.patch
+ * llvm-no-visibility.patch
+
+-------------------------------------------------------------------
+Tue Oct 22 20:57:00 UTC 2013 - dmueller(a)suse.com
+
+- add r189852.diff: Remove vtables optimisation that breaks ARM
+ and PowerPC
+- Disable testsuite on ARMv7, takes forever to run
+
+-------------------------------------------------------------------
Old:
----
llvm-3.3.tar.bz2
llvm-disable-pretty-stack-trace.patch
llvm-no-visibility.patch
unreachable-code.patch
New:
----
asan-disable-hugemalloctest.patch
llvm-3.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ llvm.spec ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package llvm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +16,17 @@
#
-%define _revision 183898
-%define _release_version 3.3
-%define _supported_archs "AArch64;ARM;PowerPC;X86"
-%define _experimental_archs "R600"
-
-%ifarch %arm
-%define _supported_archs "ARM"
-%endif
-
-%ifarch ppc64
-%define _supported_archs "PowerPC"
-%endif
-
-%ifarch s390x
-%define _supported_archs "SystemZ"
-%endif
+%define _revision 198681
+%define _release_version 3.4
Name: llvm
-Version: 3.3
+Version: 3.4
Release: 0
Summary: Low Level Virtual Machine
License: NCSA
Group: Development/Languages/Other
Url: http://www.llvm.org
-Source0: %{name}-%{_release_version}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Source100: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE set-revision.patch idoenmez(a)suse.de -- Allow us to set revision
Patch1: set-revision.patch
@@ -53,22 +39,16 @@
Patch5: llvm-config-lib64.patch
# PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support
Patch6: arm_suse_support.diff
-# PATCH-FIX-OPENSUSE unreachable-code.patch -- Unreachable code warning triggered on SLE
-Patch7: unreachable-code.patch
-Patch8: cmake-host-triple.patch
+Patch7: cmake-host-triple.patch
# PATCH-FIX-OPENSUSE aarch64-suse-support.patch -- Enable AArch64 suse toolchain support
-Patch9: aarch64-suse-support.patch
-# PATCH-FIX-OPENSUSE llvm-no-visibility.patch -- Disable visibility
-Patch10: llvm-no-visibility.patch
-# PATCH-FIX-OPENSUSE llvm-disable-pretty-stack-trace.patch -- https://bugs.freedesktop.org/show_bug.cgi?id=60929
-Patch11: llvm-disable-pretty-stack-trace.patch
-Patch12: arm-remove-xfails.diff
+Patch8: aarch64-suse-support.patch
+Patch9: arm-remove-xfails.diff
+# PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest
+Patch10: asan-disable-hugemalloctest.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
-
BuildRequires: cmake
-
%if 0%{?suse_version} >= 1220
BuildRequires: binutils-devel >= 2.21.90
%endif
@@ -80,6 +60,7 @@
BuildRequires: groff
BuildRequires: libffi-devel
BuildRequires: libtool
+BuildRequires: ncurses-devel
BuildRequires: python-base
Requires: libLLVM = %{version}-%{release}
# llvm does not work on ppc, only ppc64
@@ -106,21 +87,12 @@
Requires: %{name} = %{version}
Requires: libffi-devel
Requires: libstdc++-devel >= 3.4
-Obsoletes: llvm-doc < %{version}
-Provides: llvm-doc = %{version}
+Requires: ncurses-devel
%description devel
This package contains library and header files needed to develop
new native programs that use the LLVM infrastructure.
-%package doc
-Summary: Documentation for LLVM
-Group: Documentation/HTML
-Requires: %{name} = %{version}
-
-%description doc
-Documentation for the LLVM compiler infrastructure.
-
%package clang
Summary: CLANG frontend for LLVM
Group: Development/Languages/Other
@@ -158,8 +130,17 @@
%description vim-plugins
This package contains vim plugins for LLVM like syntax highlighting.
+%package -n python-clang
+Summary: Python bindings for libclang
+Group: Development/Languages/Python
+Requires: libclang = %{version}
+Requires: python
+
+%description -n python-clang
+This package contains the Python bindings to clang (C language) frontend for LLVM.
+
%prep
-%setup -q -n %{name}-%{_release_version}
+%setup -q -n %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -170,18 +151,14 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%ifarch s390 s390x
+%patch9
%patch10 -p1
-%endif
-%patch11 -p1
-%patch12
# We hardcode i586
rm tools/clang/test/Driver/x86_features.c
-# lib64 related problems on 64bit
%if "%{_lib}" == "lib64"
+# lib64 related problems on 64bit
rm tools/clang/test/Driver/linux-ld.c
%endif
@@ -190,13 +167,14 @@
%if "%{_lib}" == "lib64"
# Nasty hardcoded path
-sed -i s,/lib/,/%{_lib}/,g tools/clang/lib/Driver/Tools.cpp \
- tools/clang/test/Preprocessor/iwithprefix.c
+sed -i s,"/lib/","/lib64/",g tools/clang/lib/Driver/Tools.cpp \
+ tools/clang/test/Driver/dyld-prefix.c
+sed -i s,"}lib{","}lib64{",g tools/clang/test/Preprocessor/iwithprefix.c
%endif
# Only enable target archs otherwise llvm-config is messed up
-%ifnarch %arm ppc64 s390x
-sed -i s,"subdirectories = .*","subdirectories = AArch64 ARM PowerPC R600 X86", lib/Target/LLVMBuild.txt
+%ifarch %{ix86} x86_64
+sed -i s,"subdirectories = .*","subdirectories = R600 X86", lib/Target/LLVMBuild.txt
%endif
%ifarch %arm
@@ -243,13 +221,14 @@
%ifarch s390x
%define host_triple s390x-suse-linux
sed -i s,'${CMAKE_SYSTEM_PROCESSOR}','"SystemZ"',g ../cmake/modules/AddLLVM.cmake
+rm -rf ../projects/compiler-rt
%endif
cmake -G "Unix Makefiles" \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_ASSERTIONS=OFF \
- -DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
+ -DLLVM_TARGETS_TO_BUILD=host \
-DCMAKE_C_FLAGS="-O0" \
-DCMAKE_CXX_FLAGS="-O0" \
-DLLVM_HOST_TRIPLE=%{host_triple} \
@@ -293,17 +272,18 @@
%if 0%{?suse_version} >= 1220
-DLLVM_BINUTILS_INCDIR=/usr/include \
%endif
- -DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
-%ifnarch %arm ppc64 s390x
- -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{_experimental_archs} \
+%ifarch %{ix86} x86_64
+ -DLLVM_TARGETS_TO_BUILD="host;R600" \
+%else
+ -DLLVM_TARGETS_TO_BUILD=host \
%endif
- -DLLVM_BUILD_TESTS=OFF \
..
make %{?_smp_mflags} VERBOSE=1
%check
cd stage2
+%ifnarch armv7hl armv7l
%if 0%{!?qemu_user_space_build:1}
# we just do not have enough memory with qemu emulation
@@ -311,20 +291,10 @@
ln -s lib lib64
%endif
-# Due to http://llvm.org/bugs/show_bug.cgi?id=15242
-for i in crash-narrowfunctiontest metadata remove_arguments_test; do
- rm ../test/BugPoint/$i.ll;
-done
-
-%ifarch s390 s390x
-for i in TestClassDecl.m TestClassForwardDecl.m c-index-getCursor-test.m; do
- rm ../tools/clang/test/Index/$i;
-done
-%endif
-
make check
make clang-test
%endif
+%endif
%install
cd stage2
@@ -369,6 +339,16 @@
install -m 644 $file %{buildroot}%{py_sitedir}/Resources/
done
popd
+
+# install python bindings
+install -d %{buildroot}%{py_sitedir}/clang
+pushd tools/clang/bindings/python
+cp clang/*.py %{buildroot}%{py_sitedir}/clang
+install -d %{buildroot}%{_docdir}/python-clang/examples/cindex
+cp -r examples %{buildroot}%{_docdir}/python-clang
+install -d %{buildroot}%{_docdir}/python-clang/tests/cindex/INPUTS
+cp -r tests %{buildroot}%{_docdir}/python-clang
+popd
pushd %{buildroot}%{_bindir}
ln -s ccc-analyzer c++-analyzer
popd
@@ -406,9 +386,6 @@
rm %{buildroot}%{_libdir}/libgtest*
rm %{buildroot}%{_mandir}/man1/lit.1
-# Remove cmake files
-rm -rf %{buildroot}/usr/share/llvm/cmake
-
%fdupes -s %{buildroot}%{_docdir}/%{name}
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc
@@ -426,6 +403,7 @@
%{_bindir}/bugpoint
%{_bindir}/llc
%{_bindir}/lli
+%{_bindir}/lli-child-target
%{_bindir}/macho-dump
%exclude %{_bindir}/%{name}-config
%{_bindir}/%{name}*
@@ -451,6 +429,7 @@
%{_bindir}/clang-format
%{_bindir}/ccc-analyzer
%{_bindir}/c++-analyzer
+%{_bindir}/git-clang-format
%{_bindir}/scan-build
%{_bindir}/scan-view
%{py_sitedir}/ScanView.py
@@ -460,7 +439,6 @@
%{_datadir}/clang
%{_mandir}/man1/clang.1%{ext_man}
%{_libdir}/libLTO.*
-%{_libdir}/libprofile_rt.*
%if 0%{?suse_version} >= 1220
%{_libdir}/LLVMgold.so
%{_libdir}/bfd-plugins/
@@ -492,6 +470,8 @@
%doc %{_mandir}/man1/%{name}-config.1%{ext_man}
%{_includedir}/%{name}/
%{_includedir}/%{name}-c/
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/cmake/
%doc %{_docdir}/%{name}
%files vim-plugins
@@ -499,4 +479,13 @@
%doc utils/vim/README.vim
%{_datadir}/vim/
+%files -n python-clang
+%defattr(-,root,root)
+%{py_sitedir}/clang
+%{py_sitedir}/clang/__init__.py
+%{py_sitedir}/clang/cindex.py
+%{py_sitedir}/clang/enumerations.py
+
+%doc %{_docdir}/python-clang
+
%changelog
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1,10 +1,8 @@
<?xml version="1.0"?>
<constraints>
<hardware>
- <physicalmemory>
- <size unit="M">2000</size>
- </physicalmemory>
+ <memory>
+ <size unit="M">4000</size>
+ </memory>
</hardware>
- <sandbox>kvm</sandbox>
- <hostlabel exclude="true">SLOW_CPU</hostlabel>
</constraints>
++++++ aarch64-suse-support.patch ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1,16 +1,15 @@
-Index: llvm-3.3/tools/clang/lib/Driver/ToolChains.cpp
+Index: llvm/tools/clang/lib/Driver/ToolChains.cpp
===================================================================
---- llvm-3.3.orig/tools/clang/lib/Driver/ToolChains.cpp
-+++ llvm-3.3/tools/clang/lib/Driver/ToolChains.cpp
-@@ -1073,9 +1073,10 @@ Generic_GCC::GCCInstallationDetector::GC
+--- llvm.orig/tools/clang/lib/Driver/ToolChains.cpp
++++ llvm/tools/clang/lib/Driver/ToolChains.cpp
+@@ -1110,8 +1110,9 @@ void Generic_GCC::GCCInstallationDetecto
// Declare a bunch of static data sets that we'll select between below. These
// are specifically designed to always refer to string literals to avoid any
// lifetime or initialization issues.
- static const char *const AArch64LibDirs[] = { "/lib" };
+ static const char *const AArch64LibDirs[] = { "/lib64", "/lib" };
- static const char *const AArch64Triples[] = {
- "aarch64-none-linux-gnu",
-+ "aarch64-suse-linux",
- "aarch64-linux-gnu"
- };
+ static const char *const AArch64Triples[] = { "aarch64-none-linux-gnu",
++ "aarch64-suse-linux",
+ "aarch64-linux-gnu" };
+ static const char *const ARMLibDirs[] = { "/lib" };
++++++ arm_suse_support.diff ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1,16 +1,18 @@
---- /tools/clang/lib/Driver/ToolChains.cpp.orig 2012-11-22 10:26:49.202107824 +0100
-+++ /tools/clang/lib/Driver/ToolChains.cpp 2012-11-22 12:20:33.662825882 +0100
-@@ -1082,11 +1082,13 @@ Generic_GCC::GCCInstallationDetector::GC
+Index: llvm/tools/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- llvm.orig/tools/clang/lib/Driver/ToolChains.cpp
++++ llvm/tools/clang/lib/Driver/ToolChains.cpp
+@@ -1071,9 +1071,11 @@ Generic_GCC::GCCInstallationDetector::GC
+
static const char *const ARMLibDirs[] = { "/lib" };
- static const char *const ARMTriples[] = {
- "arm-linux-gnueabi",
-+ "armv5tel-suse-linux-gnueabi",
- "arm-linux-androideabi"
- };
- static const char *const ARMHFTriples[] = {
- "arm-linux-gnueabihf",
-+ "armv7hl-suse-linux-gnueabi",
- "armv7hl-redhat-linux-gnueabi"
- };
+ static const char *const ARMTriples[] = { "arm-linux-gnueabi",
+- "arm-linux-androideabi" };
++ "arm-linux-androideabi",
++ "armv5tel-suse-linux-gnueabi"};
+ static const char *const ARMHFTriples[] = { "arm-linux-gnueabihf",
+- "armv7hl-redhat-linux-gnueabi" };
++ "armv7hl-redhat-linux-gnueabi",
++ "armv7hl-suse-linux-gnueabi" };
static const char *const X86_64LibDirs[] = { "/lib64", "/lib" };
+ static const char *const X86_64Triples[] = {
++++++ asan-disable-hugemalloctest.patch ++++++
Index: llvm/projects/compiler-rt/lib/asan/tests/asan_test.cc
===================================================================
--- llvm.orig/projects/compiler-rt/lib/asan/tests/asan_test.cc
+++ llvm/projects/compiler-rt/lib/asan/tests/asan_test.cc
@@ -298,12 +298,6 @@ TEST(AddressSanitizer, LargeMallocTest)
}
}
-TEST(AddressSanitizer, HugeMallocTest) {
- if (SANITIZER_WORDSIZE != 64) return;
- size_t n_megs = 4100;
- TestLargeMalloc(n_megs << 20);
-}
-
#ifndef __APPLE__
void MemalignRun(size_t align, size_t size, int idx) {
char *p = (char *)memalign(align, size);
++++++ assume-opensuse.patch ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1,11 +1,78 @@
---- a/tools/clang/lib/Driver/ToolChains.cpp (revision 178453)
-+++ b/tools/clang/lib/Driver/ToolChains.cpp (working copy)
-@@ -1878,7 +1878,7 @@
+Index: llvm/tools/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- llvm.orig/tools/clang/lib/Driver/ToolChains.cpp
++++ llvm/tools/clang/lib/Driver/ToolChains.cpp
+@@ -2185,73 +2185,7 @@ static bool IsUbuntu(enum Distro Distro)
}
- static bool IsOpenSuse(enum Distro Distro) {
-- return Distro >= OpenSuse11_3 && Distro <= OpenSuse12_2;
-+ return true;
+ static Distro DetectDistro(llvm::Triple::ArchType Arch) {
+- OwningPtr<llvm::MemoryBuffer> File;
+- if (!llvm::MemoryBuffer::getFile("/etc/lsb-release", File)) {
+- StringRef Data = File.get()->getBuffer();
+- SmallVector<StringRef, 8> Lines;
+- Data.split(Lines, "\n");
+- Distro Version = UnknownDistro;
+- for (unsigned i = 0, s = Lines.size(); i != s; ++i)
+- if (Version == UnknownDistro && Lines[i].startswith("DISTRIB_CODENAME="))
+- Version = llvm::StringSwitch<Distro>(Lines[i].substr(17))
+- .Case("hardy", UbuntuHardy)
+- .Case("intrepid", UbuntuIntrepid)
+- .Case("jaunty", UbuntuJaunty)
+- .Case("karmic", UbuntuKarmic)
+- .Case("lucid", UbuntuLucid)
+- .Case("maverick", UbuntuMaverick)
+- .Case("natty", UbuntuNatty)
+- .Case("oneiric", UbuntuOneiric)
+- .Case("precise", UbuntuPrecise)
+- .Case("quantal", UbuntuQuantal)
+- .Case("raring", UbuntuRaring)
+- .Case("saucy", UbuntuSaucy)
+- .Case("trusty", UbuntuTrusty)
+- .Default(UnknownDistro);
+- return Version;
+- }
+-
+- if (!llvm::MemoryBuffer::getFile("/etc/redhat-release", File)) {
+- StringRef Data = File.get()->getBuffer();
+- if (Data.startswith("Fedora release"))
+- return Fedora;
+- else if (Data.startswith("Red Hat Enterprise Linux") &&
+- Data.find("release 6") != StringRef::npos)
+- return RHEL6;
+- else if ((Data.startswith("Red Hat Enterprise Linux") ||
+- Data.startswith("CentOS")) &&
+- Data.find("release 5") != StringRef::npos)
+- return RHEL5;
+- else if ((Data.startswith("Red Hat Enterprise Linux") ||
+- Data.startswith("CentOS")) &&
+- Data.find("release 4") != StringRef::npos)
+- return RHEL4;
+- return UnknownDistro;
+- }
+-
+- if (!llvm::MemoryBuffer::getFile("/etc/debian_version", File)) {
+- StringRef Data = File.get()->getBuffer();
+- if (Data[0] == '5')
+- return DebianLenny;
+- else if (Data.startswith("squeeze/sid") || Data[0] == '6')
+- return DebianSqueeze;
+- else if (Data.startswith("wheezy/sid") || Data[0] == '7')
+- return DebianWheezy;
+- else if (Data.startswith("jessie/sid") || Data[0] == '8')
+- return DebianJessie;
+- return UnknownDistro;
+- }
+-
+- if (llvm::sys::fs::exists("/etc/SuSE-release"))
+ return OpenSUSE;
+-
+- if (llvm::sys::fs::exists("/etc/exherbo-release"))
+- return Exherbo;
+-
+- if (llvm::sys::fs::exists("/etc/arch-release"))
+- return ArchLinux;
+-
+- return UnknownDistro;
}
- static bool IsDebian(enum Distro Distro) {
+ /// \brief Get our best guess at the multiarch triple for a target.
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1 +1,3 @@
libLLVM
+libclang
+
++++++ default-to-i586.patch ++++++
--- /var/tmp/diff_new_pack.YQfNKG/_old 2014-01-30 19:17:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YQfNKG/_new 2014-01-30 19:17:36.000000000 +0100
@@ -1,20 +1,24 @@
-Index: llvm-3.3/tools/clang/lib/Driver/Tools.cpp
+Index: llvm/tools/clang/lib/Driver/Tools.cpp
===================================================================
---- llvm-3.3.orig/tools/clang/lib/Driver/Tools.cpp
-+++ llvm-3.3/tools/clang/lib/Driver/Tools.cpp
-@@ -1243,12 +1243,12 @@ static const char *getX86TargetCPU(const
- if (Triple.getOSName().startswith("netbsd"))
- return "i486";
+--- llvm.orig/tools/clang/lib/Driver/Tools.cpp
++++ llvm/tools/clang/lib/Driver/Tools.cpp
+@@ -1304,7 +1304,7 @@ static const char *getX86TargetCPU(const
+ }
+
// All x86 devices running Android have core2 as their common
- // denominator. This makes a better choice than pentium4.
+ // denominator. This makes a better choice than i586.
if (Triple.getEnvironment() == llvm::Triple::Android)
return "core2";
-- // Fallback to p4.
-- return "pentium4";
-+ // Fallback to i586.
-+ return "i586";
+@@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const
+ case llvm::Triple::Bitrig:
+ return "i686";
+ default:
+- // Fallback to p4.
+- return "pentium4";
++ // Fallback to i586.
++ return "i586";
+ }
}
- void Clang::AddX86TargetArgs(const ArgList &Args,
++++++ llvm-3.3.tar.bz2 -> llvm-3.4.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/llvm/llvm-3.3.tar.bz2 /work/SRC/openSUSE:Factory/.llvm.new/llvm-3.4.tar.bz2 differ: char 11, line 1
--
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 elfutils for openSUSE:Factory checked in at 2014-01-30 19:16:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/elfutils (Old)
and /work/SRC/openSUSE:Factory/.elfutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elfutils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/elfutils/elfutils.changes 2013-11-15 08:37:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.elfutils.new/elfutils.changes 2014-01-30 19:16:20.000000000 +0100
@@ -1,0 +2,19 @@
+Tue Jan 28 19:22:04 UTC 2014 - tonyj(a)suse.com
+
+- Update to 0.158:
+ - libdwfl:
+ - dwfl_core_file_report has new parameter executable.
+ - New functions dwfl_module_getsymtab_first_global,
+ dwfl_module_getsym_info and dwfl_module_addrinfo.
+ - Added unwinder with type Dwfl_Thread_Callbacks, opaque types
+ Dwfl_Thread and Dwfl_Frame and functions dwfl_attach_state,
+ dwfl_pid, dwfl_thread_dwfl, dwfl_thread_tid, dwfl_frame_thread,
+ dwfl_thread_state_registers, dwfl_thread_state_register_pc,
+ dwfl_getthread_frames, dwfl_getthreads, dwfl_thread_getframes
+ and dwfl_frame_pc.
+ - addr2line: New option -x to show the section an address was found in.
+ - stack: New utility that uses the new unwinder for processes and cores.
+ - backends: Unwinder support for i386, x86_64, s390, s390x, ppc and ppc64.
+ aarch64 support.
+
+-------------------------------------------------------------------
Old:
----
elfutils-0.157.tar.bz2
New:
----
elfutils-0.158.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ elfutils.spec ++++++
--- /var/tmp/diff_new_pack.sytk2d/_old 2014-01-30 19:16:21.000000000 +0100
+++ /var/tmp/diff_new_pack.sytk2d/_new 2014-01-30 19:16:21.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package elfutils
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: elfutils
-Version: 0.157
+Version: 0.158
Release: 0
Summary: Higher-level library to access ELF
License: SUSE-GPL-2.0-with-OSI-exception
++++++ elfutils-0.137-dwarf-header-check-fix.diff ++++++
--- /var/tmp/diff_new_pack.sytk2d/_old 2014-01-30 19:16:21.000000000 +0100
+++ /var/tmp/diff_new_pack.sytk2d/_new 2014-01-30 19:16:21.000000000 +0100
@@ -14,11 +14,9 @@
libdw/dwarf_getsrclines.c | 2 ++
1 file changed, 2 insertions(+)
-Index: elfutils-0.155/libdw/dwarf_getsrclines.c
-===================================================================
---- elfutils-0.155.orig/libdw/dwarf_getsrclines.c
-+++ elfutils-0.155/libdw/dwarf_getsrclines.c
-@@ -296,8 +296,10 @@ dwarf_getsrclines (Dwarf_Die *cudie, Dwa
+--- a/libdw/dwarf_getsrclines.c
++++ b/libdw/dwarf_getsrclines.c
+@@ -306,8 +306,10 @@ dwarf_getsrclines (Dwarf_Die *cudie, Dwa
/* Consistency check. */
if (unlikely (linep != header_start + header_length))
{
++++++ elfutils-0.148-dont-crash.diff ++++++
--- /var/tmp/diff_new_pack.sytk2d/_old 2014-01-30 19:16:21.000000000 +0100
+++ /var/tmp/diff_new_pack.sytk2d/_new 2014-01-30 19:16:21.000000000 +0100
@@ -2,10 +2,12 @@
Avoid crash if the header is 0
-Index: elfutils-0.155/libdw/dwarf_getcfi_elf.c
-===================================================================
---- elfutils-0.155.orig/libdw/dwarf_getcfi_elf.c
-+++ elfutils-0.155/libdw/dwarf_getcfi_elf.c
+---
+ libdw/dwarf_getcfi_elf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libdw/dwarf_getcfi_elf.c
++++ b/libdw/dwarf_getcfi_elf.c
@@ -76,7 +76,7 @@ parse_eh_frame_hdr (const uint8_t *hdr,
{
const uint8_t *h = hdr;
++++++ elfutils-0.157.tar.bz2 -> elfutils-0.158.tar.bz2 ++++++
++++ 25705 lines of diff (skipped)
++++++ elfutils-no-po-test-build.diff ++++++
--- /var/tmp/diff_new_pack.sytk2d/_old 2014-01-30 19:16:22.000000000 +0100
+++ /var/tmp/diff_new_pack.sytk2d/_new 2014-01-30 19:16:22.000000000 +0100
@@ -2,10 +2,13 @@
Upstream: no
Subject: do not build po and tests components
-Index: elfutils-0.155/Makefile.am
-===================================================================
---- elfutils-0.155.orig/Makefile.am
-+++ elfutils-0.155/Makefile.am
+---
+ Makefile.am | 2 +-
+ Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
@@ -24,7 +24,7 @@ pkginclude_HEADERS = version.h
# Add doc back when we have some real content.
@@ -15,11 +18,9 @@
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
COPYING COPYING-GPLV2 COPYING-LGPLV3
-Index: elfutils-0.155/Makefile.in
-===================================================================
---- elfutils-0.155.orig/Makefile.in
-+++ elfutils-0.155/Makefile.in
-@@ -259,7 +259,7 @@ pkginclude_HEADERS = version.h
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -360,7 +360,7 @@ pkginclude_HEADERS = version.h
# Add doc back when we have some real content.
SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
++++++ elfutils-portability.patch ++++++
++++ 1464 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/elfutils/elfutils-portability.patch
++++ and /work/SRC/openSUSE:Factory/.elfutils.new/elfutils-portability.patch
++++++ elfutils-robustify.patch ++++++
++++ 779 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/elfutils/elfutils-robustify.patch
++++ and /work/SRC/openSUSE:Factory/.elfutils.new/elfutils-robustify.patch
++++++ elfutils-uninitialized.diff ++++++
--- /var/tmp/diff_new_pack.sytk2d/_old 2014-01-30 19:16:22.000000000 +0100
+++ /var/tmp/diff_new_pack.sytk2d/_new 2014-01-30 19:16:22.000000000 +0100
@@ -1,8 +1,10 @@
-Index: elfutils-0.155/libdwfl/linux-kernel-modules.c
-===================================================================
---- elfutils-0.155.orig/libdwfl/linux-kernel-modules.c
-+++ elfutils-0.155/libdwfl/linux-kernel-modules.c
-@@ -601,8 +601,8 @@ check_module_notes (Dwfl_Module *mod)
+---
+ libdwfl/linux-kernel-modules.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libdwfl/linux-kernel-modules.c
++++ b/libdwfl/linux-kernel-modules.c
+@@ -608,8 +608,8 @@ check_module_notes (Dwfl_Module *mod)
int
dwfl_linux_kernel_report_kernel (Dwfl *dwfl)
{
++++++ libebl-prototype-fix.diff ++++++
--- /var/tmp/diff_new_pack.sytk2d/_old 2014-01-30 19:16:22.000000000 +0100
+++ /var/tmp/diff_new_pack.sytk2d/_new 2014-01-30 19:16:22.000000000 +0100
@@ -4,11 +4,14 @@
Update from K&R to ANSI prototype. This fix should go upstream.
-Index: elfutils-0.155/libebl/eblopenbackend.c
-===================================================================
---- elfutils-0.155.orig/libebl/eblopenbackend.c
-+++ elfutils-0.155/libebl/eblopenbackend.c
-@@ -249,10 +249,7 @@ fill_defaults (Ebl *result)
+---
+ lib/dynamicsizehash.c | 5 +----
+ libebl/eblopenbackend.c | 5 +----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+--- a/libebl/eblopenbackend.c
++++ b/libebl/eblopenbackend.c
+@@ -250,10 +250,7 @@ fill_defaults (Ebl *result)
/* Find an appropriate backend for the file associated with ELF. */
static Ebl *
@@ -20,10 +23,8 @@
{
Ebl *result;
size_t cnt;
-Index: elfutils-0.155/lib/dynamicsizehash.c
-===================================================================
---- elfutils-0.155.orig/lib/dynamicsizehash.c
-+++ elfutils-0.155/lib/dynamicsizehash.c
+--- a/lib/dynamicsizehash.c
++++ b/lib/dynamicsizehash.c
@@ -44,10 +44,7 @@
@@ -34,5 +35,5 @@
- TYPE val __attribute__ ((unused));
+lookup (NAME *htab, HASHTYPE hval, TYPE val __attribute__((unused)))
{
- /* First hash function: simply take the modul but prevent zero. */
- size_t idx = 1 + hval % htab->size;
+ /* First hash function: simply take the modul but prevent zero. Small values
+ can skip the division, which helps performance when this is common. */
--
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 cmake for openSUSE:Factory checked in at 2014-01-30 19:14:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmake (Old)
and /work/SRC/openSUSE:Factory/.cmake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2013-11-25 16:58:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2014-01-30 19:14:22.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Jan 28 19:46:59 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 2.8.12.2
+ * XCode: Fix compiler line matching for XCode 5.1.
+ * Visual Studio: Convert include path to backslashes for Visual
+ Studio 2010 and newer.
+ * FindOpenMP: Support compilers that do not need any special flags.
+
+-------------------------------------------------------------------
cmake.changes: same change
Old:
----
cmake-2.8.12.1.tar.gz
New:
----
cmake-2.8.12.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.ZrAHej/_old 2014-01-30 19:14:23.000000000 +0100
+++ /var/tmp/diff_new_pack.ZrAHej/_new 2014-01-30 19:14:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cmake-gui
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cmake-gui
-Version: 2.8.12.1
+Version: 2.8.12.2
Release: 0
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.ZrAHej/_old 2014-01-30 19:14:23.000000000 +0100
+++ /var/tmp/diff_new_pack.ZrAHej/_new 2014-01-30 19:14:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cmake
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cmake
-Version: 2.8.12.1
+Version: 2.8.12.2
Release: 0
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
++++++ cmake-2.8.12.1.tar.gz -> cmake-2.8.12.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/ChangeLog.manual new/cmake-2.8.12.2/ChangeLog.manual
--- old/cmake-2.8.12.1/ChangeLog.manual 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/ChangeLog.manual 2014-01-16 18:15:07.000000000 +0100
@@ -1,3 +1,20 @@
+Changes in CMake 2.8.12.2 (since 2.8.12.1)
+------------------------------------------
+Brad King (4):
+ VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)
+ Replace <OBJECT_DIR> rule placeholder consistently (#14667)
+ VS: Convert include path to backslashes for VS >= 10
+ Revert "Ninja: Track configured files so we can regenerate them."
+
+Rolf Eike Beer (1):
+ FindOpenMP: fix detecting compilers that do not need any special flag (#14567)
+
+Ruslan Baratov (1):
+ Xcode: Fix storyboard view
+
+Ted Kremenek (1):
+ CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
+
Changes in CMake 2.8.12.1 (since 2.8.12)
----------------------------------------
Brad King (9):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Modules/CMakeDetermineCompilerId.cmake new/cmake-2.8.12.2/Modules/CMakeDetermineCompilerId.cmake
--- old/cmake-2.8.12.1/Modules/CMakeDetermineCompilerId.cmake 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Modules/CMakeDetermineCompilerId.cmake 2014-01-16 18:15:07.000000000 +0100
@@ -209,7 +209,7 @@
# ...
# /path/to/cc ...CompilerId${lang}/...
# to extract the compiler front-end for the language.
- if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/\\./CompilerId${lang}[ \t\n\\\"]")
+ if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/(\\./)?CompilerId${lang}[ \t\n\\\"]")
set(_comp "${CMAKE_MATCH_2}")
if(EXISTS "${_comp}")
set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Modules/FindOpenMP.cmake new/cmake-2.8.12.2/Modules/FindOpenMP.cmake
--- old/cmake-2.8.12.1/Modules/FindOpenMP.cmake 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Modules/FindOpenMP.cmake 2014-01-16 18:15:08.000000000 +0100
@@ -31,6 +31,8 @@
function(_OPENMP_FLAG_CANDIDATES LANG)
set(OpenMP_FLAG_CANDIDATES
+ #Empty, if compiler automatically accepts openmp
+ " "
#GNU
"-fopenmp"
#Microsoft Visual Studio
@@ -39,8 +41,6 @@
"-Qopenmp"
#PathScale, Intel
"-openmp"
- #Empty, if compiler automatically accepts openmp
- " "
#Sun
"-xopenmp"
#HP
@@ -64,6 +64,7 @@
set(OMP_FLAG_PGI "-mp")
set(OMP_FLAG_SunPro "-xopenmp")
set(OMP_FLAG_XL "-qsmp")
+ set(OMP_FLAG_Cray " ")
# Move the flag that matches the compiler to the head of the list,
# this is faster and doesn't clutter the output that much. If that
@@ -100,7 +101,7 @@
include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake)
endif()
- foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
+ foreach(FLAG IN LISTS OpenMP_C_FLAG_CANDIDATES)
set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
set(CMAKE_REQUIRED_FLAGS "${FLAG}")
unset(OpenMP_FLAG_DETECTED CACHE)
@@ -134,7 +135,7 @@
set(OpenMP_CXX_TEST_SOURCE ${OpenMP_C_TEST_SOURCE})
endif()
- foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
+ foreach(FLAG IN LISTS OpenMP_CXX_FLAG_CANDIDATES)
set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
set(CMAKE_REQUIRED_FLAGS "${FLAG}")
unset(OpenMP_FLAG_DETECTED CACHE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/CMakeVersion.cmake new/cmake-2.8.12.2/Source/CMakeVersion.cmake
--- old/cmake-2.8.12.1/Source/CMakeVersion.cmake 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/CMakeVersion.cmake 2014-01-16 18:15:08.000000000 +0100
@@ -2,5 +2,5 @@
set(CMake_VERSION_MAJOR 2)
set(CMake_VERSION_MINOR 8)
set(CMake_VERSION_PATCH 12)
-set(CMake_VERSION_TWEAK 1)
+set(CMake_VERSION_TWEAK 2)
#set(CMake_VERSION_RC 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmGlobalNinjaGenerator.cxx new/cmake-2.8.12.2/Source/cmGlobalNinjaGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmGlobalNinjaGenerator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmGlobalNinjaGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -1094,9 +1094,6 @@
this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i) {
const std::vector<std::string>& lf = (*i)->GetMakefile()->GetListFiles();
implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
-
- const std::vector<std::string>& of = (*i)->GetMakefile()->GetOutputFiles();
- implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
}
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmGlobalXCodeGenerator.cxx new/cmake-2.8.12.2/Source/cmGlobalXCodeGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmGlobalXCodeGenerator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmGlobalXCodeGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -877,8 +877,10 @@
}
std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-
- fileRef->AddAttribute("explicitFileType",
+ const char* attribute = (sourcecode == "file.storyboard") ?
+ "lastKnownFileType" :
+ "explicitFileType";
+ fileRef->AddAttribute(attribute,
this->CreateString(sourcecode.c_str()));
// Store the file path relative to the top of the source tree.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmLocalVisualStudio7Generator.cxx new/cmake-2.8.12.2/Source/cmLocalVisualStudio7Generator.cxx
--- old/cmake-2.8.12.1/Source/cmLocalVisualStudio7Generator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmLocalVisualStudio7Generator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -477,6 +477,8 @@
{"AssemblerListingLocation", "Fa", "ASM List Location", "",
cmVS7FlagTable::UserValue},
+ {"ProgramDataBaseFileName", "Fd", "Program Database File Name", "",
+ cmVS7FlagTable::UserValue},
// boolean flags
{"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmMakefileExecutableTargetGenerator.cxx new/cmake-2.8.12.2/Source/cmMakefileExecutableTargetGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmMakefileExecutableTargetGenerator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmMakefileExecutableTargetGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -338,13 +338,11 @@
vars.CMTarget = this->Target;
vars.Language = linkLanguage;
vars.Objects = buildObjs.c_str();
- std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
- objdir += this->Target->GetName();
- objdir += ".dir";
- objdir = this->Convert(objdir.c_str(),
- cmLocalGenerator::START_OUTPUT,
- cmLocalGenerator::SHELL);
- vars.ObjectDir = objdir.c_str();
+ std::string objectDir = this->Target->GetSupportDirectory();
+ objectDir = this->Convert(objectDir.c_str(),
+ cmLocalGenerator::START_OUTPUT,
+ cmLocalGenerator::SHELL);
+ vars.ObjectDir = objectDir.c_str();
vars.Target = targetOutPathReal.c_str();
vars.TargetPDB = targetOutPathPDB.c_str();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmMakefileLibraryTargetGenerator.cxx new/cmake-2.8.12.2/Source/cmMakefileLibraryTargetGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmMakefileLibraryTargetGenerator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmMakefileLibraryTargetGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -577,13 +577,11 @@
vars.CMTarget = this->Target;
vars.Language = linkLanguage;
vars.Objects = buildObjs.c_str();
- std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
- objdir += this->Target->GetName();
- objdir += ".dir";
- objdir = this->Convert(objdir.c_str(),
- cmLocalGenerator::START_OUTPUT,
- cmLocalGenerator::SHELL);
- vars.ObjectDir = objdir.c_str();
+ std::string objectDir = this->Target->GetSupportDirectory();
+ objectDir = this->Convert(objectDir.c_str(),
+ cmLocalGenerator::START_OUTPUT,
+ cmLocalGenerator::SHELL);
+ vars.ObjectDir = objectDir.c_str();
vars.Target = targetOutPathReal.c_str();
vars.LinkLibraries = linkLibs.c_str();
vars.ObjectsQuoted = buildObjs.c_str();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmMakefileTargetGenerator.cxx new/cmake-2.8.12.2/Source/cmMakefileTargetGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmMakefileTargetGenerator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmMakefileTargetGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -638,7 +638,7 @@
cmLocalGenerator::NONE,
cmLocalGenerator::SHELL).c_str();
vars.Object = shellObj.c_str();
- std::string objectDir = cmSystemTools::GetFilenamePath(obj);
+ std::string objectDir = this->Target->GetSupportDirectory();
objectDir = this->Convert(objectDir.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmNinjaTargetGenerator.cxx new/cmake-2.8.12.2/Source/cmNinjaTargetGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmNinjaTargetGenerator.cxx 2013-11-05 20:07:22.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmNinjaTargetGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -543,7 +543,7 @@
vars["DEP_FILE"] = objectFileName + ".d";;
EnsureParentDirectoryExists(objectFileName);
- std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
+ std::string objectDir = this->Target->GetSupportDirectory();
vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
ConvertToNinjaPath(objectDir.c_str()).c_str(),
cmLocalGenerator::SHELL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.12.1/Source/cmVisualStudio10TargetGenerator.cxx new/cmake-2.8.12.2/Source/cmVisualStudio10TargetGenerator.cxx
--- old/cmake-2.8.12.1/Source/cmVisualStudio10TargetGenerator.cxx 2013-11-05 20:07:23.000000000 +0100
+++ new/cmake-2.8.12.2/Source/cmVisualStudio10TargetGenerator.cxx 2014-01-16 18:15:08.000000000 +0100
@@ -1420,7 +1420,9 @@
for(std::vector<std::string>::const_iterator i = includes.begin();
i != includes.end(); ++i)
{
- *this->BuildFileStream << cmVS10EscapeXML(*i) << ";";
+ std::string incDir = *i;
+ this->ConvertToWindowsSlash(incDir);
+ *this->BuildFileStream << cmVS10EscapeXML(incDir) << ";";
}
this->WriteString("%(AdditionalIncludeDirectories)"
"</AdditionalIncludeDirectories>\n", 0);
--
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 bind for openSUSE:Factory checked in at 2014-01-30 19:14:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bind (Old)
and /work/SRC/openSUSE:Factory/.bind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bind"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bind/bind.changes 2013-12-13 13:01:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2014-01-30 19:14:09.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Jan 24 10:12:56 UTC 2014 - max(a)suse.com
+
+- Add the sdb-ldap backend module (fate#313216).
+- Details can be found here:
+ * http://bind9-ldap.bayour.com/
+ * http://bind9-ldap.bayour.com/dnszonehowto.html
+
+-------------------------------------------------------------------
+Tue Jan 21 17:02:30 UTC 2014 - max(a)suse.com
+
+- Update to version 9.9.4P2
+ * Fixes named crash when handling malformed NSEC3-signed zones
+ (CVE-2014-0591, bnc#858639)
+ * Obsoletes workaround-compile-problem.diff
+- Replace rpz2+rl-9.9.3-P1.patch by rpz2-9.9.4.patch, rl is now
+ supported upstream (--enable-rrl).
+
+-------------------------------------------------------------------
Old:
----
bind-9.9.3-P2.tar.gz
bind-9.9.3-P2.tar.gz.asc
rpz2+rl-9.9.3-P1.patch
New:
----
bind-9.9.4-P2.tar.gz
bind-9.9.4-P2.tar.gz.asc
bind-sdb-ldap.patch
rpz2-9.9.4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bind.spec ++++++
--- /var/tmp/diff_new_pack.V9DSUm/_old 2014-01-30 19:14:10.000000000 +0100
+++ /var/tmp/diff_new_pack.V9DSUm/_new 2014-01-30 19:14:10.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bind
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: bind
%define pkg_name bind
-%define pkg_vers 9.9.3-P2
+%define pkg_vers 9.9.4-P2
BuildRequires: krb5-devel
BuildRequires: libcap
BuildRequires: libcap-devel
@@ -33,7 +33,7 @@
Summary: Domain Name System (DNS) Server (named)
License: ISC
Group: Productivity/Networking/DNS/Servers
-Version: 9.9.3P2
+Version: 9.9.4P2
Release: 0
Provides: bind8
Provides: bind9
@@ -58,16 +58,16 @@
Patch4: perl-path.diff
Patch51: pie_compile.diff
Patch52: named-bootconf.diff
+Patch53: bind-sdb-ldap.patch
Patch100: configure.in.diff2
-Patch110: workaround-compile-problem.diff
%if 0%{?suse_version} > 1220
BuildRequires: gpg-offline
%endif
# Rate limiting patch by Paul Vixie et.al. for reflection DoS protection
# see http://www.redbarn.org/dns/ratelimits
-#Patch200: http://ss.vix.su/~vjs/rpz2+rl-9.9.3-P1.patch
-Patch200: rpz2+rl-9.9.3-P1.patch
+#Patch200: http://ss.vix.su/~vjs/rpz2-9.9.4.patch
+Patch200: rpz2-9.9.4.patch
Source60: dlz-schema.txt
%if %ul_version >= 1
@@ -207,10 +207,10 @@
%patch51
%endif
%patch52
+%patch53
%if 0%{?suse_version} <= 1010
%patch100 -p1
%endif
-%patch110 -p0
%patch200 -p0
# modify settings of some files regarding to OS version and vendor
function replaceStrings()
@@ -227,8 +227,8 @@
replaceStrings ${file}
done
popd
-#cp bind-sdb-ldap-%{SDB_LDAP_VERSION}/ldapdb.c bin/named/
-#cp bind-sdb-ldap-%{SDB_LDAP_VERSION}/ldapdb.h bin/named/include/
+cp contrib/sdb/ldap/ldapdb.c bin/named/
+cp contrib/sdb/ldap/ldapdb.h bin/named/include/
# ---------------------------------------------------------------------------
%build
@@ -270,7 +270,9 @@
--with-libtool \
--enable-runidn \
--with-libxml2 \
- --with-dlz-mysql --with-dlz-ldap
+ --with-dlz-mysql \
+ --with-dlz-ldap \
+ --enable-rrl
"
cp -f -p config.guess config.sub contrib/idn/idnkit-1.0-src/
./configure ${CONFIGURE_OPTIONS}
@@ -364,7 +366,7 @@
cp -a vendor-files/docu/dnszonehowto.html contrib/sdb/ldap/
mkdir -p vendor-files/config/ISC-examples
cp -a bin/tests/*.conf* vendor-files/config/ISC-examples
-for file in CHANGES COPYRIGHT README FAQ version contrib doc/{arm,misc} vendor-files/config; do
+for file in CHANGES COPYRIGHT README FAQ version contrib doc/{arm,misc} vendor-files/config contrib/sdb/ldap/INSTALL.ldap; do
basename=$( basename ${file})
cp -a ${file} ${RPM_BUILD_ROOT}/%{_defaultdocdir}/bind/${basename}
echo "%doc %{_defaultdocdir}/bind/${basename}" >>filelist-bind-doc
++++++ bind-9.9.3-P2.tar.gz -> bind-9.9.4-P2.tar.gz ++++++
/work/SRC/openSUSE:Factory/bind/bind-9.9.3-P2.tar.gz /work/SRC/openSUSE:Factory/.bind.new/bind-9.9.4-P2.tar.gz differ: char 5, line 1
++++++ bind-sdb-ldap.patch ++++++
Index: bin/named/Makefile.in
===================================================================
--- bin/named/Makefile.in.orig 2014-01-23 18:42:24.479609343 +0100
+++ bin/named/Makefile.in 2014-01-24 10:11:54.234471728 +0100
@@ -34,9 +34,9 @@
#
# Add database drivers here.
#
-DBDRIVER_OBJS =
-DBDRIVER_SRCS =
-DBDRIVER_INCLUDES =
+DBDRIVER_OBJS = ldapdb.@O@
+DBDRIVER_SRCS = ldapdb.c
+DBDRIVER_INCLUDES = -DLDAP_DEPRECATED
DBDRIVER_LIBS =
DLZ_DRIVER_DIR = ${top_srcdir}/contrib/dlz/drivers
Index: bin/named/main.c
===================================================================
--- bin/named/main.c.orig 2013-12-20 01:28:28.000000000 +0100
+++ bin/named/main.c 2014-01-23 18:45:19.059680008 +0100
@@ -82,6 +82,7 @@
* Include header files for database drivers here.
*/
/* #include "xxdb.h" */
+#include <ldapdb.h>
#ifdef CONTRIB_DLZ
/*
@@ -904,6 +905,7 @@
* Add calls to register sdb drivers here.
*/
/* xxdb_init(); */
+ ldapdb_init();
#ifdef ISC_DLZ_DLOPEN
/*
@@ -940,6 +942,7 @@
* Add calls to unregister sdb drivers here.
*/
/* xxdb_clear(); */
+ ldapdb_clear();
#ifdef CONTRIB_DLZ
/*
++++++ configure.in.diff ++++++
--- /var/tmp/diff_new_pack.V9DSUm/_old 2014-01-30 19:14:10.000000000 +0100
+++ /var/tmp/diff_new_pack.V9DSUm/_new 2014-01-30 19:14:10.000000000 +0100
@@ -1,6 +1,8 @@
---- bind-9.9.3-P1/configure.in.xx 2013-06-26 14:23:25.536177163 +0200
-+++ bind-9.9.3-P1/configure.in 2013-06-26 14:23:26.401175186 +0200
-@@ -3099,7 +3099,7 @@
+Index: bind-9.9.4-P2/configure.in
+===================================================================
+--- bind-9.9.4-P2.orig/configure.in 2013-12-20 01:28:28.000000000 +0100
++++ bind-9.9.4-P2/configure.in 2014-01-21 17:55:51.063395215 +0100
+@@ -3142,7 +3142,7 @@
# empty). The variable VARIABLE will be substituted into output files.
#
++++++ rpz2+rl-9.9.3-P1.patch -> rpz2-9.9.4.patch ++++++
++++ 13914 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/bind/rpz2+rl-9.9.3-P1.patch
++++ and /work/SRC/openSUSE:Factory/.bind.new/rpz2-9.9.4.patch
--
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 rpmlint-tests for openSUSE:Factory checked in at 2014-01-30 17:45:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint-tests (Old)
and /work/SRC/openSUSE:Factory/.rpmlint-tests.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint-tests"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint-tests/rpmlint-tests.changes 2013-09-26 07:17:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpmlint-tests.new/rpmlint-tests.changes 2014-01-30 17:45:34.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 30 09:25:40 UTC 2014 - lnussel(a)suse.de
+
+- add tests for rc links (bnc#860340)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint-tests.spec ++++++
--- /var/tmp/diff_new_pack.tB9O59/_old 2014-01-30 17:45:35.000000000 +0100
+++ /var/tmp/diff_new_pack.tB9O59/_new 2014-01-30 17:45:35.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpmlint-tests
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ rpmlint-tests-1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/run new/rpmlint-tests-1/run
--- old/rpmlint-tests-1/run 2013-09-25 14:07:47.000000000 +0200
+++ new/rpmlint-tests-1/run 2014-01-30 10:25:03.000000000 +0100
@@ -9,7 +9,7 @@
if [ -z "$1" ]; then
specs=(tests/*.spec)
else
- specs=($1)
+ specs=("$@")
fi
rpmlint=/opt/testing/bin/rpmlint
if [ ! -x "$rpmlint" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink1.ignore new/rpmlint-tests-1/tests/rclink1.ignore
--- old/rpmlint-tests-1/tests/rclink1.ignore 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink1.ignore 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,3 @@
+#addFilter(" files-duplicate")
+#addFilter(" no-manual-page-for-binary ")
+#addFilter(" no-binary")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink1.ref new/rpmlint-tests-1/tests/rclink1.ref
--- old/rpmlint-tests-1/tests/rclink1.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink1.ref 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,8 @@
+rclink1: W: suse-missing-rclink blah
+rclink1: W: no-status-entry /etc/init.d/blah
+rclink1: W: no-reload-entry /etc/init.d/blah
+rclink1: W: init-script-without-%stop_on_removal-preun /etc/init.d/blah
+rclink1: W: init-script-without-%restart_on_update-postun /etc/init.d/blah
+rclink1: W: init-script-without-%insserv_cleanup-postun /etc/init.d/blah
+rclink1: W: incoherent-init-script-name blah ('rclink1', 'rclink1d')
+1 packages and 0 specfiles checked; 0 errors, 7 warnings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink1.spec new/rpmlint-tests-1/tests/rclink1.spec
--- old/rpmlint-tests-1/tests/rclink1.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink1.spec 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,44 @@
+Name: rclink1
+Version: 0
+Release: 0
+Group: Development/Tools/Building
+Summary: Test with initscript an no rclink
+License: GPL-2.0+
+BuildRoot: %_tmppath/%name-%version-build
+Url: http://www.opensuse.org/
+BuildArch: noarch
+
+%description
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed
+eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+aliquid ex ea commodi consequat. Quis aute iure reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui
+officia deserunt mollit anim id est laborum.
+
+%prep
+%build
+
+%install
+install -d -m 755 %buildroot/etc/init.d
+install -d -m 755 %buildroot/usr/lib/systemd/system
+install -d -m 755 %buildroot/usr/sbin
+cat <<EOF > blah
+#!/bin/bash
+exit 1
+EOF
+install -m 755 blah %buildroot/etc/init.d/blah
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+/etc/init.d/*
+#/usr/lib/systemd/system/*
+#/usr/sbin/*
+
+%changelog
+* Mon Apr 18 2011 lnussel(a)suse.de
+- dummy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink2.ref new/rpmlint-tests-1/tests/rclink2.ref
--- old/rpmlint-tests-1/tests/rclink2.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink2.ref 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,7 @@
+rclink2: W: no-status-entry /etc/init.d/blah
+rclink2: W: no-reload-entry /etc/init.d/blah
+rclink2: W: init-script-without-%stop_on_removal-preun /etc/init.d/blah
+rclink2: W: init-script-without-%restart_on_update-postun /etc/init.d/blah
+rclink2: W: init-script-without-%insserv_cleanup-postun /etc/init.d/blah
+rclink2: W: incoherent-init-script-name blah ('rclink2', 'rclink2d')
+1 packages and 0 specfiles checked; 0 errors, 6 warnings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink2.spec new/rpmlint-tests-1/tests/rclink2.spec
--- old/rpmlint-tests-1/tests/rclink2.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink2.spec 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,45 @@
+Name: rclink2
+Version: 0
+Release: 0
+Group: Development/Tools/Building
+Summary: Test with one init script and rclink
+License: GPL-2.0+
+BuildRoot: %_tmppath/%name-%version-build
+Url: http://www.opensuse.org/
+BuildArch: noarch
+
+%description
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed
+eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+aliquid ex ea commodi consequat. Quis aute iure reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui
+officia deserunt mollit anim id est laborum.
+
+%prep
+%build
+
+%install
+install -d -m 755 %buildroot/etc/init.d
+install -d -m 755 %buildroot/usr/lib/systemd/system
+install -d -m 755 %buildroot/usr/sbin
+cat <<EOF > blah
+#!/bin/bash
+exit 1
+EOF
+install -m 755 blah %buildroot/etc/init.d/blah
+ln -s /etc/init.d/blah %buildroot/usr/sbin/rcblah
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+/etc/init.d/*
+#/usr/lib/systemd/system/*
+/usr/sbin/*
+
+%changelog
+* Mon Apr 18 2011 lnussel(a)suse.de
+- dummy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink3.ref new/rpmlint-tests-1/tests/rclink3.ref
--- old/rpmlint-tests-1/tests/rclink3.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink3.ref 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,10 @@
+rclink3: W: zero-length /usr/lib/systemd/system/blah.service
+rclink3: W: suse-systemd-shadowed-initscript blah
+rclink3: W: suse-missing-rclink blah
+rclink3: W: no-status-entry /etc/init.d/blah
+rclink3: W: no-reload-entry /etc/init.d/blah
+rclink3: W: init-script-without-%stop_on_removal-preun /etc/init.d/blah
+rclink3: W: init-script-without-%restart_on_update-postun /etc/init.d/blah
+rclink3: W: init-script-without-%insserv_cleanup-postun /etc/init.d/blah
+rclink3: W: incoherent-init-script-name blah ('rclink3', 'rclink3d')
+1 packages and 0 specfiles checked; 0 errors, 9 warnings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink3.spec new/rpmlint-tests-1/tests/rclink3.spec
--- old/rpmlint-tests-1/tests/rclink3.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink3.spec 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,45 @@
+Name: rclink3
+Version: 0
+Release: 0
+Group: Development/Tools/Building
+Summary: Test with init script and service and no rclink
+License: GPL-2.0+
+BuildRoot: %_tmppath/%name-%version-build
+Url: http://www.opensuse.org/
+BuildArch: noarch
+
+%description
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed
+eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+aliquid ex ea commodi consequat. Quis aute iure reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui
+officia deserunt mollit anim id est laborum.
+
+%prep
+%build
+
+%install
+install -d -m 755 %buildroot/etc/init.d
+install -d -m 755 %buildroot/usr/lib/systemd/system
+install -d -m 755 %buildroot/usr/sbin
+cat <<EOF > blah
+#!/bin/bash
+exit 1
+EOF
+install -m 755 blah %buildroot/etc/init.d/blah
+install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+/etc/init.d/*
+/usr/lib/systemd/system/*
+#/usr/sbin/*
+
+%changelog
+* Mon Apr 18 2011 lnussel(a)suse.de
+- dummy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink4.ref new/rpmlint-tests-1/tests/rclink4.ref
--- old/rpmlint-tests-1/tests/rclink4.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink4.ref 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,3 @@
+rclink4: W: zero-length /usr/lib/systemd/system/blah.service
+rclink4: W: suse-missing-rclink blah
+1 packages and 0 specfiles checked; 0 errors, 2 warnings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink4.spec new/rpmlint-tests-1/tests/rclink4.spec
--- old/rpmlint-tests-1/tests/rclink4.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink4.spec 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,40 @@
+Name: rclink4
+Version: 0
+Release: 0
+Group: Development/Tools/Building
+Summary: Test with service and no rclink
+License: GPL-2.0+
+BuildRoot: %_tmppath/%name-%version-build
+Url: http://www.opensuse.org/
+BuildArch: noarch
+
+%description
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed
+eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+aliquid ex ea commodi consequat. Quis aute iure reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui
+officia deserunt mollit anim id est laborum.
+
+%prep
+%build
+
+%install
+install -d -m 755 %buildroot/etc/init.d
+install -d -m 755 %buildroot/usr/lib/systemd/system
+install -d -m 755 %buildroot/usr/sbin
+install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+#/etc/init.d/*
+/usr/lib/systemd/system/*
+#/usr/sbin/*
+
+%changelog
+* Mon Apr 18 2011 lnussel(a)suse.de
+- dummy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink5.ref new/rpmlint-tests-1/tests/rclink5.ref
--- old/rpmlint-tests-1/tests/rclink5.ref 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink5.ref 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,3 @@
+rclink5: W: zero-length /usr/lib/systemd/system/blah.service
+rclink5: W: dangling-symlink /usr/sbin/rcblah /etc/init.d/blah
+1 packages and 0 specfiles checked; 0 errors, 2 warnings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-tests-1/tests/rclink5.spec new/rpmlint-tests-1/tests/rclink5.spec
--- old/rpmlint-tests-1/tests/rclink5.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/rpmlint-tests-1/tests/rclink5.spec 2014-01-30 10:25:03.000000000 +0100
@@ -0,0 +1,41 @@
+Name: rclink5
+Version: 0
+Release: 0
+Group: Development/Tools/Building
+Summary: Test with service and rclink
+License: GPL-2.0+
+BuildRoot: %_tmppath/%name-%version-build
+Url: http://www.opensuse.org/
+BuildArch: noarch
+
+%description
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed
+eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim
+ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+aliquid ex ea commodi consequat. Quis aute iure reprehenderit in
+voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui
+officia deserunt mollit anim id est laborum.
+
+%prep
+%build
+
+%install
+install -d -m 755 %buildroot/etc/init.d
+install -d -m 755 %buildroot/usr/lib/systemd/system
+install -d -m 755 %buildroot/usr/sbin
+install -m 644 /dev/null %buildroot/usr/lib/systemd/system/blah.service
+ln -s /etc/init.d/blah %buildroot/usr/sbin/rcblah
+
+%clean
+rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+#/etc/init.d/*
+/usr/lib/systemd/system/*
+/usr/sbin/*
+
+%changelog
+* Mon Apr 18 2011 lnussel(a)suse.de
+- dummy
--
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 python-python-subunit for openSUSE:Factory checked in at 2014-01-30 17:45:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-python-subunit (Old)
and /work/SRC/openSUSE:Factory/.python-python-subunit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-subunit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-python-subunit/python-python-subunit.changes 2014-01-23 15:54:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-python-subunit.new/python-python-subunit.changes 2014-01-30 17:45:11.000000000 +0100
@@ -1,0 +2,15 @@
+Thu Jan 30 11:53:52 UTC 2014 - speilicke(a)suse.com
+
+- Update to version 0.0.18:
+ + Fix compatibility with testtools 0.9.35 which dropped the 'all' compat
+ symbol. This breaks support for Python versions lower than 2.6.
+- Changes from version 0.0.17:
+ + Add subunit-output tool that can generate a Subunit v2 bytestream from
+ arguments passed on the command line. (Thomi Richards, #1252084)
+- Add /usr/bin/subunit-output
+- Add python-subunit-filter-path.patch:
+ + Fix filters path in testsuite
+- Properly run testsuite
+- Fix requirements
+
+-------------------------------------------------------------------
@@ -12 +27 @@
- * When tests fail to import ``python subunit.run -l ...`` will now write a
+ * When tests fail to import python subunit.run -l ... will now write a
@@ -33,3 +48,3 @@
- * `subunit-stats` no longer outputs encapsulated stdout as subunit.
- * The logic for `subunit.run` is now importable via python -
- `subunit.run.main`. (Robert Collins, #606770)
+ * subunit-stats no longer outputs encapsulated stdout as subunit.
+ * The logic for subunit.run is now importable via python -
+ subunit.run.main. (Robert Collins, #606770)
Old:
----
python-subunit-0.0.16.tar.gz
New:
----
python-subunit-0.0.18.tar.gz
python-subunit-filter-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-python-subunit.spec ++++++
--- /var/tmp/diff_new_pack.LlFNoN/_old 2014-01-30 17:45:12.000000000 +0100
+++ /var/tmp/diff_new_pack.LlFNoN/_new 2014-01-30 17:45:12.000000000 +0100
@@ -17,16 +17,21 @@
Name: python-python-subunit
-Version: 0.0.16
+Version: 0.0.18
Release: 0
Summary: Python implementation of subunit test streaming protocol
License: Apache-2.0 or BSD-3-Clause
Group: Development/Languages/Python
Url: http://launchpad.net/subunit
Source: http://pypi.python.org/packages/source/p/python-subunit/python-subunit-%{ve…
+# PATCH-FIX-OPENSUSE speilicke(a)suse.com -- Filters are installed in /usr/bin.
+Patch0: python-subunit-filter-path.patch
BuildRequires: python-devel
-BuildRequires: python-nose
+# Test requriements
+BuildRequires: python-testscenarios
+BuildRequires: python-testtools >= 0.9.34
Requires: python-extras
+Requires: python-testscenarios
Requires: python-testtools >= 0.9.34
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -46,15 +51,23 @@
%prep
%setup -q -n python-subunit-%{version}
+%patch0 -p1
%build
python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+#NOTE(saschpe): The testsuite demands executables:
+chmod +x %{buildroot}%{python_sitelib}/subunit/tests/sample-*.py
%check
-nosetests
+#NOTE(saschpe): Pesky testsuite doesn't know about buildroot
+sed -i "s|'/',|'%{buildroot}',|" %{buildroot}%{python_sitelib}/subunit/tests/test_subunit_filter.py
+PYTHONPATH=%{buildroot}%{python_sitelib} python -m testtools.run subunit.test_suite
+sed -i "s|'%{buildroot}',|'/',|" %{buildroot}%{python_sitelib}/subunit/tests/test_subunit_filter.py
+# Fixup compiled python module afterwards:
+%py_compile %{buildroot}%{python_sitelib}/subunit/tests
%files
%defattr(-,root,root,-)
@@ -66,10 +79,12 @@
%{_bindir}/subunit-notify
%{_bindir}/subunit-stats
%{_bindir}/subunit-tags
+%{_bindir}/subunit-output
%{_bindir}/subunit2gtk
%{_bindir}/subunit2junitxml
%{_bindir}/subunit2pyunit
%{_bindir}/tap2subunit
-%{python_sitelib}/*
+%{python_sitelib}/subunit
+%{python_sitelib}/python_subunit-%{version}-py%{py_ver}.egg-info
%changelog
++++++ python-subunit-0.0.16.tar.gz -> python-subunit-0.0.18.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/NEWS new/python-subunit-0.0.18/NEWS
--- old/python-subunit-0.0.16/NEWS 2013-11-30 03:04:01.000000000 +0100
+++ new/python-subunit-0.0.18/NEWS 2014-01-29 20:13:19.000000000 +0100
@@ -5,6 +5,25 @@
NEXT (In development)
---------------------
+0.0.18
+------
+
+IMPROVMENTS
+~~~~~~~~~~~
+
+* Fix compatibility with testtools 0.9.35 which dropped the 'all' compat
+ symbol. This breaks support for Python versions lower than 2.6.
+ (Robert Collins, #1274056)
+
+0.0.17
+------
+
+IMPROVMENTS
+~~~~~~~~~~~
+
+* Add ``subunit-output`` tool that can generate a Subunit v2 bytestream from
+ arguments passed on the command line. (Thomi Richards, #1252084)
+
0.0.16
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/PKG-INFO new/python-subunit-0.0.18/PKG-INFO
--- old/python-subunit-0.0.16/PKG-INFO 2013-11-30 10:17:05.000000000 +0100
+++ new/python-subunit-0.0.18/PKG-INFO 2014-01-29 20:16:59.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: python-subunit
-Version: 0.0.16
+Version: 0.0.18
Summary: Python implementation of subunit test streaming protocol
Home-page: http://launchpad.net/subunit
Author: Robert Collins
@@ -470,6 +470,8 @@
========
* Update versions in configure.ac and python/subunit/__init__.py.
+ * Update Makefile in the root or do an inplace configure to get an updated Makefile.
+ * Update NEWS.
* Make PyPI and regular tarball releases. Upload the regular one to LP, the
PyPI one to PyPI.
* Push a tagged commit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/README new/python-subunit-0.0.18/README
--- old/python-subunit-0.0.16/README 2013-11-25 02:50:04.000000000 +0100
+++ new/python-subunit-0.0.18/README 2014-01-29 10:32:50.000000000 +0100
@@ -462,6 +462,8 @@
========
* Update versions in configure.ac and python/subunit/__init__.py.
+* Update Makefile in the root or do an inplace configure to get an updated Makefile.
+* Update NEWS.
* Make PyPI and regular tarball releases. Upload the regular one to LP, the
PyPI one to PyPI.
* Push a tagged commit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/filters/subunit-output new/python-subunit-0.0.18/filters/subunit-output
--- old/python-subunit-0.0.16/filters/subunit-output 1970-01-01 01:00:00.000000000 +0100
+++ new/python-subunit-0.0.18/filters/subunit-output 2014-01-13 01:07:19.000000000 +0100
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# subunit: extensions to python unittest to get test results from subprocesses.
+# Copyright (C) 2013 Subunit Contributors
+#
+# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+# license at the users choice. A copy of both licenses are available in the
+# project source as Apache-2.0 and BSD. You may not use this file except in
+# compliance with one of these two licences.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# license you chose for the specific language governing permissions and
+# limitations under that license.
+
+
+"""A command-line tool to generate a subunit result byte-stream."""
+
+from subunit._output import output_main
+
+
+if __name__ == '__main__':
+ exit(output_main())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python/subunit/__init__.py new/python-subunit-0.0.18/python/subunit/__init__.py
--- old/python-subunit-0.0.16/python/subunit/__init__.py 2013-11-30 03:02:19.000000000 +0100
+++ new/python-subunit-0.0.18/python/subunit/__init__.py 2014-01-29 20:14:12.000000000 +0100
@@ -153,7 +153,7 @@
# If the releaselevel is 'final', then the tarball will be major.minor.micro.
# Otherwise it is major.minor.micro~$(revno).
-__version__ = (0, 0, 16, 'final', 0)
+__version__ = (0, 0, 18, 'final', 0)
PROGRESS_SET = 0
PROGRESS_CUR = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python/subunit/_output.py new/python-subunit-0.0.18/python/subunit/_output.py
--- old/python-subunit-0.0.16/python/subunit/_output.py 1970-01-01 01:00:00.000000000 +0100
+++ new/python-subunit-0.0.18/python/subunit/_output.py 2014-01-13 01:07:19.000000000 +0100
@@ -0,0 +1,203 @@
+# subunit: extensions to python unittest to get test results from subprocesses.
+# Copyright (C) 2013 Subunit Contributors
+#
+# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+# license at the users choice. A copy of both licenses are available in the
+# project source as Apache-2.0 and BSD. You may not use this file except in
+# compliance with one of these two licences.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# license you chose for the specific language governing permissions and
+# limitations under that license.
+#
+
+import datetime
+from functools import partial
+from optparse import (
+ OptionGroup,
+ OptionParser,
+ OptionValueError,
+)
+import sys
+
+from subunit import make_stream_binary
+from subunit.iso8601 import UTC
+from subunit.v2 import StreamResultToBytes
+
+
+_FINAL_ACTIONS = frozenset([
+ 'exists',
+ 'fail',
+ 'skip',
+ 'success',
+ 'uxsuccess',
+ 'xfail',
+])
+_ALL_ACTIONS = _FINAL_ACTIONS.union(['inprogress'])
+_CHUNK_SIZE=3670016 # 3.5 MiB
+
+
+def output_main():
+ args = parse_arguments()
+ output = StreamResultToBytes(sys.stdout)
+ generate_stream_results(args, output)
+ return 0
+
+
+def parse_arguments(args=None, ParserClass=OptionParser):
+ """Parse arguments from the command line.
+
+ If specified, args must be a list of strings, similar to sys.argv[1:].
+
+ ParserClass may be specified to override the class we use to parse the
+ command-line arguments. This is useful for testing.
+ """
+ parser = ParserClass(
+ prog="subunit-output",
+ description="A tool to generate a subunit v2 result byte-stream",
+ usage="subunit-output [-h] [status TEST_ID] [options]",
+ )
+ parser.set_default('tags', None)
+ parser.set_default('test_id', None)
+
+ status_commands = OptionGroup(
+ parser,
+ "Status Commands",
+ "These options report the status of a test. TEST_ID must be a string "
+ "that uniquely identifies the test."
+ )
+ for action_name in _ALL_ACTIONS:
+ status_commands.add_option(
+ "--%s" % action_name,
+ nargs=1,
+ action="callback",
+ callback=set_status_cb,
+ callback_args=(action_name,),
+ dest="action",
+ metavar="TEST_ID",
+ help="Report a test status."
+ )
+ parser.add_option_group(status_commands)
+
+ file_commands = OptionGroup(
+ parser,
+ "File Options",
+ "These options control attaching data to a result stream. They can "
+ "either be specified with a status command, in which case the file "
+ "is attached to the test status, or by themselves, in which case "
+ "the file is attached to the stream (and not associated with any "
+ "test id)."
+ )
+ file_commands.add_option(
+ "--attach-file",
+ help="Attach a file to the result stream for this test. If '-' is "
+ "specified, stdin will be read instead. In this case, the file "
+ "name will be set to 'stdin' (but can still be overridden with "
+ "the --file-name option)."
+ )
+ file_commands.add_option(
+ "--file-name",
+ help="The name to give this file attachment. If not specified, the "
+ "name of the file on disk will be used, or 'stdin' in the case "
+ "where '-' was passed to the '--attach-file' argument. This option"
+ " may only be specified when '--attach-file' is specified.",
+ )
+ file_commands.add_option(
+ "--mimetype",
+ help="The mime type to send with this file. This is only used if the "
+ "--attach-file argument is used. This argument is optional. If it "
+ "is not specified, the file will be sent without a mime type. This "
+ "option may only be specified when '--attach-file' is specified.",
+ default=None
+ )
+ parser.add_option_group(file_commands)
+
+ parser.add_option(
+ "--tag",
+ help="Specifies a tag. May be used multiple times",
+ action="append",
+ dest="tags",
+ default=[]
+ )
+
+ (options, args) = parser.parse_args(args)
+ if options.mimetype and not options.attach_file:
+ parser.error("Cannot specify --mimetype without --attach-file")
+ if options.file_name and not options.attach_file:
+ parser.error("Cannot specify --file-name without --attach-file")
+ if options.attach_file:
+ if options.attach_file == '-':
+ if not options.file_name:
+ options.file_name = 'stdin'
+ options.attach_file = make_stream_binary(sys.stdin)
+ else:
+ try:
+ options.attach_file = open(options.attach_file, 'rb')
+ except IOError as e:
+ parser.error("Cannot open %s (%s)" % (options.attach_file, e.strerror))
+
+ return options
+
+
+def set_status_cb(option, opt_str, value, parser, status_name):
+ if getattr(parser.values, "action", None) is not None:
+ raise OptionValueError("argument %s: Only one status may be specified at once." % opt_str)
+
+ if len(parser.rargs) == 0:
+ raise OptionValueError("argument %s: must specify a single TEST_ID." % opt_str)
+ parser.values.action = status_name
+ parser.values.test_id = parser.rargs.pop(0)
+
+
+def generate_stream_results(args, output_writer):
+ output_writer.startTestRun()
+
+ if args.attach_file:
+ reader = partial(args.attach_file.read, _CHUNK_SIZE)
+ this_file_hunk = reader()
+ next_file_hunk = reader()
+
+ is_first_packet = True
+ is_last_packet = False
+ while not is_last_packet:
+ write_status = output_writer.status
+
+ if is_first_packet:
+ if args.attach_file:
+ if args.mimetype:
+ write_status = partial(write_status, mime_type=args.mimetype)
+ if args.tags:
+ write_status = partial(write_status, test_tags=set(args.tags))
+ write_status = partial(write_status, timestamp=create_timestamp())
+ if args.action not in _FINAL_ACTIONS:
+ write_status = partial(write_status, test_status=args.action)
+ is_first_packet = False
+
+ if args.attach_file:
+ filename = args.file_name or args.attach_file.name
+ write_status = partial(write_status, file_name=filename, file_bytes=this_file_hunk)
+ if next_file_hunk == b'':
+ write_status = partial(write_status, eof=True)
+ is_last_packet = True
+ else:
+ this_file_hunk = next_file_hunk
+ next_file_hunk = reader()
+ else:
+ is_last_packet = True
+
+ if args.test_id:
+ write_status = partial(write_status, test_id=args.test_id)
+
+ if is_last_packet:
+ if args.action in _FINAL_ACTIONS:
+ write_status = partial(write_status, test_status=args.action)
+
+ write_status()
+
+ output_writer.stopTestRun()
+
+
+def create_timestamp():
+ return datetime.datetime.now(UTC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python/subunit/test_results.py new/python-subunit-0.0.18/python/subunit/test_results.py
--- old/python-subunit-0.0.16/python/subunit/test_results.py 2013-04-08 12:28:36.000000000 +0200
+++ new/python-subunit-0.0.18/python/subunit/test_results.py 2014-01-29 20:10:33.000000000 +0100
@@ -20,7 +20,6 @@
import datetime
import testtools
-from testtools.compat import all
from testtools.content import (
text_content,
TracebackContent,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python/subunit/tests/__init__.py new/python-subunit-0.0.18/python/subunit/tests/__init__.py
--- old/python-subunit-0.0.16/python/subunit/tests/__init__.py 2013-11-25 03:34:32.000000000 +0100
+++ new/python-subunit-0.0.18/python/subunit/tests/__init__.py 2014-01-13 01:07:19.000000000 +0100
@@ -17,6 +17,8 @@
import sys
from unittest import TestLoader
+from testscenarios import generate_scenarios
+
# Before the test module imports to avoid circularity.
# For testing: different pythons have different str() implementations.
@@ -34,6 +36,7 @@
test_chunked,
test_details,
test_filters,
+ test_output_filter,
test_progress_model,
test_run,
test_subunit_filter,
@@ -60,4 +63,7 @@
result.addTest(loader.loadTestsFromModule(test_subunit_tags))
result.addTest(loader.loadTestsFromModule(test_subunit_stats))
result.addTest(loader.loadTestsFromModule(test_run))
+ result.addTests(
+ generate_scenarios(loader.loadTestsFromModule(test_output_filter))
+ )
return result
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python/subunit/tests/test_output_filter.py new/python-subunit-0.0.18/python/subunit/tests/test_output_filter.py
--- old/python-subunit-0.0.16/python/subunit/tests/test_output_filter.py 1970-01-01 01:00:00.000000000 +0100
+++ new/python-subunit-0.0.18/python/subunit/tests/test_output_filter.py 2014-01-13 01:07:19.000000000 +0100
@@ -0,0 +1,596 @@
+#
+# subunit: extensions to python unittest to get test results from subprocesses.
+# Copyright (C) 2013 Subunit Contributors
+#
+# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+# license at the users choice. A copy of both licenses are available in the
+# project source as Apache-2.0 and BSD. You may not use this file except in
+# compliance with one of these two licences.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# license you chose for the specific language governing permissions and
+# limitations under that license.
+#
+
+import datetime
+from functools import partial
+from io import BytesIO, StringIO, TextIOWrapper
+import optparse
+import sys
+from tempfile import NamedTemporaryFile
+
+from contextlib import contextmanager
+from testtools import TestCase
+from testtools.compat import _u
+from testtools.matchers import (
+ Equals,
+ Matcher,
+ MatchesAny,
+ MatchesListwise,
+ Mismatch,
+ raises,
+)
+from testtools.testresult.doubles import StreamResult
+
+from subunit.iso8601 import UTC
+from subunit.v2 import StreamResultToBytes, ByteStreamToStreamResult
+from subunit._output import (
+ _ALL_ACTIONS,
+ _FINAL_ACTIONS,
+ generate_stream_results,
+ parse_arguments,
+)
+import subunit._output as _o
+
+
+class SafeOptionParser(optparse.OptionParser):
+ """An ArgumentParser class that doesn't call sys.exit."""
+
+ def exit(self, status=0, message=""):
+ raise RuntimeError(message)
+
+ def error(self, message):
+ raise RuntimeError(message)
+
+
+safe_parse_arguments = partial(parse_arguments, ParserClass=SafeOptionParser)
+
+
+class TestStatusArgParserTests(TestCase):
+
+ scenarios = [
+ (cmd, dict(command=cmd, option='--' + cmd)) for cmd in _ALL_ACTIONS
+ ]
+
+ def test_can_parse_all_commands_with_test_id(self):
+ test_id = self.getUniqueString()
+ args = safe_parse_arguments(args=[self.option, test_id])
+
+ self.assertThat(args.action, Equals(self.command))
+ self.assertThat(args.test_id, Equals(test_id))
+
+ def test_all_commands_parse_file_attachment(self):
+ with NamedTemporaryFile() as tmp_file:
+ args = safe_parse_arguments(
+ args=[self.option, 'foo', '--attach-file', tmp_file.name]
+ )
+ self.assertThat(args.attach_file.name, Equals(tmp_file.name))
+
+ def test_all_commands_accept_mimetype_argument(self):
+ with NamedTemporaryFile() as tmp_file:
+ args = safe_parse_arguments(
+ args=[self.option, 'foo', '--attach-file', tmp_file.name, '--mimetype', "text/plain"]
+ )
+ self.assertThat(args.mimetype, Equals("text/plain"))
+
+ def test_all_commands_accept_file_name_argument(self):
+ with NamedTemporaryFile() as tmp_file:
+ args = safe_parse_arguments(
+ args=[self.option, 'foo', '--attach-file', tmp_file.name, '--file-name', "foo"]
+ )
+ self.assertThat(args.file_name, Equals("foo"))
+
+ def test_all_commands_accept_tags_argument(self):
+ args = safe_parse_arguments(
+ args=[self.option, 'foo', '--tag', "foo", "--tag", "bar", "--tag", "baz"]
+ )
+ self.assertThat(args.tags, Equals(["foo", "bar", "baz"]))
+
+ def test_attach_file_with_hyphen_opens_stdin(self):
+ self.patch(_o.sys, 'stdin', TextIOWrapper(BytesIO(b"Hello")))
+ args = safe_parse_arguments(
+ args=[self.option, "foo", "--attach-file", "-"]
+ )
+
+ self.assertThat(args.attach_file.read(), Equals(b"Hello"))
+
+ def test_attach_file_with_hyphen_sets_filename_to_stdin(self):
+ args = safe_parse_arguments(
+ args=[self.option, "foo", "--attach-file", "-"]
+ )
+
+ self.assertThat(args.file_name, Equals("stdin"))
+
+ def test_can_override_stdin_filename(self):
+ args = safe_parse_arguments(
+ args=[self.option, "foo", "--attach-file", "-", '--file-name', 'foo']
+ )
+
+ self.assertThat(args.file_name, Equals("foo"))
+
+ def test_requires_test_id(self):
+ fn = lambda: safe_parse_arguments(args=[self.option])
+ self.assertThat(
+ fn,
+ raises(RuntimeError('argument %s: must specify a single TEST_ID.' % self.option))
+ )
+
+
+class ArgParserTests(TestCase):
+
+ def test_can_parse_attach_file_without_test_id(self):
+ with NamedTemporaryFile() as tmp_file:
+ args = safe_parse_arguments(
+ args=["--attach-file", tmp_file.name]
+ )
+ self.assertThat(args.attach_file.name, Equals(tmp_file.name))
+
+ def test_can_run_without_args(self):
+ args = safe_parse_arguments([])
+
+ def test_cannot_specify_more_than_one_status_command(self):
+ fn = lambda: safe_parse_arguments(['--fail', 'foo', '--skip', 'bar'])
+ self.assertThat(
+ fn,
+ raises(RuntimeError('argument --skip: Only one status may be specified at once.'))
+ )
+
+ def test_cannot_specify_mimetype_without_attach_file(self):
+ fn = lambda: safe_parse_arguments(['--mimetype', 'foo'])
+ self.assertThat(
+ fn,
+ raises(RuntimeError('Cannot specify --mimetype without --attach-file'))
+ )
+
+ def test_cannot_specify_filename_without_attach_file(self):
+ fn = lambda: safe_parse_arguments(['--file-name', 'foo'])
+ self.assertThat(
+ fn,
+ raises(RuntimeError('Cannot specify --file-name without --attach-file'))
+ )
+
+ def test_can_specify_tags_without_status_command(self):
+ args = safe_parse_arguments(['--tag', 'foo'])
+ self.assertEqual(['foo'], args.tags)
+
+ def test_must_specify_tags_with_tags_options(self):
+ fn = lambda: safe_parse_arguments(['--fail', 'foo', '--tag'])
+ self.assertThat(
+ fn,
+ MatchesAny(
+ raises(RuntimeError('--tag option requires 1 argument')),
+ raises(RuntimeError('--tag option requires an argument')),
+ )
+ )
+
+def get_result_for(commands):
+ """Get a result object from *commands.
+
+ Runs the 'generate_stream_results' function from subunit._output after
+ parsing *commands as if they were specified on the command line. The
+ resulting bytestream is then converted back into a result object and
+ returned.
+ """
+ result = StreamResult()
+ args = safe_parse_arguments(commands)
+ generate_stream_results(args, result)
+ return result
+
+
+@contextmanager
+def temp_file_contents(data):
+ """Create a temporary file on disk containing 'data'."""
+ with NamedTemporaryFile() as f:
+ f.write(data)
+ f.seek(0)
+ yield f
+
+
+class StatusStreamResultTests(TestCase):
+
+ scenarios = [
+ (s, dict(status=s, option='--' + s)) for s in _ALL_ACTIONS
+ ]
+
+ _dummy_timestamp = datetime.datetime(2013, 1, 1, 0, 0, 0, 0, UTC)
+
+ def setUp(self):
+ super(StatusStreamResultTests, self).setUp()
+ self.patch(_o, 'create_timestamp', lambda: self._dummy_timestamp)
+ self.test_id = self.getUniqueString()
+
+ def test_only_one_packet_is_generated(self):
+ result = get_result_for([self.option, self.test_id])
+ self.assertThat(
+ len(result._events),
+ Equals(3) # startTestRun and stopTestRun are also called, making 3 total.
+ )
+
+ def test_correct_status_is_generated(self):
+ result = get_result_for([self.option, self.test_id])
+
+ self.assertThat(
+ result._events[1],
+ MatchesStatusCall(test_status=self.status)
+ )
+
+ def test_all_commands_generate_tags(self):
+ result = get_result_for([self.option, self.test_id, '--tag', 'hello', '--tag', 'world'])
+ self.assertThat(
+ result._events[1],
+ MatchesStatusCall(test_tags=set(['hello', 'world']))
+ )
+
+ def test_all_commands_generate_timestamp(self):
+ result = get_result_for([self.option, self.test_id])
+
+ self.assertThat(
+ result._events[1],
+ MatchesStatusCall(timestamp=self._dummy_timestamp)
+ )
+
+ def test_all_commands_generate_correct_test_id(self):
+ result = get_result_for([self.option, self.test_id])
+
+ self.assertThat(
+ result._events[1],
+ MatchesStatusCall(test_id=self.test_id)
+ )
+
+ def test_file_is_sent_in_single_packet(self):
+ with temp_file_contents(b"Hello") as f:
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_bytes=b'Hello', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_can_read_binary_files(self):
+ with temp_file_contents(b"\xDE\xAD\xBE\xEF") as f:
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_bytes=b"\xDE\xAD\xBE\xEF", eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_can_read_empty_files(self):
+ with temp_file_contents(b"") as f:
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_bytes=b"", file_name=f.name, eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_can_read_stdin(self):
+ self.patch(_o.sys, 'stdin', TextIOWrapper(BytesIO(b"\xFE\xED\xFA\xCE")))
+ result = get_result_for([self.option, self.test_id, '--attach-file', '-'])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_bytes=b"\xFE\xED\xFA\xCE", file_name='stdin', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_file_is_sent_with_test_id(self):
+ with temp_file_contents(b"Hello") as f:
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_id=self.test_id, file_bytes=b'Hello', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_file_is_sent_with_test_status(self):
+ with temp_file_contents(b"Hello") as f:
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_status=self.status, file_bytes=b'Hello', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_file_chunk_size_is_honored(self):
+ with temp_file_contents(b"Hello") as f:
+ self.patch(_o, '_CHUNK_SIZE', 1)
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_id=self.test_id, file_bytes=b'H', eof=False),
+ MatchesStatusCall(test_id=self.test_id, file_bytes=b'e', eof=False),
+ MatchesStatusCall(test_id=self.test_id, file_bytes=b'l', eof=False),
+ MatchesStatusCall(test_id=self.test_id, file_bytes=b'l', eof=False),
+ MatchesStatusCall(test_id=self.test_id, file_bytes=b'o', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_file_mimetype_specified_once_only(self):
+ with temp_file_contents(b"Hi") as f:
+ self.patch(_o, '_CHUNK_SIZE', 1)
+ result = get_result_for([
+ self.option,
+ self.test_id,
+ '--attach-file',
+ f.name,
+ '--mimetype',
+ 'text/plain',
+ ])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_id=self.test_id, mime_type='text/plain', file_bytes=b'H', eof=False),
+ MatchesStatusCall(test_id=self.test_id, mime_type=None, file_bytes=b'i', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_tags_specified_once_only(self):
+ with temp_file_contents(b"Hi") as f:
+ self.patch(_o, '_CHUNK_SIZE', 1)
+ result = get_result_for([
+ self.option,
+ self.test_id,
+ '--attach-file',
+ f.name,
+ '--tag',
+ 'foo',
+ '--tag',
+ 'bar',
+ ])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_id=self.test_id, test_tags=set(['foo', 'bar'])),
+ MatchesStatusCall(test_id=self.test_id, test_tags=None),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_timestamp_specified_once_only(self):
+ with temp_file_contents(b"Hi") as f:
+ self.patch(_o, '_CHUNK_SIZE', 1)
+ result = get_result_for([
+ self.option,
+ self.test_id,
+ '--attach-file',
+ f.name,
+ ])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_id=self.test_id, timestamp=self._dummy_timestamp),
+ MatchesStatusCall(test_id=self.test_id, timestamp=None),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_test_status_specified_once_only(self):
+ with temp_file_contents(b"Hi") as f:
+ self.patch(_o, '_CHUNK_SIZE', 1)
+ result = get_result_for([
+ self.option,
+ self.test_id,
+ '--attach-file',
+ f.name,
+ ])
+
+ # 'inprogress' status should be on the first packet only, all other
+ # statuses should be on the last packet.
+ if self.status in _FINAL_ACTIONS:
+ first_call = MatchesStatusCall(test_id=self.test_id, test_status=None)
+ last_call = MatchesStatusCall(test_id=self.test_id, test_status=self.status)
+ else:
+ first_call = MatchesStatusCall(test_id=self.test_id, test_status=self.status)
+ last_call = MatchesStatusCall(test_id=self.test_id, test_status=None)
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ first_call,
+ last_call,
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_filename_can_be_overridden(self):
+ with temp_file_contents(b"Hello") as f:
+ specified_file_name = self.getUniqueString()
+ result = get_result_for([
+ self.option,
+ self.test_id,
+ '--attach-file',
+ f.name,
+ '--file-name',
+ specified_file_name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_name=specified_file_name, file_bytes=b'Hello'),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_file_name_is_used_by_default(self):
+ with temp_file_contents(b"Hello") as f:
+ result = get_result_for([self.option, self.test_id, '--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_name=f.name, file_bytes=b'Hello', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+
+class FileDataTests(TestCase):
+
+ def test_can_attach_file_without_test_id(self):
+ with temp_file_contents(b"Hello") as f:
+ result = get_result_for(['--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_id=None, file_bytes=b'Hello', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_file_name_is_used_by_default(self):
+ with temp_file_contents(b"Hello") as f:
+ result = get_result_for(['--attach-file', f.name])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_name=f.name, file_bytes=b'Hello', eof=True),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_filename_can_be_overridden(self):
+ with temp_file_contents(b"Hello") as f:
+ specified_file_name = self.getUniqueString()
+ result = get_result_for([
+ '--attach-file',
+ f.name,
+ '--file-name',
+ specified_file_name
+ ])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_name=specified_file_name, file_bytes=b'Hello'),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_files_have_timestamp(self):
+ _dummy_timestamp = datetime.datetime(2013, 1, 1, 0, 0, 0, 0, UTC)
+ self.patch(_o, 'create_timestamp', lambda: _dummy_timestamp)
+
+ with temp_file_contents(b"Hello") as f:
+ specified_file_name = self.getUniqueString()
+ result = get_result_for([
+ '--attach-file',
+ f.name,
+ ])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(file_bytes=b'Hello', timestamp=_dummy_timestamp),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+ def test_can_specify_tags_without_test_status(self):
+ result = get_result_for([
+ '--tag',
+ 'foo',
+ ])
+
+ self.assertThat(
+ result._events,
+ MatchesListwise([
+ MatchesStatusCall(call='startTestRun'),
+ MatchesStatusCall(test_tags=set(['foo'])),
+ MatchesStatusCall(call='stopTestRun'),
+ ])
+ )
+
+
+class MatchesStatusCall(Matcher):
+
+ _position_lookup = {
+ 'call': 0,
+ 'test_id': 1,
+ 'test_status': 2,
+ 'test_tags': 3,
+ 'runnable': 4,
+ 'file_name': 5,
+ 'file_bytes': 6,
+ 'eof': 7,
+ 'mime_type': 8,
+ 'route_code': 9,
+ 'timestamp': 10,
+ }
+
+ def __init__(self, **kwargs):
+ unknown_kwargs = list(filter(
+ lambda k: k not in self._position_lookup,
+ kwargs
+ ))
+ if unknown_kwargs:
+ raise ValueError("Unknown keywords: %s" % ','.join(unknown_kwargs))
+ self._filters = kwargs
+
+ def match(self, call_tuple):
+ for k, v in self._filters.items():
+ try:
+ pos = self._position_lookup[k]
+ if call_tuple[pos] != v:
+ return Mismatch(
+ "Value for key is %r, not %r" % (call_tuple[pos], v)
+ )
+ except IndexError:
+ return Mismatch("Key %s is not present." % k)
+
+ def __str__(self):
+ return "<MatchesStatusCall %r>" % self._filters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python_subunit.egg-info/PKG-INFO new/python-subunit-0.0.18/python_subunit.egg-info/PKG-INFO
--- old/python-subunit-0.0.16/python_subunit.egg-info/PKG-INFO 2013-11-30 10:17:04.000000000 +0100
+++ new/python-subunit-0.0.18/python_subunit.egg-info/PKG-INFO 2014-01-29 20:16:59.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: python-subunit
-Version: 0.0.16
+Version: 0.0.18
Summary: Python implementation of subunit test streaming protocol
Home-page: http://launchpad.net/subunit
Author: Robert Collins
@@ -470,6 +470,8 @@
========
* Update versions in configure.ac and python/subunit/__init__.py.
+ * Update Makefile in the root or do an inplace configure to get an updated Makefile.
+ * Update NEWS.
* Make PyPI and regular tarball releases. Upload the regular one to LP, the
PyPI one to PyPI.
* Push a tagged commit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python_subunit.egg-info/SOURCES.txt new/python-subunit-0.0.18/python_subunit.egg-info/SOURCES.txt
--- old/python-subunit-0.0.16/python_subunit.egg-info/SOURCES.txt 2013-11-30 10:17:05.000000000 +0100
+++ new/python-subunit-0.0.18/python_subunit.egg-info/SOURCES.txt 2014-01-29 20:16:59.000000000 +0100
@@ -7,6 +7,7 @@
filters/subunit-filter
filters/subunit-ls
filters/subunit-notify
+filters/subunit-output
filters/subunit-stats
filters/subunit-tags
filters/subunit2gtk
@@ -14,6 +15,7 @@
filters/subunit2pyunit
filters/tap2subunit
python/subunit/__init__.py
+python/subunit/_output.py
python/subunit/chunked.py
python/subunit/details.py
python/subunit/filters.py
@@ -28,6 +30,7 @@
python/subunit/tests/test_chunked.py
python/subunit/tests/test_details.py
python/subunit/tests/test_filters.py
+python/subunit/tests/test_output_filter.py
python/subunit/tests/test_progress_model.py
python/subunit/tests/test_run.py
python/subunit/tests/test_subunit_filter.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/python_subunit.egg-info/requires.txt new/python-subunit-0.0.18/python_subunit.egg-info/requires.txt
--- old/python-subunit-0.0.16/python_subunit.egg-info/requires.txt 2013-11-30 10:17:04.000000000 +0100
+++ new/python-subunit-0.0.18/python_subunit.egg-info/requires.txt 2014-01-29 20:16:59.000000000 +0100
@@ -1,2 +1,3 @@
extras
+testscenarios
testtools>=0.9.34
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-subunit-0.0.16/setup.py new/python-subunit-0.0.18/setup.py
--- old/python-subunit-0.0.16/setup.py 2013-11-30 10:15:03.000000000 +0100
+++ new/python-subunit-0.0.18/setup.py 2014-01-13 01:07:19.000000000 +0100
@@ -10,6 +10,7 @@
extra = {
'install_requires': [
'extras',
+ 'testscenarios',
'testtools>=0.9.34',
]
}
@@ -52,14 +53,15 @@
scripts = [
'filters/subunit-1to2',
'filters/subunit-2to1',
- 'filters/subunit2gtk',
- 'filters/subunit2junitxml',
- 'filters/subunit2pyunit',
'filters/subunit-filter',
'filters/subunit-ls',
'filters/subunit-notify',
+ 'filters/subunit-output',
'filters/subunit-stats',
'filters/subunit-tags',
+ 'filters/subunit2gtk',
+ 'filters/subunit2junitxml',
+ 'filters/subunit2pyunit',
'filters/tap2subunit',
],
**extra
++++++ python-subunit-filter-path.patch ++++++
diff -ruN a/python/subunit/tests/test_subunit_filter.py b/python/subunit/tests/test_subunit_filter.py
--- a/python/subunit/tests/test_subunit_filter.py 2013-06-16 11:58:35.000000000 +0200
+++ b/python/subunit/tests/test_subunit_filter.py 2014-01-30 13:30:26.069310330 +0100
@@ -290,7 +290,7 @@
def run_command(self, args, stream):
root = os.path.dirname(
os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
- script_path = os.path.join(root, 'filters', 'subunit-filter')
+ script_path = os.path.join('/', 'usr', 'bin', 'subunit-filter')
command = [sys.executable, script_path] + list(args)
ps = subprocess.Popen(
command, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
--
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 python-pytest for openSUSE:Factory checked in at 2014-01-30 17:44:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest (Old)
and /work/SRC/openSUSE:Factory/.python-pytest.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest/python-pytest.changes 2014-01-07 16:27:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-pytest.new/python-pytest.changes 2014-01-30 17:44:57.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 30 13:51:26 UTC 2014 - speilicke(a)suse.com
+
+- Re-add python-argparse requirement for SP3
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest.spec ++++++
--- /var/tmp/diff_new_pack.pqNHKM/_old 2014-01-30 17:44:57.000000000 +0100
+++ /var/tmp/diff_new_pack.pqNHKM/_new 2014-01-30 17:44:57.000000000 +0100
@@ -35,6 +35,7 @@
Requires(post): update-alternatives
Requires(postun): update-alternatives
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+Requires: python-argparse
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
BuildArch: noarch
--
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 openstack-quickstart for openSUSE:Factory checked in at 2014-01-30 17:44:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-quickstart (Old)
and /work/SRC/openSUSE:Factory/.openstack-quickstart.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-quickstart"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-quickstart/openstack-quickstart.changes 2014-01-23 15:50:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes 2014-01-30 17:44:48.000000000 +0100
@@ -1,0 +2,24 @@
+Wed Jan 29 09:12:33 UTC 2014 - speilicke(a)suse.com
+
+- Add refresh_patches source service
+
+-------------------------------------------------------------------
+Mon Jan 27 07:31:54 UTC 2014 - cloud-devel(a)suse.de
+
+- Update to latest git (5443a1f):
+ + fixup! Extend range for fixed network
+
+-------------------------------------------------------------------
+Fri Jan 24 13:01:49 UTC 2014 - cloud-devel(a)suse.de
+
+- Update to latest git (27ea6a2):
+ + configure metadata agent
+ + Extend range for fixed network
+
+-------------------------------------------------------------------
+Wed Jan 22 00:38:54 UTC 2014 - cloud-devel(a)suse.de
+
+- Update to latest git (ebdcec1):
+ + Install all neutron plugins for tempest run
+
+-------------------------------------------------------------------
Old:
----
openstack-quickstart-2013.2+git.1389788956.9a72985.tar.gz
New:
----
openstack-quickstart-2013.2+git.1390807680.5443a1f.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-quickstart.spec ++++++
--- /var/tmp/diff_new_pack.2sAlcE/_old 2014-01-30 17:44:48.000000000 +0100
+++ /var/tmp/diff_new_pack.2sAlcE/_new 2014-01-30 17:44:48.000000000 +0100
@@ -17,7 +17,7 @@
Name: openstack-quickstart
-Version: 2013.2+git.1389788956.9a72985
+Version: 2013.2+git.1390807680.5443a1f
Release: 0
Summary: OpenStack Quickstart
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2sAlcE/_old 2014-01-30 17:44:48.000000000 +0100
+++ /var/tmp/diff_new_pack.2sAlcE/_new 2014-01-30 17:44:48.000000000 +0100
@@ -15,4 +15,8 @@
<service name="set_version" mode="disabled">
<param name="basename">openstack-quickstart</param>
</service>
+
+ <service name="refresh_patches" mode="disabled">
+ <param name="changesgenerate">enable</param>
+ </service>
</services>
++++++ openstack-quickstart-2013.2+git.1389788956.9a72985.tar.gz -> openstack-quickstart-2013.2+git.1390807680.5443a1f.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2013.2+git.1389788956.9a72985/etc/openstackquickstartrc new/openstack-quickstart-2013.2+git.1390807680.5443a1f/etc/openstackquickstartrc
--- old/openstack-quickstart-2013.2+git.1389788956.9a72985/etc/openstackquickstartrc 2014-01-16 01:53:19.000000000 +0100
+++ new/openstack-quickstart-2013.2+git.1390807680.5443a1f/etc/openstackquickstartrc 2014-01-27 02:43:38.000000000 +0100
@@ -12,7 +12,7 @@
IP=127.0.0.1
# this defines which addresses are assigned to VMs - should be part of your regular subnet, unless you arrange for routing
-testnet=10.10.134.16/29
+testnet=10.10.134.0/24
# floating ip address, should not be a part of your network
floatingnet=172.31.0.0/24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-quickstart-2013.2+git.1389788956.9a72985/scripts/openstack-quickstart-demosetup new/openstack-quickstart-2013.2+git.1390807680.5443a1f/scripts/openstack-quickstart-demosetup
--- old/openstack-quickstart-2013.2+git.1389788956.9a72985/scripts/openstack-quickstart-demosetup 2014-01-16 02:11:55.000000000 +0100
+++ new/openstack-quickstart-2013.2+git.1390807680.5443a1f/scripts/openstack-quickstart-demosetup 2014-01-27 08:31:50.000000000 +0100
@@ -367,13 +367,14 @@
## setup nova configuration
#-----------------------------------------
-# replace default IP in all configuration files
crudini --set /etc/nova/nova.conf database connection "$DB://nova:$mpw@$IP/nova"
crudini --set /etc/nova/nova.conf DEFAULT glance_api_servers "$IP:9292"
crudini --set /etc/nova/nova.conf DEFAULT novncproxy_base_url "http://$IP:6080/vnc_auto.html"
crudini --set /etc/nova/nova.conf DEFAULT allow_resize_to_same_host True
crudini --set /etc/nova/nova.conf DEFAULT default_floating_pool ext
crudini --set /etc/nova/nova.conf DEFAULT my_ip "$IP"
+metadata_secret=$(uuidgen)
+crudini --set /etc/nova/nova.conf DEFAULT neutron_metadata_proxy_shared_secret $metadata_secret
extensions_path=$(ls -d /usr/lib*/python*/site-packages/extensions 2> /dev/null | head -n 1)
if [ -n "$extensions_path" ]; then
@@ -435,9 +436,14 @@
crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini linux_bridge physical_interface_mappings root-bridge:vefq,physnet1:eth0
# crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types vlan
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_type_vlan network_vlan_ranges root-bridge,physnet1
-### turnof namespace to allow connecting to VMs from demo admin node (simple setup for demo purposes only)
crudini --set /etc/neutron/dhcp_agent.ini DEFAULT use_namespaces false
+#crudini --set /etc/neutron/dhcp_agent.ini DEFAULT use_namespaces true
crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips true
+crudini --set /etc/neutron/metadata_agent.ini DEFAULT metadata_proxy_shared_secret $metadata_secret
+
+if [ "x$with_tempest" = "xyes" ]; then
+ crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins "neutron.services.loadbalancer.plugin.LoadBalancerPlugin, neutron.services.l3_router.l3_router_plugin.L3RouterPlugin, neutron.services.vpn.plugin.VPNDriverPlugin"
+fi
start_and_enable_service rabbitmq-server
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0