[packages/iodine] - updated to 0.8.0

Sat Jun 8 19:33:02 CEST 2024

commit 8e0d91889a794d20faaa6afcea405dbc86528ff0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 8 19:13:20 2024 +0200

    - updated to 0.8.0

 iodine-make.patch    | 27 ---------------------------
 iodine-opt.patch     | 13 -------------
 iodine-verbose.patch | 24 ++++++++++++++++++++++++
 iodine.spec          | 24 +++++++++++-------------
 libsystemd.patch     | 11 -----------
 5 files changed, 35 insertions(+), 64 deletions(-)
---

diff --git a/iodine.spec b/iodine.spec
index 9dfd0e1..af7cff2 100644
--- a/iodine.spec
+++ b/iodine.spec
@@ -6,19 +6,19 @@
 Summary:	IP over DNS is now easy
 Summary(pl.UTF-8):	Łatwa w użyciu implementacja IP over DNS
 Name:		iodine
-Version:	0.7.0
-Release:	3
+Version:	0.8.0
+Release:	1
 License:	MIT
 Group:		Networking
-Source0:	http://code.kryo.se/iodine/%{name}-%{version}.tar.gz
-# Source0-md5:	fdbf3b81cd69caf5230d76a8b039fd99
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-make.patch
-Patch2:		libsystemd.patch
-URL:		http://code.kryo.se/iodine/
+Source0:	https://code.kryo.se/iodine/%{name}-%{version}.tar.gz
+# Source0-md5:	6f2a53476cbc09bbffe7e07d6e9dd19d
+Patch0:		%{name}-verbose.patch
+URL:		https://code.kryo.se/iodine/
 %{?with_selinux:BuildRequires:	libselinux-devel}
 %{?with_systemd:BuildRequires:	systemd-devel}
 BuildRequires:	zlib-devel
+%{!?with_selinux:BuildConflicts:	libselinux-devel}
+%{!?with_systemd:BuildConflicts:	systemd-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,13 +34,11 @@ ograniczony firewallem, ale dozwolone są zapytania DNS.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
+CFLAGS="%{rpmcflags}" \
 %{__make} \
-	CC="%{__cc}" \
-	OPTFLAGS="%{rpmcflags} -D_GNU_SOURCE %{?with_selinux:-DHAVE_SETCON} %{?with_systemd:-DHAVE_SYSTEMD}"
+	CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -54,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG README TODO
+%doc CHANGELOG LICENSE README.md
 %attr(755,root,root) %{_sbindir}/iodine
 %attr(755,root,root) %{_sbindir}/iodined
 %{_mandir}/man8/iodine.8*
diff --git a/iodine-make.patch b/iodine-make.patch
deleted file mode 100644
index 5a1d9b0..0000000
--- a/iodine-make.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- iodine-0.7.0/Makefile.orig	2015-04-03 21:06:29.560818850 +0200
-+++ iodine-0.7.0/Makefile	2015-04-03 21:13:53.784142924 +0200
-@@ -17,7 +17,7 @@
- TARGETOS = `uname`
- 
- all:
--	@(cd src; $(MAKE) TARGETOS=$(TARGETOS) all)
-+	$(MAKE) -C src TARGETOS=$(TARGETOS) all
- 
- install: all
- 	$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
-@@ -37,12 +37,12 @@
- test: all
- 	@echo "!! The check library is required for compiling and running the tests"
- 	@echo "!! Get it at http://check.sf.net"
--	@(cd tests; $(MAKE) TARGETOS=$(TARGETOS) all)
-+	$(MAKE) -C tests TARGETOS=$(TARGETOS) all
- 
- clean:
- 	@echo "Cleaning..."
--	@(cd src; $(MAKE) clean)
--	@(cd tests; $(MAKE) clean)
-+	$(MAKE) -C src clean
-+	$(MAKE) -C tests clean
- 	@rm -rf bin iodine-latest*
- 
- #Helper target for windows/android zipfiles
diff --git a/iodine-opt.patch b/iodine-opt.patch
deleted file mode 100644
index 08db05a..0000000
--- a/iodine-opt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- iodine-0.7.0/src/Makefile.orig	2015-04-03 21:04:15.740821639 +0200
-+++ iodine-0.7.0/src/Makefile	2015-04-03 21:06:13.590819177 +0200
-@@ -8,8 +8,9 @@
- ARCH = `uname -m`
- 
- LIBPATH = -L.
-+OPTFLAGS = -g -Wall
- LDFLAGS +=  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
--CFLAGS += -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
-+CFLAGS += -std=c99 -c $(OPTFLAGS) -D$(OS) -pedantic
- 
- all: stateos $(CLIENT) $(SERVER)
- 
diff --git a/iodine-verbose.patch b/iodine-verbose.patch
new file mode 100644
index 0000000..5e747bb
--- /dev/null
+++ b/iodine-verbose.patch
@@ -0,0 +1,24 @@
+--- iodine-0.8.0/src/Makefile.orig	2023-04-17 09:50:19.000000000 +0200
++++ iodine-0.8.0/src/Makefile	2024-06-08 19:08:19.280902930 +0200
+@@ -18,18 +18,15 @@ stateos:
+ 	@echo OS is $(OS), arch is $(ARCH)
+ 
+ $(CLIENT): $(COMMONOBJS) $(CLIENTOBJS)
+-	@echo LD $@
+ 	@mkdir -p ../bin
+-	@$(CC) $(COMMONOBJS) $(CLIENTOBJS) -o $(CLIENT) $(LDFLAGS)
++	$(CC) $(COMMONOBJS) $(CLIENTOBJS) -o $(CLIENT) $(LDFLAGS)
+ 
+ $(SERVER): $(COMMONOBJS) $(SERVEROBJS)
+-	@echo LD $@
+ 	@mkdir -p ../bin
+-	@$(CC) $(COMMONOBJS) $(SERVEROBJS) -o $(SERVER) $(LDFLAGS)
++	$(CC) $(COMMONOBJS) $(SERVEROBJS) -o $(SERVER) $(LDFLAGS)
+ 
+ .c.o:
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) $< -o $@
++	$(CC) $(CFLAGS) $< -o $@
+ 
+ base64u.c: base64.c
+ 	@echo Making $@
diff --git a/libsystemd.patch b/libsystemd.patch
deleted file mode 100644
index 3c93f58..0000000
--- a/libsystemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iodine-0.7.0/src/osflags~	2014-06-16 22:28:43.000000000 +0200
-+++ iodine-0.7.0/src/osflags	2017-02-26 00:19:38.951204153 +0100
-@@ -19,7 +19,7 @@
- 		Linux)
- 			FLAGS="";
- 			[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
--			[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon";
-+			[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd";
- 			echo $FLAGS;
- 		;;
- 	esac
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iodine.git/commitdiff/8e0d91889a794d20faaa6afcea405dbc86528ff0

