[packages/pimd] up to 2.3.2

atler atler at pld-linux.org
Sun Aug 28 00:49:17 CEST 2022


commit a2e00bc1a643a2d88724bd5120d34d95aec49a45
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Aug 28 00:48:29 2022 +0200

    up to 2.3.2

 pimd-Makefile.patch | 21 ---------------------
 pimd-time.patch     | 10 ----------
 pimd.spec           | 50 +++++++++++++++++++++++++++-----------------------
 3 files changed, 27 insertions(+), 54 deletions(-)
---
diff --git a/pimd.spec b/pimd.spec
index 38d0d34..a312103 100644
--- a/pimd.spec
+++ b/pimd.spec
@@ -1,18 +1,14 @@
-%define	ver_a 2.1.0
-%define	ver_b alpha28
 Summary:	Multicast routing daemon
 Summary(pl.UTF-8):	Demon routingu multicastowego
 Name:		pimd
-Version:	%{ver_a}_%{ver_b}
-Release:	2
-License:	custom
+Version:	2.3.2
+Release:	1
+License:	BSD
 Group:		Networking/Daemons
-Source0:	http://catarina.usc.edu/pim/pimd/%{name}-%{ver_a}-%{ver_b}.tar.gz
-# Source0-md5:	05a0f591434b8ed0051132112159a59f
+Source0:	ftp://ftp.troglobit.com/pimd/%{name}-%{version}.tar.gz
+# Source0-md5:	a3c03e40540980b2c06e265a17988e60
 Source1:	%{name}.init
-Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-time.patch
-URL:		http://catarina.usc.edu/pim/
+URL:		https://troglobit.com/projects/pimd/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -29,25 +25,31 @@ ma zaimplementowaną pełną specyfikację PIM-SM (RFC 2362) z kilkoma
 wyjątkami.
 
 %prep
-%setup -q -n %{name}-%{ver_a}-%{ver_b}
-%patch0 -p1
-%patch1 -p1
-
-# these files are outdated (conflicting with current glibc)
-rm -f include/linux/netinet/in*
+%setup -q
 
 %build
+./configure \
+	--prefix=%{_prefix} \
+	--sysconfdir=%{_sysconfdir}
+
+export CPPFLAGS="%{rpmcppflags}"
+export CFLAGS="%{rpmcflags}"
+export LDFLAGS="%{rpmldflags}"
 %{__make} \
-	CC="%{__cc} %{rpmcflags}"
+	CC="%{__cc}" \
+	mandir="%{_mandir}/man8"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sbindir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install pimd $RPM_BUILD_ROOT%{_sbindir}
-install pimd.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pimd
 
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/share/doc/pimd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -63,7 +65,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README LICENSE* RELEASE.NOTES CHANGES BUGS.TODO
-%attr(755,root,root) %{_sbindir}/*
-%attr(754,root,root) /etc/rc.d/init.d/*
+%doc AUTHORS ChangeLog.org CODE-OF-CONDUCT.md CONTRIBUTING.md CREDITS FAQ.md LICENSE* README{,-config,-debug}.md TODO.org
+%lang(jp) %doc README.config.jp
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pimd.conf
+%attr(755,root,root) %{_sbindir}/pimd
+%attr(754,root,root) /etc/rc.d/init.d/*
+%{_mandir}/man8/pimd.8*
diff --git a/pimd-Makefile.patch b/pimd-Makefile.patch
deleted file mode 100644
index ee2f07a..0000000
--- a/pimd-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -durN pimd-2.1.0-alpha28.orig/Makefile pimd-2.1.0-alpha28/Makefile
---- pimd-2.1.0-alpha28.orig/Makefile	Wed Mar  8 10:10:52 2000
-+++ pimd-2.1.0-alpha28/Makefile	Mon Jun 12 18:03:16 2000
-@@ -67,7 +67,7 @@
- 
- ## FreeBSD	-D__FreeBSD__ is defined by the OS
- ## FreeBSD-3.x
--CFLAGS= -Wall	-g	-Iinclude/freebsd ${COMMON_CFLAGS}
-+#CFLAGS= -Wall	-g	-Iinclude/freebsd ${COMMON_CFLAGS}
- ## FreeBSD-2.x
- #CFLAGS= -Wall	-g	-Iinclude/freebsd2 ${COMMON_CFLAGS}
- 
-@@ -106,7 +106,7 @@
- #CFLAGS= -Wall -g -Dold_Linux ${LINUX_INCLUDE} ${LINUX_DEFS} ${COMMON_CFLAGS}
- 
- ## Newer Linux (linux-2.1.127 for example)
--#CFLAGS= -Wall -g ${LINUX_INCLUDE} ${LINUX_DEFS} ${COMMON_CFLAGS}
-+CFLAGS= -Wall ${LINUX_INCLUDE} ${LINUX_DEFS} ${COMMON_CFLAGS}
- 
- 
- LIBS=		${SNMPLIBDIR} ${SNMPLIBS} ${LIB2}
diff --git a/pimd-time.patch b/pimd-time.patch
deleted file mode 100644
index 3573bd4..0000000
--- a/pimd-time.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pimd-2.1.0-alpha28/debug.c.orig	Wed Mar  8 10:10:53 2000
-+++ pimd-2.1.0-alpha28/debug.c	Tue Aug 12 13:27:37 2003
-@@ -54,6 +54,7 @@
- #else
- #include <varargs.h>
- #endif
-+#include <time.h>
- 
- extern int haveterminal;
- extern char *progname;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pimd.git/commitdiff/a2e00bc1a643a2d88724bd5120d34d95aec49a45



More information about the pld-cvs-commit mailing list