Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
c860131ea8
!13 Fix python script shebang
From: @xing_xing1992 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
2023-01-20 09:57:40 +00:00
xing_xing1992
faeecdda67 Fix python script shebang 2023-01-19 14:42:13 +08:00
openeuler-ci-bot
4daaf444e1
!11 [sync] PR-10: Update to 1.4.3
From: @openeuler-sync-bot 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2022-11-03 02:34:42 +00:00
zhang__3125
616d35b63c Update to 1.4.3
(cherry picked from commit e54d0b57110a65bdb4bb9b0d1db52dc677b32308)
2022-10-18 09:35:10 +08:00
openeuler-ci-bot
bfb176e146 !9 Add missing BuildRequires version: glib2-devel >= 2.66
From: @dwl301
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-07-15 06:59:58 +00:00
wenlong ding
f3210958d5 Add missing BuildRequires version: glib2-devel >= 2.66 2021-07-14 17:56:43 +08:00
openeuler-ci-bot
306be5f6fa !3 Upgrade to 1.2.4, fix CVE-2021-33516
From: @weijin-deng
Reviewed-by: @dwl301,@small_leek
Signed-off-by: @small_leek
2021-06-15 06:06:53 +00:00
weijin-deng
2b4129153c Upgrade to 1.2.4
Update Version, Release, Source0, BuildRequires
Delete sed operation which existed in this version
Add patch for fix CVE-2021-33516
Update stage 'prep', 'build', 'install', 'check', 'files'
2021-06-15 11:48:58 +08:00
openeuler-ci-bot
b292abe0c3 !1 Add yaml file
Merge pull request !1 from lyn/master
2020-05-09 16:27:13 +08:00
lyn1001
99a7557ab2 Add yaml file 2020-05-08 10:21:55 +08:00
6 changed files with 133 additions and 23 deletions

Binary file not shown.

View File

@ -0,0 +1,28 @@
From dbc32a55e265814a83cea7c1254d85f51f99b54b Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Tue, 4 Jan 2022 15:05:14 +0100
Subject: [PATCH] Revert "build: Do not write man page during test"
This reverts commit 79a2cb24cd0079e9a025809d11dce13edce68bdd.
Does not work, will exit xsltproc with an error as if the file was not
writeable
---
doc/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/meson.build b/doc/meson.build
index de94aa2..2fd0106 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -66,7 +66,6 @@ if xsltproc.found()
xsltproc,
xlstproc_flags,
'--noout',
- '--nowrite',
stylesheet,
'gupnp-binding-tool.xml'
]
--
2.33.1

BIN
gupnp-1.4.3.tar.xz Normal file

Binary file not shown.

View File

@ -1,14 +1,20 @@
%global apiver 1.2
%global gssdp_version 1.3.0
Name: gupnp
Version: 1.0.3
Version: 1.4.3
Release: 2
Summary: UPnP devices & control points creation framework
License: LGPLv2+
URL: http://www.gupnp.org/
Source0: http://download.gnome.org/sources/%{name}/1.0/%{name}-%{version}.tar.xz
URL: https://www.gupnp.org/
Source0: https://download.gnome.org/sources/%{name}/1.4/%{name}-%{version}.tar.xz
Patch0: gupnp-1.4.2-revert-man-page.patch
Patch1: linux-cm-Fix-IFA_FLAGS-detection.patch
BuildRequires: gssdp-devel >= 0.14.15 gtk-doc gobject-introspection-devel >= 1.36
BuildRequires: libsoup-devel libxml2-devel libuuid-devel vala
BuildRequires: gssdp-devel >= %{gssdp_version} gtk-doc gobject-introspection-devel docbook-style-xsl
BuildRequires: libsoup-devel libxml2-devel libuuid-devel vala meson
Requires: dbus
Requires: gssdp%{?_isa} >= %{gssdp_version}
%description
GUPnP is an elegant, object-oriented open source framework for creating UPnP
@ -34,20 +40,22 @@ Obsoletes: %{name}-docs < %{version}-%{release}
This package contains help file and developer documentation for gupnp.
%prep
%setup -q
# Use Python3 rather than Python2
sed -i '1s|^#! /usr/bin/env python$|#!/usr/bin/python3|' tools/gupnp-binding-tool
%autosetup -n %{name}-%{version} -p1
%build
%configure --disable-static --with-context-manager=network-manager
%make_build V=1
%meson \
-Dcontext_manager=network-manager \
-Dgtk_doc=true \
-Dexamples=false \
%{nil}
%meson_build
%install
%make_install
%meson_install
%delete_la
%check
make check %{?_smp_mflags} V=1
%meson_test
%post -p /sbin/ldconfig
@ -55,22 +63,38 @@ make check %{?_smp_mflags} V=1
%files
%license COPYING
%doc AUTHORS
%{_libdir}/libgupnp-1.0.so.*
%{_libdir}/girepository-1.0/GUPnP-1.0.typelib
%{_libdir}/libgupnp-%{apiver}.so.1*
%{_libdir}/girepository-1.0/GUPnP-%{apiver}.typelib
%files devel
%{_bindir}/gupnp-binding-tool
%{_libdir}/pkgconfig/gupnp-1.0.pc
%{_libdir}/libgupnp-1.0.so
%{_includedir}/gupnp-1.0
%{_datadir}/gir-1.0/GUPnP-1.0.gir
%files devel
%{_bindir}/gupnp-binding-tool-%{apiver}
%{_includedir}/gupnp-%{apiver}/
%{_libdir}/libgupnp-%{apiver}.so
%{_libdir}/pkgconfig/gupnp-%{apiver}.pc
%{_datadir}/gir-1.0/GUPnP-%{apiver}.gir
%{_datadir}/vala/vapi/gupnp*
%files help
%doc README
%files help
%doc AUTHORS README.md
%doc %{_datadir}/gtk-doc/html/gupnp
%{_mandir}/man1/gupnp-binding-tool-*
%changelog
* Thu Jan 18 2023 xingxing <xingxing@xfusion.com> - 1.4.3-2
- Fix python script shebang
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.4.3-1
- Update to 1.4.3
* Wed Jul 14 2021 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 1.2.4-2
- Add missing BuildRequires version: glib2-devel >= 2.66
* Mon Jun 7 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.2.4-1
- Upgrade to 1.2.4
- Update Version, Release, Source0, BuildRequires
- Delete sed operation which existed in this version
- Add patch for fix CVE-2021-33516
- Update stage 'prep', 'build', 'install', 'check', 'files'
* Fri Oct 25 2019 Alex Chao <zhaolei746@huawei.com> - 1.0.3-2
- Package init

4
gupnp.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: gitlab.gnome
src_repo: gupnp
tag_prefix: gupnp-
seperator: .

View File

@ -0,0 +1,54 @@
From adefe6a3394844f787424d65e5d8aa07d1167c9f Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Tue, 25 Oct 2022 23:47:01 +0200
Subject: [PATCH] linux-cm: Fix IFA_FLAGS detection
---
libgupnp/gupnp-linux-context-manager.c | 6 ++++--
meson.build | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/libgupnp/gupnp-linux-context-manager.c b/libgupnp/gupnp-linux-context-manager.c
index 04a464a..fcc0c5a 100644
--- a/libgupnp/gupnp-linux-context-manager.c
+++ b/libgupnp/gupnp-linux-context-manager.c
@@ -126,8 +126,10 @@ dump_rta_attr (sa_family_t family, struct rtattr *rt_attr)
case IFA_BROADCAST: label = "IFA_BROADCAST"; break;
case IFA_ANYCAST: label = "IFA_ANYCAST"; break;
case IFA_CACHEINFO: label = "IFA_CACHEINFO"; break;
- case IFA_MULTICAST: label = "IFA_MULTICAST"; break;
-#if defined(IFA_FLAGS)
+ case IFA_MULTICAST:
+ label = "IFA_MULTICAST";
+ break;
+#if defined(HAVE_IFA_FLAGS)
case IFA_FLAGS: label = "IFA_FLAGS"; break;
#endif
default: label = "Unknown"; break;
diff --git a/meson.build b/meson.build
index 024ef81..a5837a6 100644
--- a/meson.build
+++ b/meson.build
@@ -10,11 +10,19 @@ bindir = join_paths(prefix, get_option('bindir'))
netlink_available = cc.has_header('linux/rtnetlink.h')
ifaddrs_available = cc.has_header('ifaddrs.h')
+ifa_flags_exists = cc.compiles('''#include <linux/if_addr.h>
+int main(int argc, char *argv[])
+{
+ if (IFA_FLAGS) {};
+ return 0;
+}''', name: 'IFA_FLAGS is defined')
+
conf = configuration_data()
conf.set_quoted('VERSION', meson.project_version())
conf.set('HAVE_NETLINK', netlink_available)
conf.set('HAVE_IFADDRS_H', ifaddrs_available)
conf.set('HAVE_LINUX_WIRELESS_H', cc.has_header('linux/wireless.h'))
+conf.set('HAVE_IFA_FLAGS', ifa_flags_exists)
glib_version = '2.66'
add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c')
--
2.39.0.windows.2