OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 26-Sep-2003 17:01:07
Branch: HEAD Handle: 2003092616010402
Modified files:
openpkg-src/honeyd cdefs.h honeyd.patch honeyd.spec
openpkg-web news.txt
Log:
Whoops missed a AF_LOCAL so fix it, and also clean up our custom cdefs
header
Summary:
Revision Changes Path
1.2 +34 -52 openpkg-src/honeyd/cdefs.h
1.8 +9 -0 openpkg-src/honeyd/honeyd.patch
1.33 +1 -1 openpkg-src/honeyd/honeyd.spec
1.6747 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/cdefs.h
============================================================================
$ cvs diff -u -r1.1 -r1.2 cdefs.h
--- openpkg-src/honeyd/cdefs.h 24 Sep 2003 22:37:23 -0000 1.1
+++ openpkg-src/honeyd/cdefs.h 26 Sep 2003 15:01:06 -0000 1.2
@@ -25,57 +25,40 @@
*/
/*
-** libsm C language portability macros
-** See libsm/cdefs.html for documentation.
+** BSD and Linux already have <sys/cdefs.h> which defines a set of C
+** language portability macros that are a defacto standard in the open
+** source community. This file allows for building on platforms lacking
+** these definitions.
*/
-
#ifndef HOND_CDEFS_H
# define HOND_CDEFS_H
-/*
-** BSD and Linux have <sys/cdefs.h> which defines a set of C language
-** portability macros that are a defacto standard in the open source
-** community.
-*/
-
-# if HOND_CONF_SYS_CDEFS_H
-# include <sys/cdefs.h>
-# endif /* HOND_CONF_SYS_CDEFS_H */
-
-/*
-** Define the standard C language portability macros
-** for platforms that lack <sys/cdefs.h>.
-*/
-
-# if !HOND_CONF_SYS_CDEFS_H
-# if defined(__cplusplus)
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS };
-# else /* defined(__cplusplus) */
-# define __BEGIN_DECLS
-# define __END_DECLS
-# endif /* defined(__cplusplus) */
-# if defined(__STDC__) || defined(__cplusplus)
-# ifndef __P
-# define __P(protos) protos
-# endif /* __P */
-# define __CONCAT(x,y) x ## y
-# define __STRING(x) #x
-# else /* defined(__STDC__) || defined(__cplusplus) */
-# define __P(protos) ()
-# define __CONCAT(x,y) x/**/y
-# define __STRING(x) "x"
-# define const
-# define signed
-# define volatile
-# endif /* defined(__STDC__) || defined(__cplusplus) */
-# endif /* !HOND_CONF_SYS_CDEFS_H */
+# if defined(__cplusplus)
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS };
+# else /* defined(__cplusplus) */
+# define __BEGIN_DECLS
+# define __END_DECLS
+# endif /* defined(__cplusplus) */
+# if defined(__STDC__) || defined(__cplusplus)
+# ifndef __P
+# define __P(protos) protos
+# endif /* __P */
+# define __CONCAT(x,y) x ## y
+# define __STRING(x) #x
+# else /* defined(__STDC__) || defined(__cplusplus) */
+# define __P(protos) ()
+# define __CONCAT(x,y) x/**/y
+# define __STRING(x) "x"
+# define const
+# define signed
+# define volatile
+# endif /* defined(__STDC__) || defined(__cplusplus) */
/*
** Define HOND_DEAD, a macro used to declare functions that do not return
** to their caller.
*/
-
# ifndef HOND_DEAD
# if __GNUC__ >= 2
# if __GNUC__ == 2 && __GNUC_MINOR__ < 5
@@ -91,7 +74,6 @@
/*
** Define HOND_UNUSED, a macro used to declare variables that may be unused.
*/
-
# ifndef HOND_UNUSED
# if __GNUC__ >= 2
# if __GNUC__ == 2 && __GNUC_MINOR__ < 7
@@ -113,13 +95,13 @@
** using the "volatile" keyword. If a variable actually is volatile,
** then HOND_NONVOLATILE should not be used.
**
-** To compile sendmail with gcc and see all non-bogus warnings,
-** you should use
-** gcc -O -Wall -DHOND_OMIT_BOGUS_WARNINGS ...
-** Do not use -DHOND_OMIT_BOGUS_WARNINGS when compiling the production
-** version of sendmail, because there is a performance hit.
+** To compile source code with gcc and see all non-bogus warnings use:
+**
+** gcc -O -Wall -DHOND_OMIT_BOGUS_WARNINGS ...
+**
+** Do not use -DHOND_OMIT_BOGUS_WARNINGS when compiling production
+** software, because there is a performance hit.
*/
-
# ifdef HOND_OMIT_BOGUS_WARNINGS
# define HOND_NONVOLATILE volatile
# else /* HOND_OMIT_BOGUS_WARNINGS */
@@ -129,12 +111,11 @@
/*
** Turn on format string argument checking.
*/
-
# ifndef HOND_CONF_FORMAT_TEST
# if __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-# define HOND_CONF_FORMAT_TEST 1
+# define HOND_CONF_FORMAT_TEST 1
# else /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */
-# define HOND_CONF_FORMAT_TEST 0
+# define HOND_CONF_FORMAT_TEST 0
# endif /* __GNUC__ == 2 && __GNUC_MINOR__ >= 7 */
# endif /* HOND_CONF_FORMAT_TEST */
@@ -155,3 +136,4 @@
# endif /* ! SCANFLIKE */
#endif /* ! HOND_CDEFS_H */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 honeyd.patch
--- openpkg-src/honeyd/honeyd.patch 25 Sep 2003 21:41:44 -0000 1.7
+++ openpkg-src/honeyd/honeyd.patch 26 Sep 2003 15:01:06 -0000 1.8
@@ -10,6 +10,15 @@
warn("%s: socketpair", __func__);
return (NULL);
}
+@@ -500,7 +500,7 @@
+ }
+
+ /* Get another socketpair */
+- if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pair) == -1) {
++ if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
+ DPRINTF((stderr, "%s: socketpair failed", __func__));
+ errno = ETIMEDOUT; /* XXX */
+ return (-1);
@@ -607,6 +607,7 @@
}
#endif /* !__FreeBSD__ */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/honeyd/honeyd.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 honeyd.spec
--- openpkg-src/honeyd/honeyd.spec 25 Sep 2003 21:41:44 -0000 1.32
+++ openpkg-src/honeyd/honeyd.spec 26 Sep 2003 15:01:06 -0000 1.33
@@ -33,7 +33,7 @@
Group: Security
License: BSD
Version: 0.6a
-Release: 20030925
+Release: 20030926
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6746 -r1.6747 news.txt
--- openpkg-web/news.txt 26 Sep 2003 10:43:43 -0000 1.6746
+++ openpkg-web/news.txt 26 Sep 2003 15:01:04 -0000 1.6747
@@ -1,3 +1,4 @@
+26-Sep-2003: Upgraded package: P<honeyd-0.6a-20030926>
26-Sep-2003: Upgraded package: P<bind-9.2.3rc4-20030926>
26-Sep-2003: Upgraded package: P<perl-net-20030926-20030926>
26-Sep-2003: Upgraded package: P<perl-util-20030926-20030926>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
