diff --git a/0001-prep-patch.patch b/0001-prep-patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..303d29baed3577985fff52ef9c9b6daabfc0730b --- /dev/null +++ b/0001-prep-patch.patch @@ -0,0 +1,69 @@ +From d53261d24af72b4bf9ce6800df815ecbabed78db Mon Sep 17 00:00:00 2001 +From: zhangxianting +Date: Mon, 21 Oct 2024 13:44:32 +0800 +Subject: [PATCH] prep patch + +Change-Id: Iec60054a81edfeb80b1a842040530933c7334c02 +--- + rpm/lib-to-libexec.patch | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +diff --git a/rpm/lib-to-libexec.patch b/rpm/lib-to-libexec.patch +index 84ceba3..589a604 100644 +--- a/rpm/lib-to-libexec.patch ++++ b/rpm/lib-to-libexec.patch +@@ -1,5 +1,5 @@ + diff --git a/Makefile b/Makefile +-index 849d32e..90fffb3 100644 ++index 2885957..bd676ec 100644 + --- a/Makefile + +++ b/Makefile + @@ -1,7 +1,6 @@ +@@ -10,15 +10,15 @@ index 849d32e..90fffb3 100644 + DEEPIN=deepin + PROXYFILE=deepin-proxy + DAEMON=deepin-daemon +-@@ -32,7 +31,7 @@ install: ++@@ -31,7 +30,7 @@ install: + install -v -D -m755 -t ${DESTDIR}${PREFIXETC}/${DEEPIN}/${PROXYFILE} misc/proxy/proxy.yaml + install -v -D -m755 -t ${DESTDIR}${PREFIX}/share/dbus-1/system.d misc/proxy/com.deepin.system.proxy.conf + install -v -D -m755 -t ${DESTDIR}${PREFIX}/share/dbus-1/system-services misc/proxy/com.deepin.system.proxy.service + - install -v -D -m755 -t ${DESTDIR}${PREFIX}/${LIB}/${DAEMON} bin/dde-proxy + + install -v -D -m755 -t ${DESTDIR}${PREFIX}/libexec/${DAEMON} bin/dde-proxy ++ install -v -D -m0644 -t ${DESTDIR}/${LIB}/systemd/system misc/proxy/deepin-system-proxy.service ++ install -v -D -m0644 -t ${DESTDIR}${PREFIX}/share/polkit-1/actions misc/proxy/com.deepin.system.proxy.policy + +- +- clean: + diff --git a/misc/procs/com.deepin.system.Procs.service b/misc/procs/com.deepin.system.Procs.service + index cd76676..19ed078 100644 + --- a/misc/procs/com.deepin.system.Procs.service +@@ -29,13 +29,16 @@ index cd76676..19ed078 100644 + -Exec=/usr/lib/deepin-daemon/netlink + +Exec=/usr/libexec/deepin-daemon/netlink + User=root +-diff --git a/misc/proxy/com.deepin.system.proxy.service b/misc/proxy/com.deepin.system.proxy.service +-index 008511e..aaf1657 100644 +---- a/misc/proxy/com.deepin.system.proxy.service +-+++ b/misc/proxy/com.deepin.system.proxy.service +-@@ -1,4 +1,4 @@ +- [D-BUS Service] +- Name=com.deepin.system.proxy +--Exec=/usr/lib/deepin-daemon/dde-proxy +-+Exec=/usr/libexec/deepin-daemon/dde-proxy ++diff --git a/misc/proxy/deepin-system-proxy.service b/misc/proxy/deepin-system-proxy.service ++index 7be47f5..1a72fe0 100644 ++--- a/misc/proxy/deepin-system-proxy.service +++++ b/misc/proxy/deepin-system-proxy.service ++@@ -8,7 +8,7 @@ After=dbus.socket ++ Type=dbus + User=root ++ BusName=com.deepin.system.proxy ++-ExecStart=/usr/lib/deepin-daemon/dde-proxy +++ExecStart=/usr/libexec/deepin-daemon/dde-proxy ++ ++ ProtectSystem=strict ++ InaccessiblePaths=/etc/shadow +-- +2.31.1 + diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/deepin-network-proxy-1.1.0.9.tar.gz b/deepin-network-proxy-1.1.0.9.tar.gz deleted file mode 100644 index 4600a95ff02aed094cc822ddb17857d95f72630a..0000000000000000000000000000000000000000 Binary files a/deepin-network-proxy-1.1.0.9.tar.gz and /dev/null differ diff --git a/deepin-proxy.spec b/deepin-proxy.spec index e13fbe92b4dbcc678ba01f3a5ddeed7cc68755c7..8866b89f1c224196acdfa9ee43895eb99e9ac7f9 100644 --- a/deepin-proxy.spec +++ b/deepin-proxy.spec @@ -1,17 +1,19 @@ -%define anolis_release 1 %global debug_package %{nil} %global repo deepin-network-proxy Name: deepin-proxy -Version: 1.1.0.9 -Release: 1.%{anolis_release}%{?dist} +Version: 1.1.5 +Release: 1%{?dist} Summary: Most simple RPM package -License: GPLv3 +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/%{repo} -Source0: %{repo}-%{version}.tar.gz +Source0: %{name}_%{version}.orig.tar.xz +Patch0: 0001-prep-patch.patch +Patch1: update-license.patch BuildRequires: compiler(go-compiler) +BuildRequires: golang BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -21,17 +23,18 @@ BuildRequires: go-x11-client-devel BuildRequires: go-dbus-factory-devel BuildRequires: go-lib-devel BuildRequires: go-gir-generator -Obsoletes: deepin-network-proxy +Obsoletes: deepin-network-proxy +Requires: dde-common >= 2026 %description This is my first RPM package, which does nothing. %prep -%autosetup -n %{repo}-%{version} +%autosetup -n %{name}-%{version} -p1 patch -p1 < rpm/lib-to-libexec.patch %build -%ifarch loongarch64 +%ifarch loongarch64 sw_64 export CGO_ENABLED=1 export GOOS=linux %endif @@ -41,16 +44,37 @@ export GOPATH=/usr/share/gocode %install %make_install - +mkdir -p %{buildroot}/usr/lib/systemd/system/ +cp -a %{buildroot}/systemd/system/deepin-system-proxy.service %{buildroot}/usr/lib/systemd/system/ +rm -f %{buildroot}/systemd/system/deepin-system-proxy.service %files %config %{_sysconfdir}/deepin/deepin-proxy/* %{_datadir}/dbus-1/system.d/* %{_datadir}/dbus-1/system-services/* +%{_datadir}/polkit-1/actions/com.deepin.system.proxy.policy %{_libexecdir}/deepin-daemon/* +#/systemd/system/deepin-system-proxy.service +/usr/lib/systemd/system/deepin-system-proxy.service %changelog -* Tue Nov 07 2023 yangxianzhao - 1.1.0.9-1.1 -- rebuild for qt +* Tue Dec 30 2025 mahailiang - 1.1.5-1 +- update: update to 1.1.5 + +* Tue Aug 19 2025 lichao - 1.1.4-1.04 +- update: update license + +* Mon Aug 11 2025 lichao - 1.1.4-1.03 +- fix: fix service file location (bugid:326819) + +* Thu Nov 28 2024 liweigang - 1.1.4-1.02 +- feat: fix build error + +* Sat Oct 12 2024 zhangxianting - 1.1.4-1.01 +- update: update to 1.1.4 +- build: fix prep error + +* Thu Sep 07 2023 liuzhilin - 1.1.0.9-1.01 +- spec: sw_64 export GOOS=linux * Tue Jan 10 2023 liweiganga - 1.1.0.9-1 - update: update to 1.1.0.9 diff --git a/deepin-proxy_1.1.5.orig.tar.xz b/deepin-proxy_1.1.5.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..e73de25badf138a6cde0daa6390aed908e8bcb4e Binary files /dev/null and b/deepin-proxy_1.1.5.orig.tar.xz differ diff --git a/update-license.patch b/update-license.patch new file mode 100644 index 0000000000000000000000000000000000000000..a6a21c290b0a939234dc7b31f04547a8ef0cf300 --- /dev/null +++ b/update-license.patch @@ -0,0 +1,12 @@ +diff -Nuar deepin-network-proxy-1.1.4/rpm/deepin-proxy.spec deepin-network-proxy-1.1.4.new/rpm/deepin-proxy.spec +--- deepin-network-proxy-1.1.4/rpm/deepin-proxy.spec 2024-10-12 09:56:18.000000000 +0800 ++++ deepin-network-proxy-1.1.4.new/rpm/deepin-proxy.spec 2025-08-19 14:00:12.621923261 +0800 +@@ -4,7 +4,7 @@ + Version: 1.0.0.7 + Release: 1 + Summary: Most simple RPM package +-License: GPLv3 ++License: GPL-3.0-or-later + + Source0: %{name}-%{version}.orig.tar.xz +