OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Mar-2006 15:59:52
Branch: HEAD Handle: 2006031014595100
Modified files:
openpkg-src/honeyd honeyd.patch honeyd.spec
Log:
upgrading package: honeyd 1.0 -> 1.5a
Summary:
Revision Changes Path
1.16 +83 -92 openpkg-src/honeyd/honeyd.patch
1.59 +37 -10 openpkg-src/honeyd/honeyd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 7 Jan 2005 13:07:30 -0000 1.15
+++ openpkg-src/honeyd/honeyd.patch 10 Mar 2006 14:59:51 -0000 1.16
@@ -1,22 +1,26 @@
Index: Makefile.in
---- Makefile.in.orig 2004-12-31 20:13:47 +0100
-+++ Makefile.in 2005-01-06 10:37:07 +0100
-@@ -659,7 +659,7 @@
- -rpath $(libdir)/honeyd $(LIBHONEYDFILES) $(LIBS) $(LDFLAGS) \
- -module -avoid-version -nostdlib @LIBDL@
- rm -f [EMAIL PROTECTED] [EMAIL PROTECTED] $@
-- cp .libs/[EMAIL PROTECTED] $@ || cp .libs/libtmp$@ $@
-+ cp .libs/[EMAIL PROTECTED] $@ || cp .libs/libtmp$@ $@
- rm -f .libs/[EMAIL PROTECTED]
+--- Makefile.in.orig 2006-03-01 07:34:47 +0100
++++ Makefile.in 2006-03-01 14:19:35 +0100
+@@ -1318,9 +1318,9 @@
install-data-local:
+ (cd $(top_srcdir) && tar -cf - $(top_srcdir)/webserver) | \
+- (cd $(honeyddatadir) && tar -xf -)
+- find $(honeyddatadir)/webserver -type f | xargs chmod a+r
+- find $(honeyddatadir)/webserver -type d | xargs chmod a+xr
++ (cd $(DESTDIR)$(honeyddatadir) && tar -xf -)
++ find $(DESTDIR)$(honeyddatadir)/webserver -type f | xargs chmod a+r
++ find $(DESTDIR)$(honeyddatadir)/webserver -type d | xargs chmod a+xr
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: command.c
---- command.c.orig 2004-12-31 20:13:37 +0100
-+++ command.c 2005-01-06 10:37:07 +0100
-@@ -69,6 +69,9 @@
- #include "fdpass.h"
- #include "osfp.h"
+--- command.c.orig 2005-09-22 05:34:04 +0200
++++ command.c 2006-03-01 14:20:03 +0100
+@@ -47,6 +47,9 @@
#include "pyextend.h"
+ #include "honeyd_overload.h"
+ #include "util.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
@@ -24,8 +28,8 @@
ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
Index: compat/getopt.h
---- compat/getopt.h.orig 2004-12-31 20:13:36 +0100
-+++ compat/getopt.h 2005-01-06 10:37:07 +0100
+--- compat/getopt.h.orig 2003-05-31 17:56:25 +0200
++++ compat/getopt.h 2006-03-01 07:34:47 +0100
@@ -40,7 +40,11 @@
#ifndef _GETOPT_H_
#define _GETOPT_H_
@@ -39,8 +43,8 @@
/*
* GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
Index: compat/sha1.h
---- compat/sha1.h.orig 2004-12-31 20:13:36.000000000 +0100
-+++ compat/sha1.h 2005-01-07 13:53:01.066282520 +0100
+--- compat/sha1.h.orig 2004-04-25 05:54:23 +0200
++++ compat/sha1.h 2006-03-01 07:34:47 +0100
@@ -15,7 +15,11 @@
unsigned char buffer[64];
} SHA1_CTX;
@@ -54,10 +58,10 @@
__BEGIN_DECLS
void SHA1Transform(u_int32_t [5], const unsigned char [64])
Index: config.h.in
---- config.h.in.orig 2004-12-06 04:17:14 +0100
-+++ config.h.in 2005-01-06 10:37:07 +0100
-@@ -210,6 +210,9 @@
- /* Define if you have the `strtoul' function. */
+--- config.h.in.orig 2006-02-19 23:39:06 +0100
++++ config.h.in 2006-03-01 14:20:27 +0100
+@@ -222,6 +222,9 @@
+ /* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
+/* Define to 1 if you have the `setenv' function. */
@@ -66,54 +70,71 @@
/* Define if your system defines struct sockaddr_storage */
#undef HAVE_STRUCT_SOCKADDR_STORAGE
-@@ -240,6 +243,9 @@
- /* Define if you have the <sys/types.h> header file. */
+@@ -255,6 +258,9 @@
+ /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
+#undef HAVE_SYS_CDEFS_H
+
- /* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
+ /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
Index: configure
---- configure.orig 2004-12-31 20:13:48 +0100
-+++ configure 2005-01-06 10:37:40 +0100
-@@ -4631,7 +4631,7 @@
+--- configure.orig 2006-02-19 23:38:31 +0100
++++ configure 2006-03-01 14:21:13 +0100
+@@ -22332,7 +22332,7 @@
- fi
--for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h
sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h
assert.h
-+for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h
sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h syslog.h unistd.h
assert.h sys/cdefs.h
+
+-for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h
sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/file.h
syslog.h unistd.h assert.h
++for ac_header in stdarg.h errno.h fcntl.h paths.h stdlib.h string.h time.h
sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/ioccom.h sys/file.h
syslog.h unistd.h assert.h sys/cdefs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:4637: checking for $ac_header" >&5
-@@ -5593,7 +5593,7 @@
- fi
- done
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -23485,7 +23485,7 @@
+
+
--for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr
strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo
setgroups sendmsg recvmsg setregid setruid
-+for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr
strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo
setgroups sendmsg recvmsg setregid setruid setenv
+-for ac_func in asprintf dup2 fgetln gettimeofday memmove memset strcasecmp
strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo
setgroups sendmsg recvmsg setregid setruid kqueue
++for ac_func in asprintf dup2 fgetln gettimeofday memmove memset strcasecmp
strchr strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo
setgroups sendmsg recvmsg setregid setruid setenv kqueue
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:5599: checking for $ac_func" >&5
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+Index: dhcpclient.c
+--- dhcpclient.c.orig 2005-09-22 05:17:47 +0200
++++ dhcpclient.c 2006-03-01 07:34:47 +0100
+@@ -69,6 +69,13 @@
+
+ #define NTRIES 10
+
++#ifndef MIN
++# define MIN(a,b) (((a) < (b)) ? (a) : (b))
++#endif /* MIN */
++#ifndef MAX
++# define MAX(a,b) (((a) > (b)) ? (a) : (b))
++#endif /* MAX */
++
+ static int _pack_request(struct dhcpclient_req *, void *, size_t *);
+ static int _pack_release(struct dhcpclient_req *, void *, size_t *);
+ static int _bcast(struct template *,
Index: honeyd.c
---- honeyd.c.orig 2004-12-31 20:13:37 +0100
-+++ honeyd.c 2005-01-06 10:38:13 +0100
-@@ -98,6 +98,9 @@
- #include "rrdtool.h"
+--- honeyd.c.orig 2006-02-19 23:35:25 +0100
++++ honeyd.c 2006-03-01 14:21:32 +0100
+@@ -76,6 +76,9 @@
#include "histogram.h"
#include "update.h"
+ #include "util.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
#ifdef HAVE_PYTHON
- #include "pyextend.h"
+ #include <Python.h>
Index: honeyd_overload.c
---- honeyd_overload.c.orig 2004-12-31 20:13:44 +0100
-+++ honeyd_overload.c 2005-01-06 10:37:07 +0100
-@@ -252,7 +252,7 @@
+--- honeyd_overload.c.orig 2006-02-19 23:35:25 +0100
++++ honeyd_overload.c 2006-03-01 14:22:11 +0100
+@@ -270,7 +270,7 @@
struct fd *nfd;
int pair[2];
@@ -122,7 +143,7 @@
warn("%s: socketpair", __func__);
return (NULL);
}
-@@ -530,7 +530,7 @@
+@@ -600,7 +600,7 @@
}
/* Get another socketpair */
@@ -131,7 +152,7 @@
DPRINTF((stderr, "%s: socketpair failed", __func__));
errno = ETIMEDOUT; /* XXX */
return (-1);
-@@ -637,6 +637,7 @@
+@@ -707,6 +707,7 @@
}
#endif /* !__FreeBSD__ */
@@ -139,7 +160,7 @@
ssize_t
recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *from,
socklen_t *fromlen)
-@@ -664,6 +665,7 @@
+@@ -734,6 +735,7 @@
out:
return (ret);
}
@@ -147,7 +168,7 @@
ssize_t
sendto(int sock, const void *buf, size_t len, int flags,
-@@ -688,6 +690,7 @@
+@@ -770,6 +772,7 @@
return (ret);
}
@@ -155,15 +176,15 @@
int
getsockname(int sock, struct sockaddr *to, socklen_t *tolen)
{
-@@ -713,6 +716,7 @@
+@@ -807,6 +810,7 @@
return (0);
}
+#endif /* !sun */
ssize_t
- sendmsg(int sock, const struct msghdr *msg, int flags)
-@@ -805,6 +809,7 @@
+ recvmsg(int sock, struct msghdr *msg, int flags)
+@@ -1095,6 +1099,7 @@
return (ret);
}
@@ -171,15 +192,18 @@
int
accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
{
-@@ -843,3 +848,4 @@
+@@ -1144,6 +1149,7 @@
return (fd);
}
+#endif /* !sun */
+
+ #if 0
+
Index: personality.c
---- personality.c.orig 2004-12-31 20:13:38 +0100
-+++ personality.c 2005-01-06 10:37:07 +0100
-@@ -32,6 +32,9 @@
+--- personality.c.orig 2004-12-10 04:09:22 +0100
++++ personality.c 2006-03-01 07:34:47 +0100
+@@ -7,6 +7,9 @@
#include <sys/param.h>
#include <sys/types.h>
@@ -190,8 +214,8 @@
#include "config.h"
Index: pf_osfp.c
---- pf_osfp.c.orig 2004-12-31 20:13:43 +0100
-+++ pf_osfp.c 2005-01-06 10:37:07 +0100
+--- pf_osfp.c.orig 2003-11-23 05:52:31 +0100
++++ pf_osfp.c 2006-03-01 07:34:47 +0100
@@ -50,6 +50,10 @@
# define DPFPRINTF(format, x...) ((void)0)
# endif /* PFDEBUG */
@@ -203,36 +227,3 @@
SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list;
pool_t pf_osfp_entry_pl;
pool_t pf_osfp_pl;
-Index: Makefile.in
---- Makefile.in.orig 2005-01-06 10:38:41 +0100
-+++ Makefile.in 2005-01-06 10:40:54 +0100
-@@ -664,9 +664,9 @@
-
- install-data-local:
- (cd $(top_srcdir) && tar -cf - $(top_srcdir)/webserver) | \
-- (cd $(honeyddatadir) && tar -xf -)
-- find $(honeyddatadir)/webserver -type f | xargs chmod a+r
-- find $(honeyddatadir)/webserver -type d | xargs chmod a+xr
-+ (cd $(DESTDIR)$(honeyddatadir) && tar -xf -)
-+ find $(DESTDIR)$(honeyddatadir)/webserver -type f | xargs chmod a+r
-+ find $(DESTDIR)$(honeyddatadir)/webserver -type d | xargs chmod a+xr
-
- dist-hook:
- ./distribute.py $(distdir)/
-Index: dhcpclient.c
---- dhcpclient.c.orig 2005-01-07 13:06:46.552453044 +0100
-+++ dhcpclient.c 2005-01-07 13:06:48.391812793 +0100
-@@ -94,6 +94,13 @@
-
- #define NTRIES 10
-
-+#ifndef MIN
-+# define MIN(a,b) (((a) < (b)) ? (a) : (b))
-+#endif /* MIN */
-+#ifndef MAX
-+# define MAX(a,b) (((a) > (b)) ? (a) : (b))
-+#endif /* MAX */
-+
- static int _pack_request(struct dhcpclient_req *, void *, size_t *);
- static int _pack_release(struct dhcpclient_req *, void *, size_t *);
- static int _bcast(struct template *,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 1 Jan 2006 13:14:31 -0000 1.58
+++ openpkg-src/honeyd/honeyd.spec 10 Mar 2006 14:59:51 -0000 1.59
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_honeyd 1.5a
+%define V_libdnsres 0.1a
+
# package information
Name: honeyd
Summary: Creates a Virtual Host on Network
@@ -32,15 +36,15 @@
Class: EVAL
Group: Security
License: BSD
-Version: 1.0
-Release: 20050729
+Version: %{V_honeyd}
+Release: 20060310
# package options
%option with_fsl yes
%option with_gui no
# list of sources
-Source0: http://niels.xtdnet.nl/honeyd/honeyd-%{version}.tar.gz
+Source0:
http://www.citi.umich.edu/u/provos/honeyd/honeyd-%{V_honeyd}.tar.gz
Source1: http://www.citi.umich.edu/u/provos/honeyd/contrib/mael/ftp.sh
Source2: http://www.citi.umich.edu/u/provos/honeyd/contrib/mael/pop3.sh
Source3: http://www.citi.umich.edu/u/provos/honeyd/contrib/mael/smtp.sh
@@ -57,13 +61,16 @@
Source14: setenv.c
Source15: vasprintf.c
Source16: vasprintf.h
+Source17: http://www.monkey.org/~provos/libdnsres-%{V_libdnsres}.tar.gz
Patch0: honeyd.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, libdnet, libpcap, libevent,
libedit, make
-PreReq: OpenPKG, openpkg >= 20040130, libdnet, libpcap, libevent,
libedit
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: libdnet, libpcap, libevent, libedit, zlib, pcre
+PreReq: libdnet, libpcap, libevent, libedit, zlib, pcre
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -88,14 +95,20 @@
requirement for this package.
%track
- prog honeyd = {
- version = %{version}
+ prog honeyd:honeyd = {
+ version = %{V_honeyd}
url = http://www.citi.umich.edu/u/provos/honeyd/
regex = honeyd-(__VER__)\.tar\.gz
}
+ prog honeyd:libdnsres = {
+ version = %{V_libdnsres}
+ url = http://www.monkey.org/~provos/libdnsres/
+ regex = libdnres-(__VER__)\.tar\.gz
+ }
%prep
%setup -q
+ %setup -q -D -T -a 17
%patch -p0
%{l_shtool} subst \
-e 's;AF_LOCAL;AF_UNIX;' \
@@ -129,15 +142,28 @@
esac
%build
+ ( cd libdnsres-%{V_libdnsres}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ ./configure \
+ --with-libevent=%{l_prefix} \
+ --disable-shared
+ %{l_make} %{l_mflags}
+ ln .libs/libdnsres.a .
+ ) || exit $?
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags} -DREPLACE_GETOPT" \
LDFLAGS="%{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
./configure \
- --disable-shared \
- --without-python \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --with-libevent=%{l_prefix} \
+ --with-libdnet=%{l_prefix} \
+ --with-libdnsres=`pwd`/libdnsres-%{V_libdnsres} \
+ --with-libpcre=%{l_prefix} \
+ --without-python
%{l_make} %{l_mflags}
%install
@@ -193,6 +219,7 @@
# remove unwanted files
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/honeyd
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/honeyd/README
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/honeyd/config.sample
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
