From bba6091788f634a1cc068ff1255b7592f993d363 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 9 May 2021 14:47:54 +0200 Subject: [PATCH] - rel 6; update patches from debian --- ac264.patch | 93 ----------------------------------------- arpwatch-makefile.patch | 42 ------------------- arpwatch-opt.patch | 2 +- arpwatch.spec | 16 ++++--- 4 files changed, 8 insertions(+), 145 deletions(-) delete mode 100644 ac264.patch delete mode 100644 arpwatch-makefile.patch diff --git a/ac264.patch b/ac264.patch deleted file mode 100644 index 155568d..0000000 --- a/ac264.patch +++ /dev/null @@ -1,93 +0,0 @@ -based on http://github.com/mcr/libpcap/commit/d1a3a92fab103210ab5f61780a731bce9a8909b5 -diff -urNp -x '*.orig' arpwatch-2.1a15.org/aclocal.m4 arpwatch-2.1a15/aclocal.m4 ---- arpwatch-2.1a15.org/aclocal.m4 2021-05-09 14:37:46.275738586 +0200 -+++ arpwatch-2.1a15/aclocal.m4 2021-05-09 14:37:46.332408198 +0200 -@@ -23,29 +23,22 @@ dnl LBL autoconf macros - dnl - - dnl --dnl Determine which compiler we're using (cc or gcc) --dnl If using gcc, determine the version number --dnl If using cc, require that it support ansi prototypes --dnl If using gcc, use -O2 (otherwise use -O) --dnl If using cc, explicitly specify /usr/local/include --dnl --dnl usage: --dnl -+dnl Do whatever AC_LBL_C_INIT work is necessary before using AC_PROG_CC. - dnl AC_LBL_C_INIT(copt, incls) - dnl --dnl results: -+dnl It appears that newer versions of autoconf (2.64 and later) will, -+dnl if you use AC_TRY_COMPILE in a macro, stick AC_PROG_CC at the -+dnl beginning of the macro, even if the macro itself calls AC_PROG_CC. -+dnl See section 20.8 "Expanded Before Required" in the Autoconf -+dnl documentation. -+dnl -+dnl This causes a steaming heap of fail in our case, as we were, in -+dnl AC_LBL_C_INIT, doing the tests we now do in AC_LBL_C_PREPARE, -+dnl calling AC_PROG_CC, and then doing the tests we now do in -+dnl AC_LBL_C_INIT. - dnl --dnl $1 (copt set) --dnl $2 (incls set) --dnl CC --dnl LDFLAGS --dnl LBL_CFLAGS --dnl --AC_DEFUN(AC_LBL_C_INIT, -- [AC_PREREQ(2.12) -- AC_BEFORE([$0], [AC_PROG_CC]) -- AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) -- AC_BEFORE([$0], [AC_LBL_DEVEL]) -+AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, -+[ - AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) - $2="" - if test "${srcdir}" != "." ; then -@@ -70,7 +63,32 @@ AC_DEFUN(AC_LBL_C_INIT, - CC=cc - export CC - fi -- AC_PROG_CC -+]) -+ -+dnl -+dnl Determine which compiler we're using (cc or gcc) -+dnl If using gcc, determine the version number -+dnl If using cc, require that it support ansi prototypes -+dnl If using gcc, use -O2 (otherwise use -O) -+dnl If using cc, explicitly specify /usr/local/include -+dnl -+dnl usage: -+dnl -+dnl AC_LBL_C_INIT(copt, incls) -+dnl -+dnl results: -+dnl -+dnl $1 (copt set) -+dnl $2 (incls set) -+dnl CC -+dnl LDFLAGS -+dnl ac_cv_lbl_gcc_vers -+dnl LBL_CFLAGS -+dnl -+AC_DEFUN(AC_LBL_C_INIT, -+ [AC_PREREQ(2.50) -+ AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) -+ AC_BEFORE([$0], [AC_LBL_DEVEL]) - if test "$GCC" != yes ; then - AC_MSG_CHECKING(that $CC handles ansi prototypes) - AC_CACHE_VAL(ac_cv_lbl_cc_ansi_prototypes, -diff -urNp -x '*.orig' arpwatch-2.1a15.org/configure.in arpwatch-2.1a15/configure.in ---- arpwatch-2.1a15.org/configure.in 2006-06-21 22:34:29.000000000 +0200 -+++ arpwatch-2.1a15/configure.in 2021-05-09 14:37:46.332408198 +0200 -@@ -16,6 +16,8 @@ if test -z "$PWD" ; then - PWD=`pwd` - fi - -+AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) -+AC_PROG_CC - AC_LBL_C_INIT(V_CCOPT, V_INCLS) - - AC_CHECK_HEADERS(fcntl.h memory.h) diff --git a/arpwatch-makefile.patch b/arpwatch-makefile.patch deleted file mode 100644 index a5ba8dc..0000000 --- a/arpwatch-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urNp -x '*.orig' arpwatch-2.1a15.org/Makefile.in arpwatch-2.1a15/Makefile.in ---- arpwatch-2.1a15.org/Makefile.in 2021-05-09 14:42:25.080236575 +0200 -+++ arpwatch-2.1a15/Makefile.in 2021-05-09 14:42:25.160240737 +0200 -@@ -45,7 +45,7 @@ VPATH = @srcdir@ - CC = @CC@ - PROG = arpwatch - CCOPT = @V_CCOPT@ --INCLS = -I. @V_INCLS@ -+INCLS = -I. @V_INCLS@ -I/usr/include/pcap - DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \ - -DETHERCODES=\"$(ETHERCODES)\" - -@@ -113,13 +113,13 @@ zap: zap.o intoa.o - $(CC) $(CFLAGS) $(LDFLAGS) -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) -s arpwatch $(DESTDIR)$(BINDEST) -+ $(INSTALL) -s arpsnmp $(DESTDIR)$(BINDEST) - - install-man: force -- $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \ -+ $(INSTALL) $(srcdir)/arpwatch.8 \ - $(DESTDIR)$(MANDEST)/man8 -- $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpsnmp.8 \ -+ $(INSTALL) $(srcdir)/arpsnmp.8 \ - $(DESTDIR)$(MANDEST)/man8 - - lint: $(GENSRC) force -diff -urNp -x '*.orig' arpwatch-2.1a15.org/configure.in arpwatch-2.1a15/configure.in ---- arpwatch-2.1a15.org/configure.in 2021-05-09 14:42:25.090237095 +0200 -+++ arpwatch-2.1a15/configure.in 2021-05-09 14:42:25.160240737 +0200 -@@ -49,7 +49,7 @@ osf3*) - ;; - esac - --AC_LBL_CHECK_TYPE -+dnl AC_LBL_CHECK_TYPE - - AC_LBL_DEVEL(V_CCOPT) - diff --git a/arpwatch-opt.patch b/arpwatch-opt.patch index 33596eb..65a0b60 100644 --- a/arpwatch-opt.patch +++ b/arpwatch-opt.patch @@ -8,4 +8,4 @@ diff -urN arpwatch-2.1a10.org/aclocal.m4 arpwatch-2.1a10/aclocal.m4 - $1="-O" $2="" if test "${srcdir}" != "." ; then - $2="-I\$\(srcdir\)" + $2="-I\$(srcdir)" diff --git a/arpwatch.spec b/arpwatch.spec index d77037b..f2400c5 100644 --- a/arpwatch.spec +++ b/arpwatch.spec @@ -4,7 +4,7 @@ Summary(ru.UTF-8): Инструмент для отслеживания IP ад Summary(uk.UTF-8): Інструмент для відслідковування IP адрес в локальній мережі Name: arpwatch Version: 2.1a15 -Release: 5 +Release: 6 Epoch: 2 License: GPL Group: Networking/Daemons @@ -14,11 +14,9 @@ Source1: %{name}.init Source2: %{name}.sysconfig Source3: dmassagevendor Source4: dmassagevendor.8 +Source5: https://ftp.debian.org/debian/pool/main/a/arpwatch/arpwatch_2.1a15-8.debian.tar.xz +# Source5-md5: 5e1a6414ae8cb98af3e0691be062a3d5 Patch0: %{name}-opt.patch -Patch1: http://ftp.debian.org/debian/pool/main/a/arpwatch/arpwatch_2.1a15-1.2.diff.gz -# Patch1-md5: ea6ac9531289f04219349d0faca7cde5 -Patch2: ac264.patch -Patch3: %{name}-makefile.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libpcap-devel @@ -48,11 +46,11 @@ Dodatkowo tworzona jest baza par adresów ethernet/IP. допомогою e-mail. %prep -%setup -q +%setup -q -a5 +for p in $(cat debian/patches/series); do + patch -p1 < "debian/patches/$p" || exit 1 +done %patch0 -p1 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 %build cp -f /usr/share/automake/config.sub . -- 2.43.0