X-Git-Url: http://git.pld-linux.org/?p=packages%2Farpd.git;a=blobdiff_plain;f=arpd.spec;h=7602eaf935a4a912d01afea86f23be8a714a9996;hp=71b3e8aeb6252db72721f73c969cede10149ddd2;hb=7875af3dbcf3a3c922069bd64d756cf9899b4ec1;hpb=cdcaf2b55b4f89e3f4e7f83eef6a5f8f8ac6e88d

diff --git a/arpd.spec b/arpd.spec
index 71b3e8a..7602eaf 100644
--- a/arpd.spec
+++ b/arpd.spec
@@ -2,22 +2,24 @@ Summary:	User-space arp daemon
 Summary(pl):	Demon arpd
 Name:		arpd
 Version:	1.0.2
-Release:	4
+Release:	6
 License:	GPL
 Group:		Daemons
 Group(de):	Server
 Group(pl):	Serwery
-Source0:	%{name}-%{version}.tar.gz
+#Source0:	http://www.loran.com/~layes/arpd/%{name}-%{version}.tar.gz  (origin, but 404)
+Source0:	ftp://ftp.slackware.org:/pub/slackware/slackware-4.0/source/n/tcpip1/%{name}-%{version}.tar.gz
 Source1:	%{name}-init
 Patch0:		%{name}-%{version}.debian-patch
 Patch1:		%{name}-%{version}.pld-patch
 Patch2:		%{name}-makefile-patch
 Patch3:		%{name}-more_tables.patch
 Patch4:		%{name}-uid.patch
+#URL:		http://www.loran.com/~layes/arpd/
 Prereq:		/sbin/chkconfig
 Prereq:		rc-scripts >= 0.2.0
 Prereq:		fileutils
-Requires:	dev >= 2.8.0-3
+Requires:	dev >= 2.8.0-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,7 +29,7 @@ LARGE network segments (256+ systems per segment), because the kernel
 hash tables are not optimized to handle this situation. To use the ARP
 daemon your kernel needs to have ARPD and NETLINK support enabled. The
 standard kernels of PLD lack this support. It shouldn't be run without
-that!! This version can alocate 2048 entries.
+that! This version can alocate 2048 entries.
 
 %description -l pl
 Demon ARP przekazuje zarz±dzanie tablic± ARP (Address Resolution
@@ -36,8 +38,8 @@ u
 segment), poniewa¿ tablice w j±drze nie s± zoptymalizowane na takie
 sytuacje. Aby u¿ywaæ tego demona musisz mieæ ARPD support oraz NETLINK
 support uaktywnione w j±drze. Uwaga! Stanadardowe j±dro PLD nie ma
-supportu ARPD!!. Demon nie powinien byæ startowany bez tego!! Ta
-wersja potrafi zaakceptowaæ 2048 pozycji.
+supportu ARPD. Demon nie powinien byæ startowany bez tego! Ta wersja
+potrafi zaakceptowaæ 2048 pozycji.
 
 %prep
 %setup  -q -n %{name}-%{version}.orig
@@ -52,65 +54,35 @@ wersja potrafi zaakceptowa
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{usr/sbin,etc/rc.d/init.d,/var/lib/arpd}
+install -d $RPM_BUILD_ROOT/{usr/sbin,etc/rc.d/init.d}
 
 install arpd $RPM_BUILD_ROOT%{_sbindir}/arpd
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/arpd
 
 gzip -9nf CHANGES
 
-%pre
-if [ -n "`id -u arpd 2>/dev/null`" ]; then
-	if [ "`id -u arpd`" != "40" ]; then
-		echo "Warning: user arpd haven't uid=40. Correct this before installing arpd." 1>&2
-		exit 1
-	fi
-else
-	echo "Adding arpd user (UID=40)"
-	/usr/sbin/useradd -u 40 -r -d /var/lib/arpd -s /bin/false -c "arpd user" -g daemon arpd 1>&2
-fi
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add arpd
-if [ ! -L /dev/arpd ]; then
-	echo "Moving /dev/arpd to /var/lib/arpd/arpd and making symlink"
-	mv -f /dev/arpd /var/lib/arpd
-	chown arpd /var/lib/arpd/arpd
-	ln -s /var/lib/arpd/arpd dev/arpd
-fi
-echo "You need arpd kernel support. The standard kernels of PLD lack this support!!"
 if [ -f /var/lock/subsys/arpd ]; then
 	/etc/rc.d/init.d/arpd restart 1>&2
 else
 	echo "Run \"/etc/rc.d/init.d/arpd start\" to start arpd daemon."
 fi
 
-
 %preun
-/sbin/chkconfig --del arpd
 if [ "$1" = "0" ]; then
 	if [ -f /var/lock/subsys/arpd ]; then
 		/etc/rc.d/init.d/arpd stop 1>&2
 	fi
 	/sbin/chkconfig --del arpd
-	echo "Moving /var/lib/arpd/arpd to /dev/arpd and removing symlink"
-	rm -f /dev/arpd
-	mv -f /var/lib/arpd/arpd /dev/arpd
-	chown root:root /dev/arpd
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	echo "Removing arpd user (UID=40)"
-	/usr/sbin/userdel arpd
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc *.gz README.html
 %attr(754,root,root) %{_sbindir}/arpd
 %attr(754,root,root) /etc/rc.d/init.d/arpd
-%dir %attr(750,arpd,root) /var/lib/arpd