pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/honeyd honeyd: update to 1.5c, fix build with...
details: https://anonhg.NetBSD.org/pkgsrc/rev/aa07f864fc2c
branches: trunk
changeset: 450293:aa07f864fc2c
user: nia <nia%pkgsrc.org@localhost>
date: Tue Apr 13 15:42:27 2021 +0000
description:
honeyd: update to 1.5c, fix build with "new" libevent
i would post a changelog, but loading the honeyd forum fails with this:
SQL ERROR [ mysql4 ]
Table './phpbb2/phpbb3_sessions' is marked as crashed and should be repaired [145]
An sql error occurred while fetching this page. Please contact an administrator if this problem persists.
This release is from 2007.
diffstat:
security/honeyd/Makefile | 5 +-
security/honeyd/PLIST | 3 +-
security/honeyd/distinfo | 21 +++++---
security/honeyd/patches/patch-Makefile.in | 74 +++++++++++++++++++++++++++++
security/honeyd/patches/patch-aa | 62 ------------------------
security/honeyd/patches/patch-ab | 13 -----
security/honeyd/patches/patch-configure | 41 ++++++++++++++++
security/honeyd/patches/patch-configure.in | 37 ++++++++++++++
security/honeyd/patches/patch-honeydstats.c | 60 +++++++++++++++++++++++
security/honeyd/patches/patch-tagging.c | 48 ++++++++++++++++++
security/honeyd/patches/patch-tagging.h | 21 +++----
security/honeyd/patches/patch-ui.c | 52 ++++++++++++++++++++
security/honeyd/patches/patch-untagging.c | 51 +++++++++++++++++++
13 files changed, 390 insertions(+), 98 deletions(-)
diffs (truncated from 557 to 300 lines):
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/Makefile
--- a/security/honeyd/Makefile Tue Apr 13 15:20:59 2021 +0000
+++ b/security/honeyd/Makefile Tue Apr 13 15:42:27 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2020/12/04 20:45:39 nia Exp $
+# $NetBSD: Makefile,v 1.72 2021/04/13 15:42:27 nia Exp $
#
-DISTNAME= honeyd-1.5b
-PKGREVISION= 50
+DISTNAME= honeyd-1.5c
CATEGORIES= security net
MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/PLIST
--- a/security/honeyd/PLIST Tue Apr 13 15:20:59 2021 +0000
+++ b/security/honeyd/PLIST Tue Apr 13 15:42:27 2021 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:13 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/04/13 15:42:27 nia Exp $
bin/honeyd
bin/honeydctl
bin/honeydstats
+bin/hsniff
include/honeyd/debug.h
include/honeyd/hooks.h
include/honeyd/plugins.h
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/distinfo
--- a/security/honeyd/distinfo Tue Apr 13 15:20:59 2021 +0000
+++ b/security/honeyd/distinfo Tue Apr 13 15:42:27 2021 +0000
@@ -1,9 +1,14 @@
-$NetBSD: distinfo,v 1.8 2017/09/10 01:44:31 dholland Exp $
+$NetBSD: distinfo,v 1.9 2021/04/13 15:42:27 nia Exp $
-SHA1 (honeyd-1.5b.tar.gz) = a6cef01ddb0b649442ac60e2a08b226b1634e3f9
-RMD160 (honeyd-1.5b.tar.gz) = 40ebe7d3a2915b5145c5a2eef04b9d1de18fbb09
-SHA512 (honeyd-1.5b.tar.gz) = 13f32d12431afca3bbce40df86ef8830f78281736c83fafadfba3f76e7ee0069285534ee31ecd6ba45006245de5175abb2307a9e2842a22b458f7343a946efa2
-Size (honeyd-1.5b.tar.gz) = 881787 bytes
-SHA1 (patch-aa) = b69d986bd1a5c1847f4f5467216730da020c8686
-SHA1 (patch-ab) = 6f789cae31cc9b38ae68c2d9250dcab67e1a0146
-SHA1 (patch-tagging.h) = 69c19ce9948594010a2db3701453c5ff5d085577
+SHA1 (honeyd-1.5c.tar.gz) = 342cc53e8d23c84ecb91c7b66c6e93e7ed2a992a
+RMD160 (honeyd-1.5c.tar.gz) = 2316c4fb6b74b0ece4429d392c478fcd7516b6a7
+SHA512 (honeyd-1.5c.tar.gz) = b359d915957528f24f043510ea528e1b581c4badccb04e6ad6fc5b1811fb710fa908695dbb8e35089c002b89fd2a31ce1b2c4f491cb926185901198959c70d16
+Size (honeyd-1.5c.tar.gz) = 915465 bytes
+SHA1 (patch-Makefile.in) = 760dc52d634218c10f9c5a136b1f6cc6989f2f98
+SHA1 (patch-configure) = 4528b172fb712b16f831a20d572b8439c3d4aee4
+SHA1 (patch-configure.in) = 94614c411372bf57cba29adb41385651b66efacd
+SHA1 (patch-honeydstats.c) = d6428554d195f743bd469bc0dc89dd512ecc15c2
+SHA1 (patch-tagging.c) = f231b671269696c565da23e00f493b2314197a40
+SHA1 (patch-tagging.h) = e3e180f483960830744ae06da67e3dd53601ada0
+SHA1 (patch-ui.c) = 971c36b35ac66a09a5e59ff8b2e11b4e496b8a45
+SHA1 (patch-untagging.c) = fbbaa1f971f2d82aaf603505bdc6c5a6b663d078
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/honeyd/patches/patch-Makefile.in Tue Apr 13 15:42:27 2021 +0000
@@ -0,0 +1,74 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/04/13 15:42:27 nia Exp $
+
+- Install example configs to share/examples
+- Don't force optimization flags
+
+--- Makefile.in.orig 2007-05-28 06:15:43.000000000 +0000
++++ Makefile.in
+@@ -182,7 +182,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -O2 -Wall -g \
++CFLAGS += -Wall \
+ -DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" \
+ -DPATH_HONEYDDATA="\"$(honeyddatadir)\"" \
+ -DPATH_HONEYDLIB="\"$(honeydlibdir)\"" \
+@@ -344,10 +344,10 @@ libhoneyddir = $(libdir)/honeyd
+ libhoneyd_DATA = libhoneyd.so
+
+ # Configuration files for Honeyd
+-honeyddatadir = $(datadir)/honeyd
++honeyddatadir = $(datadir)/examples/honeyd
+ honeydlibdir = $(libdir)/honeyd
+ honeydincludedir = $(includedir)/honeyd
+-honeyddata_DATA = README nmap.assoc xprobe2.conf nmap.prints config.sample \
++honeyddata_DATA = nmap.assoc xprobe2.conf nmap.prints config.sample \
+ config.ethernet pf.os
+
+ honeydplugins = @PLUGINS@
+@@ -387,7 +387,7 @@ honeydstats_LDADD = @LIBOBJS@ @DNETLIB@
+ honeydstats_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ @EVENTINC@ @DNETINC@ @ZINC@
+
+-honeydstats_CFLAGS = -O0 -Wall
++honeydstats_CFLAGS = -Wall
+
+ #
+ # Honeyd stats sniffer
+@@ -400,7 +400,7 @@ hsniff_LDADD = @LIBOBJS@ @PCAPLIB@ @DNET
+ hsniff_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
+
+-hsniff_CFLAGS = -O2 -Wall -DPATH_HONEYDDATA="\"$(honeyddatadir)\""
++hsniff_CFLAGS = -Wall -DPATH_HONEYDDATA="\"$(honeyddatadir)\""
+
+ #
+ # Honeyd control application
+@@ -408,7 +408,7 @@ hsniff_CFLAGS = -O2 -Wall -DPATH_HONEYDD
+ honeydctl_SOURCES = honeydctl.c
+ honeydctl_LDADD = @LIBOBJS@ @EDITLIB@ @LIBCURSES@
+ honeydctl_CPPFLAGS = @EDITINC@
+-honeydctl_CFLAGS = -O2 -Wall
++honeydctl_CFLAGS = -Wall
+ INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ @PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
+
+@@ -423,7 +423,7 @@ smtp_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETL
+ smtp_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ @EVENTINC@ @DNETINC@ @PCREINC@
+
+-smtp_CFLAGS = -O2 -Wall
++smtp_CFLAGS = -Wall
+ proxy_SOURCES = subsystems/proxy.c subsystems/proxy.h subsystems/proxy_main.c \
+ subsystems/proxy_messages.h subsystems/smtp.c subsystems/smtp.h \
+ subsystems/smtp_messages.h atomicio.c \
+@@ -433,7 +433,7 @@ proxy_LDADD = @LIBOBJS@ @EVENTLIB@ @DNET
+ proxy_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ @EVENTINC@ @DNETINC@ @PCREINC@
+
+-proxy_CFLAGS = -O2 -Wall
++proxy_CFLAGS = -Wall
+
+ ########################################################################
+ ########################################################################
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/patches/patch-aa
--- a/security/honeyd/patches/patch-aa Tue Apr 13 15:20:59 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/02/19 17:23:18 adrianp Exp $
-
---- Makefile.in.orig 2006-02-12 02:11:06.000000000 +0000
-+++ Makefile.in
-@@ -169,7 +169,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -O2 -Wall -g \
-+CFLAGS += \
- -DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" \
- -DPATH_HONEYDDATA="\"$(honeyddatadir)\"" \
- -DPATH_HONEYDLIB="\"$(honeydlibdir)\"" \
-@@ -321,10 +321,10 @@ libhoneyddir = $(libdir)/honeyd
- libhoneyd_DATA = libhoneyd.so
-
- # Configuration files for Honeyd
--honeyddatadir = $(datadir)/honeyd
-+honeyddatadir = $(datadir)/examples/honeyd
- honeydlibdir = $(libdir)/honeyd
- honeydincludedir = $(includedir)/honeyd
--honeyddata_DATA = README nmap.assoc xprobe2.conf nmap.prints config.sample \
-+honeyddata_DATA = nmap.assoc xprobe2.conf nmap.prints config.sample \
- config.ethernet pf.os
-
- honeydplugins = @PLUGINS@
-@@ -364,7 +364,7 @@ honeydstats_LDADD = @LIBOBJS@ @DNETLIB@
- honeydstats_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
- @EVENTINC@ @DNETINC@ @ZINC@ @DNSRESINC@
-
--honeydstats_CFLAGS = -O0 -Wall
-+honeydstats_CFLAGS =
-
- #
- # Honeyd control application
-@@ -372,7 +372,7 @@ honeydstats_CFLAGS = -O0 -Wall
- honeydctl_SOURCES = honeydctl.c
- honeydctl_LDADD = @LIBOBJS@ @EDITLIB@ @LIBCURSES@
- honeydctl_CPPFLAGS = @EDITINC@
--honeydctl_CFLAGS = -O2 -Wall
-+honeydctl_CFLAGS =
- INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
- @PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
-
-@@ -387,7 +387,7 @@ smtp_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETL
- smtp_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
- @EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
-
--smtp_CFLAGS = -O2 -Wall
-+smtp_CFLAGS =
- proxy_SOURCES = subsystems/proxy.c subsystems/proxy.h subsystems/proxy_main.c \
- subsystems/proxy_messages.h subsystems/smtp.c subsystems/smtp.h \
- subsystems/smtp_messages.h atomicio.c \
-@@ -397,7 +397,7 @@ proxy_LDADD = @LIBOBJS@ @EVENTLIB@ @DNET
- proxy_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
- @EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
-
--proxy_CFLAGS = -O2 -Wall
-+proxy_CFLAGS =
-
- ########################################################################
- ########################################################################
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/patches/patch-ab
--- a/security/honeyd/patches/patch-ab Tue Apr 13 15:20:59 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/10/05 11:15:41 rillig Exp $
-
---- configure.orig 2006-10-05 13:12:24.000000000 +0200
-+++ configure 2006-10-05 13:13:08.000000000 +0200
-@@ -21853,7 +21853,7 @@ fi
-
- if test x"$PATH_PYTHON" != x -a x"$DO_PYTHON" = xdefine ; then
- pv_gv=`$PATH_PYTHON -c 'import sys; print sys.version[:3] > "2.3.0"'`
-- if test "$pv_gv" == "False" ; then
-+ if test "$pv_gv" = "False" ; then
- # Extract the first word of "python2.4", so it can be a program name with args.
- set dummy python2.4; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/honeyd/patches/patch-configure Tue Apr 13 15:42:27 2021 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-configure,v 1.1 2021/04/13 15:42:27 nia Exp $
+
+Shell portability.
+
+--- configure.orig 2007-05-28 06:15:44.000000000 +0000
++++ configure
+@@ -19855,14 +19855,14 @@ libevent, we can only use select on pcap
+ disable_poll=yes
+ esac
+
+-if test x"$disable_kqueue" == x"yes"; then
++if test x"$disable_kqueue" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define DISABLE_KQUEUE 1
+ _ACEOF
+
+ fi
+-if test x"$disable_poll" == x"yes"; then
++if test x"$disable_poll" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define DISABLE_POLL 1
+@@ -21408,7 +21408,7 @@ if test $ac_cv_lib_pcap_pcap_get_selecta
+ have_pcap_get_selectable_fd="yes"
+ fi
+
+-if test x"$have_pcap_get_selectable_fd" == x"yes"; then
++if test x"$have_pcap_get_selectable_fd" = x"yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PCAP_GET_SELECTABLE_FD 1
+@@ -22355,7 +22355,7 @@ fi
+
+ if test x"$PATH_PYTHON" != x -a x"$DO_PYTHON" = xdefine ; then
+ pv_gv=`$PATH_PYTHON -c 'import sys; print sys.version[:3] > "2.3.0"'`
+- if test "$pv_gv" == "False" ; then
++ if test "$pv_gv" = "False" ; then
+ # Extract the first word of "python2.4", so it can be a program name with args.
+ set dummy python2.4; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
diff -r ad7e108dc7f5 -r aa07f864fc2c security/honeyd/patches/patch-configure.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/honeyd/patches/patch-configure.in Tue Apr 13 15:42:27 2021 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure.in,v 1.1 2021/04/13 15:42:27 nia Exp $
+
+Shell portability.
+
+--- configure.in.orig 2007-05-28 06:08:34.000000000 +0000
++++ configure.in
+@@ -27,10 +27,10 @@ libevent, we can only use select on pcap
+ disable_poll=yes
+ esac
+
+-if test x"$disable_kqueue" == x"yes"; then
++if test x"$disable_kqueue" = x"yes"; then
+ AC_DEFINE(DISABLE_KQUEUE, 1, [Define kqueue should be disabled for libevent])
+ fi
+-if test x"$disable_poll" == x"yes"; then
++if test x"$disable_poll" = x"yes"; then
+ AC_DEFINE(DISABLE_POLL, 1, [Define poll should be disabled for libevent])
+ fi
+
+@@ -88,7 +88,7 @@ CLFAGS=$PCAPINC
+ have_pcap_get_selectable_fd="no"
+ AC_CHECK_LIB([pcap], [pcap_get_selectable_fd],
+ [have_pcap_get_selectable_fd="yes"],,)
+-if test x"$have_pcap_get_selectable_fd" == x"yes"; then
++if test x"$have_pcap_get_selectable_fd" = x"yes"; then
+ AC_DEFINE(HAVE_PCAP_GET_SELECTABLE_FD, 1,
+ [Define if libpcap has pcap_get_selectable_fd])
+ fi
+@@ -374,7 +374,7 @@ AC_ARG_WITH(python,
+ AC_PATH_PROG(PATH_PYTHON, python)
+ if test x"$PATH_PYTHON" != x -a x"$DO_PYTHON" = xdefine ; then
+ pv_gv=`$PATH_PYTHON -c 'import sys; print sys.version[[:3]] > "2.3.0"'`
+- if test "$pv_gv" == "False" ; then
++ if test "$pv_gv" = "False" ; then
+ AC_PATH_PROG(PATH_PYTHON24, python2.4)
+ if test x"$PATH_PYTHON24" != x ; then
+ PATH_PYTHON=$PATH_PYTHON24
Home |
Main Index |
Thread Index |
Old Index