OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jan-2005 10:50:15
Branch: HEAD Handle: 2005010609501400
Modified files:
openpkg-src/honeyd honeyd.patch honeyd.spec
Log:
upgrading package: honeyd 0.8b -> 1.0
Summary:
Revision Changes Path
1.14 +55 -39 openpkg-src/honeyd/honeyd.patch
1.54 +2 -2 openpkg-src/honeyd/honeyd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 25 Jun 2004 15:16:20 -0000 1.13
+++ openpkg-src/honeyd/honeyd.patch 6 Jan 2005 09:50:14 -0000 1.14
@@ -1,9 +1,21 @@
+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]
+
+ install-data-local:
Index: command.c
---- command.c.orig 2004-04-15 05:29:22.000000000 +0200
-+++ command.c 2004-04-15 08:46:29.000000000 +0200
-@@ -68,6 +68,9 @@
- #include "udp.h"
+--- 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"
#include "pyextend.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
@@ -12,8 +24,8 @@
ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
Index: compat/getopt.h
---- compat/getopt.h.orig 2004-04-15 05:29:22.000000000 +0200
-+++ compat/getopt.h 2004-04-15 08:46:29.000000000 +0200
+--- compat/getopt.h.orig 2004-12-31 20:13:36 +0100
++++ compat/getopt.h 2005-01-06 10:37:07 +0100
@@ -40,7 +40,11 @@
#ifndef _GETOPT_H_
#define _GETOPT_H_
@@ -27,9 +39,9 @@
/*
* GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions
Index: config.h.in
---- config.h.in.orig 2004-02-04 08:03:04.000000000 +0100
-+++ config.h.in 2004-04-15 08:46:29.000000000 +0200
-@@ -198,6 +198,9 @@
+--- 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. */
#undef HAVE_STRTOUL
@@ -39,7 +51,7 @@
/* Define if your system defines struct sockaddr_storage */
#undef HAVE_STRUCT_SOCKADDR_STORAGE
-@@ -228,6 +231,9 @@
+@@ -240,6 +243,9 @@
/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
@@ -50,18 +62,18 @@
#undef HAVE_SYS_WAIT_H
Index: configure
---- configure.orig 2004-04-15 04:47:32.000000000 +0200
-+++ configure 2004-04-15 08:47:28.000000000 +0200
-@@ -4258,7 +4258,7 @@
+--- configure.orig 2004-12-31 20:13:48 +0100
++++ configure 2005-01-06 10:37:40 +0100
+@@ -4631,7 +4631,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
-+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
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 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
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:4264: checking for $ac_header" >&5
-@@ -5220,7 +5220,7 @@
+ echo "$as_me:4637: checking for $ac_header" >&5
+@@ -5593,7 +5593,7 @@
fi
done
@@ -69,14 +81,14 @@
+for ac_func in dup2 fgetln gettimeofday memmove memset strcasecmp strchr
strdup strncasecmp strtoul strspn getaddrinfo getnameinfo freeaddrinfo
setgroups sendmsg recvmsg setregid setruid setenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:5226: checking for $ac_func" >&5
+ echo "$as_me:5599: checking for $ac_func" >&5
Index: honeyd.c
---- honeyd.c.orig 2004-04-15 05:29:22.000000000 +0200
-+++ honeyd.c 2004-04-15 08:48:06.000000000 +0200
-@@ -91,6 +91,9 @@
- #include "parser.h"
- #include "ui.h"
- #include "ethernet.h"
+--- 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"
+ #include "histogram.h"
+ #include "update.h"
+#ifndef HAVE_SETENV
+#include "setenv.h"
+#endif
@@ -84,8 +96,8 @@
#ifdef HAVE_PYTHON
#include "pyextend.h"
Index: honeyd_overload.c
---- honeyd_overload.c.orig 2004-04-15 05:29:22.000000000 +0200
-+++ honeyd_overload.c 2004-04-15 08:46:29.000000000 +0200
+--- 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 @@
struct fd *nfd;
int pair[2];
@@ -150,8 +162,8 @@
}
+#endif /* !sun */
Index: personality.c
---- personality.c.orig 2004-04-15 05:29:22.000000000 +0200
-+++ personality.c 2004-04-15 08:46:29.000000000 +0200
+--- personality.c.orig 2004-12-31 20:13:38 +0100
++++ personality.c 2005-01-06 10:37:07 +0100
@@ -32,6 +32,9 @@
#include <sys/param.h>
@@ -163,8 +175,8 @@
#include "config.h"
Index: pf_osfp.c
---- pf_osfp.c.orig 2004-04-15 05:29:22.000000000 +0200
-+++ pf_osfp.c 2004-04-15 08:46:29.000000000 +0200
+--- pf_osfp.c.orig 2004-12-31 20:13:43 +0100
++++ pf_osfp.c 2005-01-06 10:37:07 +0100
@@ -50,6 +50,10 @@
# define DPFPRINTF(format, x...) ((void)0)
# endif /* PFDEBUG */
@@ -177,14 +189,18 @@
pool_t pf_osfp_entry_pl;
pool_t pf_osfp_pl;
Index: Makefile.in
---- Makefile.in.orig 2004-06-25 17:08:03 +0200
-+++ Makefile.in 2004-06-25 17:11:30 +0200
-@@ -642,7 +642,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 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)/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 1 Jan 2005 10:50:11 -0000 1.53
+++ openpkg-src/honeyd/honeyd.spec 6 Jan 2005 09:50:14 -0000 1.54
@@ -33,8 +33,8 @@
Class: EVAL
Group: Security
License: BSD
-Version: 0.8b
-Release: 20041015
+Version: 1.0
+Release: 20050106
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
