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