Hello community, here is the log from the commit of package arpwatch checked in at Thu May 17 11:20:13 CEST 2007. -------- --- arpwatch/arpwatch.changes 2006-01-25 21:34:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/arpwatch/arpwatch.changes 2007-05-14 23:01:15.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 14 22:58:55 CEST 2007 - lrupp@suse.de + +- update to 2.1a15 + + let the database files belong to the package + + build parallel + + use rpm macros for configure and make + +------------------------------------------------------------------- Old: ---- arpwatch-2.1a11.dif arpwatch-2.1a13.tar.bz2 New: ---- arpwatch-2.1a11-chrootbuild.diff arpwatch-2.1a15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch.spec ++++++ --- /var/tmp/diff_new_pack.d28025/_old 2007-05-17 11:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.d28025/_new 2007-05-17 11:19:18.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package arpwatch (Version 2.1a13) +# spec file for package arpwatch (Version 2.1a15) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,18 +13,18 @@ Name: arpwatch BuildRequires: libpcap postfix URL: http://www-nrg.ee.lbl.gov/nrg.html -License: FSR, Other License(s), see package +License: BSD License and BSD-like Group: Productivity/Networking/Diagnostic Autoreqprov: on Requires: arpwatch-ethercodes Prereq: /usr/bin/touch %insserv_prereq %fillup_prereq -Summary: Arpwatch keeps track of Ethernet and IP Address Pairings -Version: 2.1a13 -Release: 6 -Source: ftp://ftp.ee.lbl.gov/arpwatch-%{version}.tar.bz2 +Summary: Arpwatch Keeps Track of Ethernet and IP Address Pairings +Version: 2.1a15 +Release: 1 +Source: %{name}-%{version}.tar.bz2 Source10: arpwatch.init Source11: sysconfig.arpwatch -Patch0: arpwatch-2.1a11.dif +Patch0: arpwatch-2.1a11-chrootbuild.diff Patch1: arpwatch-no-source-zero.dif Patch3: arpwatch-2.1a11-tokenring.diff Patch4: arpwatch-2.1a11-hname-overflow.dif @@ -32,7 +32,7 @@ %description Arpwatch keeps track of Ethernet and IP address pairings. It logs -activity to Syslog and reports certain changes via e-mail. +activity to syslog and reports certain changes via e-mail. @@ -63,12 +63,8 @@ %patch4 -p1 -E %build -export CXXFLAGS="$CXXFLAGS -DNDEBUG $RPM_OPT_FLAGS" -./configure \ - --exec_prefix=/usr \ - --prefix=/var/lib \ - --mandir=%{_mandir} -make +%configure +%{__make} %{?_smp_mflags} %install mkdir -p \ @@ -77,23 +73,28 @@ $RPM_BUILD_ROOT/%{_datadir}/arpwatch \ $RPM_BUILD_ROOT/%{_mandir}/man8 \ $RPM_BUILD_ROOT/var/adm/fillup-templates -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall # ethercodes.dat is in the arpwatch-ethercodes package rm -f $RPM_BUILD_ROOT/%{_datadir}/arpwatch/ethercodes.dat -for file in massagevendor euppertolower.awk duplicates.awk p.awk missingcodes.txt; do +for file in massagevendor euppertolower.awk duplicates.awk p.awk; do cp -p ${file} $RPM_BUILD_ROOT/%{_datadir}/arpwatch done make DESTDIR=$RPM_BUILD_ROOT install-man install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch ln -sf ../../etc/init.d/arpwatch $RPM_BUILD_ROOT/%{_sbindir}/rcarpwatch cp -p ${RPM_SOURCE_DIR}/sysconfig.arpwatch $RPM_BUILD_ROOT/var/adm/fillup-templates +# own the database files +touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat +touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat- %preun %stop_on_removal arpwatch %post %fillup_and_insserv -test -f var/lib/arpwatch/arp.dat || touch var/lib/arpwatch/arp.dat +if [ ! -f var/lib/arpwatch/arp.dat ]; then + touch var/lib/arpwatch/arp.dat +fi %postun %restart_on_update arpwatch @@ -106,16 +107,23 @@ %{_sbindir}/arpwatch %{_sbindir}/rcarpwatch %dir /var/lib/arpwatch +%ghost %config(noreplace) /var/lib/arpwatch/arp.dat +%ghost %config(noreplace) /var/lib/arpwatch/arp.dat- /var/adm/fillup-templates/sysconfig.arpwatch %doc %{_mandir}/man8/arpsnmp.8.gz %doc %{_mandir}/man8/arpwatch.8.gz -%doc CHANGES FILES INSTALL README missingcodes.txt +%doc CHANGES FILES INSTALL README %files ethercodes-build %defattr(-,root,root) %{_datadir}/arpwatch -%changelog -n arpwatch +%changelog +* Mon May 14 2007 - lrupp@suse.de +- update to 2.1a15 + + let the database files belong to the package + + build parallel + + use rpm macros for configure and make * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Mon Apr 18 2005 - meissner@suse.de ++++++ arpwatch-2.1a11-chrootbuild.diff ++++++ --- Makefile.in +++ Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Id: Makefile.in,v 1.68 2000/06/15 00:39:54 leres Exp $ (LBL) +# @(#) $Id: Makefile.in,v 1.1 2001/01/11 00:41:05 root Exp root $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -110,13 +110,16 @@ $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil install: force - $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST) - $(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST) + $(INSTALL) -m 555 arpwatch $(DESTDIR)$(BINDEST) + $(INSTALL) -m 555 arpsnmp $(DESTDIR)$(BINDEST) + $(INSTALL) -d -m 755 $(DESTDIR)/var/lib/arpwatch + $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/arpwatch + $(INSTALL) -m 444 ethercodes.dat $(DESTDIR)/usr/share/arpwatch install-man: force - $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \ + $(INSTALL) -m 444 $(srcdir)/arpwatch.8 \ $(DESTDIR)$(MANDEST)/man8 - $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpsnmp.8 \ + $(INSTALL) -m 444 $(srcdir)/arpsnmp.8 \ $(DESTDIR)$(MANDEST)/man8 lint: $(GENSRC) force --- arpwatch.h +++ arpwatch.h @@ -1,7 +1,7 @@ -/* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */ +/* @(#) $Id: arpwatch.h,v 1.1 2001/01/11 01:08:54 root Exp root $ (LBL) */ -#define ARPFILE "arp.dat" -#define ETHERCODES "ethercodes.dat" +#define ARPFILE "/var/lib/arpwatch/arp.dat" +#define ETHERCODES "/usr/share/arpwatch/ethercodes.dat" #define CHECKPOINT (15*60) /* Checkpoint time in seconds */ #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n) ++++++ arpwatch-2.1a13.tar.bz2 -> arpwatch-2.1a15.tar.bz2 ++++++ ++++ 15540 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org