Compare commits

..

No commits in common. "rawhide" and "f28" have entirely different histories.

7 changed files with 150 additions and 77 deletions

3
.gitignore vendored
View file

@ -1,4 +1 @@
/ykushcmd-1.1.0.tar.gz
/ykush-1.1.0-c585d24.tar.xz
/ykush-1.2.2.tar.gz
/ykush-1.2.3.tar.gz

View file

@ -0,0 +1,30 @@
From 7d4fe14558c4f6f17b9bcf2dc1d879af61fb4f8b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 15 Jan 2018 13:44:24 +0100
Subject: [PATCH 1/4] build: remove a duplicate define
In file included from ykushcmd/stdafx.h:2:0,
from ykushcmd/ykushcmd.cpp:3:
ykushcmd/platformdefs.h:3:0: error: "LINUX" redefined [-Werror]
#define LINUX
<command-line>:0:0: note: this is the location of the previous definition
---
Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Makefile b/Makefile
index 127965b..5e8dd40 100755
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ CUR_PATH = $(shell echo $(PWD))
OBJS = $(addprefix ykushcmd/objs/,ykushcmd.o commandParser.o usbcom.o)
LIBS = -lhidapi-libusb -lusb-1.0 -ludev
LOADPATHS = -L$(CUR_PATH)/ykushcmd/linux
-PREPROCESSOR_DEFS = -DLINUX
CPP = g++
ykushcmd : $(OBJS)
--
2.14.3

View file

@ -0,0 +1,49 @@
From 44cb46f4f3fc23e8a9de1813504943e68c95e1c4 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 15 Jan 2018 13:47:16 +0100
Subject: [PATCH 2/4] ykushcmd: drop a couple of unused variables
---
ykushcmd/commandParser.cpp | 1 -
ykushcmd/usbcom.cpp | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/ykushcmd/commandParser.cpp b/ykushcmd/commandParser.cpp
index 101cd1c..0f4c7de 100755
--- a/ykushcmd/commandParser.cpp
+++ b/ykushcmd/commandParser.cpp
@@ -73,7 +73,6 @@ bool bySerial = false;
int commandParser(int argc, char** argv) {
- char choice;
char cmd = 0x00;
enum cmdAction action = PRINT_HELP;
char *iSerial=NULL;
diff --git a/ykushcmd/usbcom.cpp b/ykushcmd/usbcom.cpp
index fc2fe9c..63474d0 100755
--- a/ykushcmd/usbcom.cpp
+++ b/ykushcmd/usbcom.cpp
@@ -167,7 +167,6 @@ char commandsBySerial(char *iSerial, char *cmd, char *resp, int num)
unsigned char buf6[6];
bool isLegacy = false;
#define MAX_STR 255
- wchar_t wstr[MAX_STR];
hid_device *handle;
int i;
const size_t newsize = 100;
@@ -176,10 +175,10 @@ char commandsBySerial(char *iSerial, char *cmd, char *resp, int num)
if (iSerial) {
// Convert to a wchar_t*
+#ifndef LINUX
size_t origsize = strlen(iSerial) + 1;
size_t convertedChars = 0;
-#ifndef LINUX
mbstowcs_s(&convertedChars, serial, origsize, iSerial, _TRUNCATE);
#else
mbstowcs(serial, iSerial, newsize);
--
2.14.3

View file

@ -0,0 +1,25 @@
From 57d6dc20d723ca3fab2b4fc4676016a05029ddc0 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 16 Jan 2018 12:43:14 +0100
Subject: [PATCH 3/4] ykushcmd: remove an unused prototype
---
ykushcmd/usbcom.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/ykushcmd/usbcom.h b/ykushcmd/usbcom.h
index 28de76d..2c0f05d 100755
--- a/ykushcmd/usbcom.h
+++ b/ykushcmd/usbcom.h
@@ -1,8 +1,6 @@
#ifndef USBCOM_H
#define USBCOM_H
-static int sendCommand(unsigned char *toSendBuffer, unsigned char *receivedBuffer);
-
char commands(char *cmd, char *resp, int num);
char command(char cmd);
--
2.14.3

View file

@ -0,0 +1,24 @@
From c9bdaf157b7303897bd1181a078d7b4277dc2bf5 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 16 Jan 2018 12:44:19 +0100
Subject: [PATCH 4/4] ykushcmd: initialize a variable before use
---
ykushcmd/usbcom.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/ykushcmd/usbcom.cpp b/ykushcmd/usbcom.cpp
index 63474d0..b6c2e48 100755
--- a/ykushcmd/usbcom.cpp
+++ b/ykushcmd/usbcom.cpp
@@ -99,6 +99,7 @@ int listDevices() {
//APAGAR
// Limited Legaccy firmware support (does not work in all systems)
//handle = hid_open(VENDOR_ID, OLD_PRODUCT_ID, NULL);
+ handle = NULL;
//FIM APAGAR
if (handle == NULL){
// No HID devices found
--
2.14.3

View file

@ -1 +1 @@
SHA512 (ykush-1.2.3.tar.gz) = 469f2da7102deb491bc373249acff91a18a5ee35508497704d223579eb4edebf0fe4244711391dab964f5ec2fcae264dc9ddd142b9fce5e9e564088985f2c118
SHA512 (ykushcmd-1.1.0.tar.gz) = 7df4e5bd0f7b44af5df5a2b96ffb1e8b5518007b10ad381e4f8e8275270a45ca187f5ce29f05b77c860e7f1df44a5203091e529ece2d677987019d7d92ce0d23

View file

@ -1,14 +1,19 @@
Name: ykushcmd
Version: 1.2.3
Release: 14%{?gitsnap:.%{gitsnap}}%{?dist}
Version: 1.1.0
Release: 2%{?dist}
Summary: YKUSH Boards Control Application
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
License: Apache-2.0
URL: https://github.com/Yepkit/ykush
Source0: https://github.com/Yepkit/ykush/archive/%{version}/ykush-%{version}.tar.gz
BuildRequires: make
BuildRequires: gcc-c++
Group: Applications/System
License: ASL 2.0
URL: https://github.com/Yepkit/ykush
Source0: https://github.com/Yepkit/ykush/archive/%{version}/%{name}-%{version}.tar.gz
# https://github.com/Yepkit/ykush/pull/10
Patch0: 0001-build-remove-a-duplicate-define.patch
Patch1: 0002-ykushcmd-drop-a-couple-of-unused-variables.patch
Patch2: 0003-ykushcmd-remove-an-unused-prototype.patch
Patch3: 0004-ykushcmd-initialize-a-variable-before-use.patch
BuildRequires: hidapi-devel
BuildRequires: libusbx-devel
BuildRequires: systemd-devel
@ -18,7 +23,13 @@ Control application for Yepkit YKUSH Switchable USB Hub boards.
%prep
%autosetup -p1 -n ykush-%{version}
%setup -q -n ykush-%{version}
# https://github.com/Yepkit/ykush/pull/10/commits/43fd1497
find -name '*.cpp' -o -name '*.h' |xargs chmod -x
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
@ -31,75 +42,12 @@ install bin/ykushcmd %{buildroot}%{_bindir}
%files
%license LICENSE.md
%doc README.md
%{_bindir}/ykushcmd
%doc README.md
%license %attr(0644,-,-) LICENSE.md
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 1.2.3-10
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Aug 04 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.3-1
- Update to 1.2.3
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.2-1
- Update to 1.2.2
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-7.c585d24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6.c585d24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.0-5.c585d24
- Move to git snapshot to get support for new useful HW
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild