[packages/ipchains] - verbose files - gcc patch to allow build with non-ancient compilers

qboosh qboosh at pld-linux.org
Sat Aug 22 11:25:12 CEST 2020


commit 0dbef30a2d7742407686c141b855ad0cfcb50cea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Aug 22 11:27:39 2020 +0200

    - verbose files
    - gcc patch to allow build with non-ancient compilers

 ipchains-gcc.patch | 11 +++++++++++
 ipchains.spec      | 39 +++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/ipchains.spec b/ipchains.spec
index 143998c..04d20cc 100644
--- a/ipchains.spec
+++ b/ipchains.spec
@@ -22,6 +22,7 @@ Source3:	http://people.netfilter.org/~rusty/ipchains/%{name}-scripts-%{_scriptve
 # Source3-md5:	c8996aef5985bddf80844b12ae833781
 Patch0:		%{name}-fixman.patch
 Patch1:		%{name}-vlanallowing.patch
+Patch2:		%{name}-gcc.patch
 URL:		http://people.netfilter.org/~rusty/ipchains/
 Provides:	firewall-userspace-tool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,8 +78,9 @@ Biblioteka do manipulacji regułami filtrowania.
 %setup -q -a1 -a3
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
-rm -f ipchains
+%{__rm} ipchains
 ln -sf %{name}-HOWTOs-1.0.7	doc
 
 %build
@@ -94,15 +96,15 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man{4,8}} \
 	$RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
 
 install ipchains	$RPM_BUILD_ROOT%{_sbindir}
-install *.4		$RPM_BUILD_ROOT%{_mandir}/man4
-install *.8		$RPM_BUILD_ROOT%{_mandir}/man8
-install libipfwc/*.a	$RPM_BUILD_ROOT%{_libdir}
-install libipfwc/*.h	$RPM_BUILD_ROOT%{_includedir}
+cp -p *.4		$RPM_BUILD_ROOT%{_mandir}/man4
+cp -p *.8		$RPM_BUILD_ROOT%{_mandir}/man8
+cp -p libipfwc/*.a	$RPM_BUILD_ROOT%{_libdir}
+cp -p libipfwc/*.h	$RPM_BUILD_ROOT%{_includedir}
 cd %{name}-scripts-%{_scriptver}
 install ipchains-restore	$RPM_BUILD_ROOT%{_sbindir}
 install ipchains-save		$RPM_BUILD_ROOT%{_sbindir}
 install ipfwadm-wrapper		$RPM_BUILD_ROOT%{_sbindir}
-install *.8			$RPM_BUILD_ROOT%{_mandir}/man8
+cp -p *.8			$RPM_BUILD_ROOT%{_mandir}/man8
 
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -112,14 +114,23 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc doc/HOWTO.txt README doc/*.html
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man?/*
-%lang(es) %{_mandir}/es/man?/*
-%lang(it) %{_mandir}/it/man?/*
-%lang(ja) %{_mandir}/ja/man?/*
-%lang(pl) %{_mandir}/pl/man?/*
+%attr(755,root,root) %{_sbindir}/ipchains
+%attr(755,root,root) %{_sbindir}/ipchains-restore
+%attr(755,root,root) %{_sbindir}/ipchains-save
+%attr(755,root,root) %{_sbindir}/ipfwadm-wrapper
+%{_mandir}/man4/ipfw.4*
+%{_mandir}/man8/ipchains.8*
+%{_mandir}/man8/ipchains-restore.8*
+%{_mandir}/man8/ipchains-save.8*
+%{_mandir}/man8/ipfwadm-wrapper.8*
+%lang(es) %{_mandir}/es/man8/ipchains.8*
+%lang(it) %{_mandir}/it/man4/ipfw.4*
+%lang(ja) %{_mandir}/ja/man8/ipchains.8*
+%lang(pl) %{_mandir}/pl/man4/ipfw.4*
+%lang(pl) %{_mandir}/pl/man8/ipchains.8*
 
 %files -n libipfwc
 %defattr(644,root,root,755)
-%{_libdir}/*.a
-%{_includedir}/*.h
+%{_libdir}/libipfwc.a
+%{_includedir}/ipfwc_kernel_headers.h
+%{_includedir}/libipfwc.h
diff --git a/ipchains-gcc.patch b/ipchains-gcc.patch
new file mode 100644
index 0000000..ae74fdc
--- /dev/null
+++ b/ipchains-gcc.patch
@@ -0,0 +1,11 @@
+--- ipchains-1.3.10/libipfwc/libipfwc.c.orig	1999-03-23 04:41:17.000000000 +0100
++++ ipchains-1.3.10/libipfwc/libipfwc.c	2020-08-22 11:18:51.852161742 +0200
+@@ -500,7 +500,7 @@
+ 					       " doesn't support"
+ 					       " transparent proxying?)");
+ 					break;
+-				default:
++				default: ;
+ 				}
+ 			return message;
+ 		}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ipchains.git/commitdiff/0dbef30a2d7742407686c141b855ad0cfcb50cea



More information about the pld-cvs-commit mailing list