OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2004 17:16:21
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-src/honeyd honeyd.patch honeyd.spec setenv.c
Log:
repair an embarassing vendor Makefile with a hack, and handle a
nonoverwrite condition in our own setenv(3) code
Summary:
Revision Changes Path
1.13 +0 -0 openpkg-src/honeyd/honeyd.patch
1.48 +0 -0 openpkg-src/honeyd/honeyd.spec
1.3 +0 -0 openpkg-src/honeyd/setenv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 15 Apr 2004 06:55:22 -0000 1.12
+++ openpkg-src/honeyd/honeyd.patch 25 Jun 2004 15:16:20 -0000 1.13
@@ -176,3 +176,15 @@
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 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]
+
+ dist-hook:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 20 Apr 2004 18:24:21 -0000 1.47
+++ openpkg-src/honeyd/honeyd.spec 25 Jun 2004 15:16:20 -0000 1.48
@@ -34,7 +34,7 @@
Group: Security
License: BSD
Version: 0.8b
-Release: 20040420
+Release: 20040625
# package options
%option with_fsl yes
@@ -122,6 +122,7 @@
LDFLAGS="%{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
./configure \
+ --disable-shared \
--without-python \
--prefix=%{l_prefix}
%{l_make} %{l_mflags}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/setenv.c
============================================================================
$ cvs diff -u -r1.2 -r1.3 setenv.c
--- openpkg-src/honeyd/setenv.c 25 Sep 2003 21:41:44 -0000 1.2
+++ openpkg-src/honeyd/setenv.c 25 Jun 2004 15:16:20 -0000 1.3
@@ -41,6 +41,10 @@
{
char *szPair = NULL; /* String we will pass to putenv(3) */
+ /* Short circuite if overwrite is not enabled on an existing variable */
+ if (nOverwrite == 0 && getenv(kshName) != 0)
+ return 0;
+
/* Allocate space for name, value, equals, and string terminator */
szPair = malloc(strlen(kszName) + strlen(kszValue) + strlen("=") + 1);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
