head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.4
	OPENPKG_E1_MP:1.4
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.4
date	2006.12.10.09.41.30;	author rse;	state Exp;
branches;
next	1.3;
commitid	Qc3fsaE0lwyhxXXr;

1.3
date	2006.12.07.08.14.14;	author rse;	state Exp;
branches;
next	1.2;
commitid	gyfZOSN6BA3k9zXr;

1.2
date	2006.10.28.07.49.43;	author rse;	state Exp;
branches;
next	1.1;
commitid	p4SQtmjhaU3DiqSr;

1.1
date	2005.09.28.15.58.21;	author thl;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2005.09.28.15.58.21;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.55.01;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: pound 2.1.7 -> 2.1.8
@
text
@Index: http.c
--- http.c.orig	2006-12-09 09:39:26 +0100
+++ http.c	2006-12-10 10:38:26 +0100
@@@@ -29,6 +29,10 @@@@
 
 #include    "pound.h"
 
+#ifndef SOL_TCP
+#define SOL_TCP SOL_SOCKET
+#endif
+
 /* HTTP error replies */
 static char *h500 = "500 Internal Server Error",
             *h501 = "501 Not Implemented",
Index: pound.h
--- pound.h.orig	2006-12-09 09:39:26 +0100
+++ pound.h	2006-12-10 10:38:26 +0100
@@@@ -31,6 +31,12 @@@@
 #include    <stdio.h>
 #include    <math.h>
 
+#if HAVE_PTHREAD_H
+#include    <pthread.h>
+#else
+#error "Pound needs pthread.h"
+#endif
+
 #if HAVE_STDLIB_H
 #include    <stdlib.h>
 #else
@@@@ -47,12 +53,6 @@@@
 #include    <getopt.h>
 #endif
 
-#if HAVE_PTHREAD_H
-#include    <pthread.h>
-#else
-#error "Pound needs pthread.h"
-#endif
-
 #if HAVE_STRING_H
 #include    <string.h>
 #else
@


1.3
log
@upgrading package: pound 2.1.6 -> 2.1.7
@
text
@a0 12
Index: Makefile.in
--- Makefile.in.orig	2006-12-06 18:32:18 +0100
+++ Makefile.in	2006-12-07 09:12:24 +0100
@@@@ -44,7 +44,7 @@@@
 		${CC} @@LDFLAGS@@ -o pound $(OBJS) $(LIBS)
 
 poundctl:	poundctl.o
-		${CC} -o poundctl poundctl.o $(LIBS)
+		${CC} @@LDFLAGS@@ -o poundctl poundctl.o $(LIBS)
 
 $(OBJS):	pound.h
 
d2 2
a3 2
--- http.c.orig	2006-12-06 18:32:18 +0100
+++ http.c	2006-12-07 09:12:24 +0100
d16 2
a17 2
--- pound.h.orig	2006-12-06 18:32:18 +0100
+++ pound.h	2006-12-07 09:12:24 +0100
@


1.2
log
@upgrading package: pound 2.1.4 -> 2.1.5
@
text
@d1 30
a30 4
--- pound.h.orig	2005-09-28 15:54:27.468707000 +0200
+++ pound.h	2005-09-28 17:52:20.687744806 +0200
@@@@ -84,6 +84,12 @@@@
 #include    "config.h"
d32 1
d43 1
a43 1
@@@@ -100,12 +106,6 @@@@
a55 12
Index: Makefile.in
--- Makefile.in.orig	2006-10-28 09:38:58 +0200
+++ Makefile.in	2006-10-28 09:41:08 +0200
@@@@ -44,7 +44,7 @@@@
 		${CC} @@LDFLAGS@@ -o pound $(OBJS) $(LIBS)
 
 poundctl:	poundctl.o
-		${CC} -o poundctl poundctl.o
+		${CC} @@LDFLAGS@@ -o poundctl poundctl.o $(LIBS)
 
 $(OBJS):	pound.h
 
@


1.1
log
@upgrading package: pound 1.9.2 -> 1.9.3
@
text
@d29 12
@


1.1.2.1
log
@file pound.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:55:01 +0000
@
text
@d1 28
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 28
--- pound.h.orig	2005-09-28 15:54:27.468707000 +0200
+++ pound.h	2005-09-28 17:52:20.687744806 +0200
@@@@ -84,6 +84,12 @@@@
 #include    "config.h"
 #include    <stdio.h>
 
+#if HAVE_PTHREAD_H
+#include    <pthread.h>
+#else
+#error "Pound needs pthread.h"
+#endif
+
 #if HAVE_STDLIB_H
 #include    <stdlib.h>
 #else
@@@@ -100,12 +106,6 @@@@
 #include    <getopt.h>
 #endif
 
-#if HAVE_PTHREAD_H
-#include    <pthread.h>
-#else
-#error "Pound needs pthread.h"
-#endif
-
 #if HAVE_STRING_H
 #include    <string.h>
 #else
@