[csw-devel] SF.net SVN: gar:[5437] csw/mgar/pkg/pound/trunk
bensons at users.sourceforge.net
bensons at users.sourceforge.net
Tue Jun 30 15:25:25 CEST 2009
Revision: 5437
http://gar.svn.sourceforge.net/gar/?rev=5437&view=rev
Author: bensons
Date: 2009-06-30 13:25:24 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
pound: this is actually the pound v1 package, rolling back. for pound2 see CSWpound2
Modified Paths:
--------------
csw/mgar/pkg/pound/trunk/Makefile
csw/mgar/pkg/pound/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/pound/trunk/files/patch-config.c
csw/mgar/pkg/pound/trunk/files/patch-pound.8
csw/mgar/pkg/pound/trunk/files/patch-pound.h
csw/mgar/pkg/pound/trunk/files/pound-sample.cfg
Removed Paths:
-------------
csw/mgar/pkg/pound/trunk/files/CSWpound.gspec
csw/mgar/pkg/pound/trunk/files/install.diff
csw/mgar/pkg/pound/trunk/files/pcre.diff
Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile 2009-06-30 12:14:10 UTC (rev 5436)
+++ csw/mgar/pkg/pound/trunk/Makefile 2009-06-30 13:25:24 UTC (rev 5437)
@@ -1,37 +1,64 @@
GARNAME = Pound
-GARVERSION = 2.0.4
+GARVERSION = 1.10
CATEGORIES = net
+CATALOGNAME = pound
DESCRIPTION = reverse proxy load balancer
define BLURB
- The Pound program is a reverse proxy, load balancer and HTTPS front-end for
- Web server(s). Pound was developed to enable distributing the load among
- several Web-servers and to allow for a convenient SSL wrapper for those Web
- servers that do not offer it natively. Pound is distributed under the GPL -
- no warranty, it's free to use, copy and give away.
+ The Pound program is a reverse proxy, load balancer and HTTPS front-end for
+ Web server(s). Pound was developed to enable distributing the load among
+ several Web-servers and to allow for a convenient SSL wrapper for those Web
+ servers that do not offer it natively. Pound is distributed under the GPL -
+ no warranty, it's free to use, copy and give away.
+ As of release 1.0 Pound is declared to be production-quality code.
endef
MASTER_SITES = http://www.apsis.ch/pound/
DISTFILES = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWpound,)
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
-# Install properly when
-# (a) destdir does not exist, and
-# (b) installing as non root.
-PATCHFILES += install.diff
+# we require
+REQUIRED_PKGS = CSWosslrt
-# Look for regcomp() instead of pcreposix_regcomp()
-PATCHFILES += pcre.diff
+# patch conf/pid directory to fit our needs
+PATCHFILES = patch-pound.h
+PATCHFILES += patch-pound.8
+# remove linux specific logfacility
+PATCHFILES += patch-config.c
+# configure args
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-super
CONFIGURE_ARGS += --enable-msdav
+CONFIGURE_ARGS += --with-maxbuf=8192
CONFIGURE_ARGS += --with-ssl=$(prefix)
# No test suite available
TEST_SCRIPTS =
+# use a custom install
+INSTALL_SCRIPTS = custom docs
+
include gar/category.mk
+
+install-custom:
+ ginstall -d $(DESTDIR)$(sbindir)
+ ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound
+ ginstall -d $(DESTDIR)$(mandir)/man8
+ ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8
+ ginstall -d $(DESTDIR)$(sysconfdir)/$(CATALOGNAME)
+ ginstall -m 644 $(FILEDIR)/pound-sample.cfg $(DESTDIR)$(sysconfdir)/$(CATALOGNAME)
+ ginstall -d $(DESTDIR)/var/opt/csw/run
+
+docs-list = $(WORKSRC)/README
+docs-list += $(WORKSRC)/FAQ
+docs-list += $(WORKSRC)/z2_2_5_1.py
+docs-list += $(WORKSRC)/z2_2_6_1.py
+install-docs:
+ ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME)
+ @( for file in $(docs-list) ; do \
+ ginstall -m 644 $$file $(DESTDIR)$(docdir)/$(CATALOGNAME) ; \
+ done )
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/pound/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound/trunk/checksums 2009-06-30 12:14:10 UTC (rev 5436)
+++ csw/mgar/pkg/pound/trunk/checksums 2009-06-30 13:25:24 UTC (rev 5437)
@@ -1,4 +1,4 @@
-d7953742a638210eb89cf8deb2cb2112 download/Pound-2.0.4.tgz
-d085eb0e8e6bb8dab8973e4811361659 download/CSWpound.gspec
-f8d673fef11f31d8388745d385540299 download/install.diff
-26acdce646286295106c1fe57c34e484 download/pcre.diff
+5792fd804907cc617e37607c6783d5f7 download/Pound-1.10.tgz
+3ae13bb3dfa78b654dda5936aca82233 download/patch-config.c
+677d2367d5fbcabc1c0e1cb062bbfe96 download/patch-pound.8
+64bee772a5ab4bddeb03706a6a717539 download/patch-pound.h
Deleted: csw/mgar/pkg/pound/trunk/files/CSWpound.gspec
===================================================================
--- csw/mgar/pkg/pound/trunk/files/CSWpound.gspec 2009-06-30 12:14:10 UTC (rev 5436)
+++ csw/mgar/pkg/pound/trunk/files/CSWpound.gspec 2009-06-30 13:25:24 UTC (rev 5437)
@@ -1,29 +0,0 @@
-%var bitname pound
-%var pkgname CSWpound
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-Copyright (C) 2002 Apsis GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-Contact information:
-Apsis GmbH
-P.O.Box
-8707 Uetikon am See
-Switzerland
-Tel: +41-1-920 4904
-EMail: roseg at apsis.ch
-
Deleted: csw/mgar/pkg/pound/trunk/files/install.diff
===================================================================
--- csw/mgar/pkg/pound/trunk/files/install.diff 2009-06-30 12:14:10 UTC (rev 5436)
+++ csw/mgar/pkg/pound/trunk/files/install.diff 2009-06-30 13:25:24 UTC (rev 5437)
@@ -1,20 +0,0 @@
-diff --speed-large-files --minimal -Nru Pound-2.0.4.orig/Makefile.in Pound-2.0.4/Makefile.in
---- Pound-2.0.4.orig/Makefile.in 2006-04-20 11:48:10.435120000 -0400
-+++ Pound-2.0.4/Makefile.in 2006-04-20 11:48:03.519186000 -0400
-@@ -46,11 +46,11 @@
- $(OBJS): pound.h
-
- install: all
-- [ -d ${DESTDIR}@sbindir@ ] || mkdir ${DESTDIR}@sbindir@
-- @INSTALL@ -o bin -g bin -m 555 -s pound ${DESTDIR}@sbindir@/pound
-- [ -d ${DESTDIR}@mandir@ ] || mkdir ${DESTDIR}@mandir@
-- [ -d ${DESTDIR}@mandir@/man8 ] || mkdir ${DESTDIR}@mandir@/man8
-- @INSTALL@ -o bin -g bin -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8
-+ [ -d ${DESTDIR}@sbindir@ ] || mkdir -p ${DESTDIR}@sbindir@
-+ @INSTALL@ -m 555 -s pound ${DESTDIR}@sbindir@/pound
-+ [ -d ${DESTDIR}@mandir@ ] || mkdir -p ${DESTDIR}@mandir@
-+ [ -d ${DESTDIR}@mandir@/man8 ] || mkdir -p ${DESTDIR}@mandir@/man8
-+ @INSTALL@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8
-
- clean:
- rm -f pound $(OBJS)
Added: csw/mgar/pkg/pound/trunk/files/patch-config.c
===================================================================
--- csw/mgar/pkg/pound/trunk/files/patch-config.c (rev 0)
+++ csw/mgar/pkg/pound/trunk/files/patch-config.c 2009-06-30 13:25:24 UTC (rev 5437)
@@ -0,0 +1,15 @@
+*** Pound-1.10.orig/config.c Wed Feb 1 12:22:03 2006
+--- Pound-1.10/config.c Tue Jun 30 14:36:24 2009
+***************
+*** 230,239 ****
+
+ static CODE facilitynames[] = {
+ { "auth", LOG_AUTH },
+- { "authpriv", LOG_AUTHPRIV },
+ { "cron", LOG_CRON },
+ { "daemon", LOG_DAEMON },
+- { "ftp", LOG_FTP },
+ { "kern", LOG_KERN },
+ { "lpr", LOG_LPR },
+ { "mail", LOG_MAIL },
+--- 230,237 ----
Added: csw/mgar/pkg/pound/trunk/files/patch-pound.8
===================================================================
--- csw/mgar/pkg/pound/trunk/files/patch-pound.8 (rev 0)
+++ csw/mgar/pkg/pound/trunk/files/patch-pound.8 2009-06-30 13:25:24 UTC (rev 5437)
@@ -0,0 +1,139 @@
+*** Pound-1.10.orig/pound.8 Wed Feb 1 12:22:03 2006
+--- Pound-1.10/pound.8 Tue Jun 30 14:33:32 2009
+***************
+*** 39,45 ****
+ \fB\-f\fR config_file
+ Location of the configuration file (see below for a full description of the format).
+ Default:
+! .I /usr/local/etc/pound.cfg
+ .TP
+ \fB\-p\fR pid_file
+ Location of the pid file.
+--- 39,45 ----
+ \fB\-f\fR config_file
+ Location of the configuration file (see below for a full description of the format).
+ Default:
+! .I /opt/csw/etc/pound/pound.cfg
+ .TP
+ \fB\-p\fR pid_file
+ Location of the pid file.
+***************
+*** 47,53 ****
+ will write its own pid into this file. Normally this is used for shell
+ scripts that control starting and stopping of the daemon.
+ Default:
+! .I /var/run/pound.pid
+ .PP
+ In general, any number of back-end servers may be specified. Use the priority to
+ affect the load distribution among unequal-performance servers.
+--- 47,53 ----
+ will write its own pid into this file. Normally this is used for shell
+ scripts that control starting and stopping of the daemon.
+ Default:
+! .I /var/opt/csw/run/pound.pid
+ .PP
+ In general, any number of back-end servers may be specified. Use the priority to
+ affect the load distribution among unequal-performance servers.
+***************
+*** 488,494 ****
+ To translate HTTPS requests to a local HTTP server (assuming your network address
+ is 123.123.123.123):
+ .IP
+! ListenHTTPS 1.2.3.4,443 /etc/pound/server.pem
+ .br
+
+ .br
+--- 488,494 ----
+ To translate HTTPS requests to a local HTTP server (assuming your network address
+ is 123.123.123.123):
+ .IP
+! ListenHTTPS 1.2.3.4,443 /opt/csw/etc/pound/server.pem
+ .br
+
+ .br
+***************
+*** 503,509 ****
+ .IP
+ ListenHTTP 123.123.123.123,80
+ .br
+! ListenHTTPS 1.2.3.4,443 /etc/pound/server.pem
+ .br
+
+ .br
+--- 503,509 ----
+ .IP
+ ListenHTTP 123.123.123.123,80
+ .br
+! ListenHTTPS 1.2.3.4,443 /opt/csw/etc/pound/server.pem
+ .br
+
+ .br
+***************
+*** 524,530 ****
+ .br
+ ListenHTTP 123.123.123.123,8080
+ .br
+! ListenHTTPS 1.2.3.4,443 /etc/pound/server.pem
+ .br
+ User www
+ .br
+--- 524,530 ----
+ .br
+ ListenHTTP 123.123.123.123,8080
+ .br
+! ListenHTTPS 1.2.3.4,443 /opt/csw/etc/pound/server.pem
+ .br
+ User www
+ .br
+***************
+*** 591,597 ****
+ .br
+ ListenHTTP 1.2.3.4
+ .br
+! ListenHTTPS 1.2.3.4,443 /etc/pound/pound.pem
+ .br
+ User nobody
+ .br
+--- 591,597 ----
+ .br
+ ListenHTTP 1.2.3.4
+ .br
+! ListenHTTPS 1.2.3.4,443 /opt/csw/etc/pound/pound.pem
+ .br
+ User nobody
+ .br
+***************
+*** 647,662 ****
+ .br
+ .SH FILES
+ .TP
+! \fI/var/run/pound.nnn\fR
+ this is where
+ .B Pound
+ will attempt to record its process id.
+ .TP
+! \fI/usr/local/etc/pound/pound.cfg\fR
+ the default configuration file (the location may be changed when compiling - see the
+ F_CONF flag in the Makefile).
+ .TP
+! \fI/usr/local/etc/pound/cert.pem\fR
+ the certificate file(s) for HTTPS. The location must be defined in the configuration
+ file - this is only a suggestion. The file must contain a PEM-encoded certificate,
+ optionally a certificate chain from a known Certificate Authority to your server certificate
+--- 647,662 ----
+ .br
+ .SH FILES
+ .TP
+! \fI/var/opt/csw/run/pound.nnn\fR
+ this is where
+ .B Pound
+ will attempt to record its process id.
+ .TP
+! \fI/opt/csw/etc/pound/pound.cfg\fR
+ the default configuration file (the location may be changed when compiling - see the
+ F_CONF flag in the Makefile).
+ .TP
+! \fI/opt/csw/etc/pound/cert.pem\fR
+ the certificate file(s) for HTTPS. The location must be defined in the configuration
+ file - this is only a suggestion. The file must contain a PEM-encoded certificate,
+ optionally a certificate chain from a known Certificate Authority to your server certificate
Added: csw/mgar/pkg/pound/trunk/files/patch-pound.h
===================================================================
--- csw/mgar/pkg/pound/trunk/files/patch-pound.h (rev 0)
+++ csw/mgar/pkg/pound/trunk/files/patch-pound.h 2009-06-30 13:25:24 UTC (rev 5437)
@@ -0,0 +1,27 @@
+*** Pound-1.10.orig/pound.h Wed Feb 1 12:22:03 2006
+--- Pound-1.10/pound.h Tue Jun 30 14:32:19 2009
+***************
+*** 278,288 ****
+ #define GLOB_SESS 15
+
+ #ifndef F_CONF
+! #define F_CONF "/usr/local/etc/pound.cfg"
+ #endif
+
+ #ifndef F_PID
+! #define F_PID "/var/run/pound.pid"
+ #endif
+
+ #define SERVER_TO (server_to > 0? server_to: 5)
+--- 278,288 ----
+ #define GLOB_SESS 15
+
+ #ifndef F_CONF
+! #define F_CONF "/opt/csw/etc/pound/pound.cfg"
+ #endif
+
+ #ifndef F_PID
+! #define F_PID "/var/opt/csw/run/pound.pid"
+ #endif
+
+ #define SERVER_TO (server_to > 0? server_to: 5)
Deleted: csw/mgar/pkg/pound/trunk/files/pcre.diff
===================================================================
--- csw/mgar/pkg/pound/trunk/files/pcre.diff 2009-06-30 12:14:10 UTC (rev 5436)
+++ csw/mgar/pkg/pound/trunk/files/pcre.diff 2009-06-30 13:25:24 UTC (rev 5437)
@@ -1,30 +0,0 @@
-diff --speed-large-files --minimal -Nru Pound-2.0.4.orig/configure Pound-2.0.4/configure
---- Pound-2.0.4.orig/configure 2006-04-20 11:58:22.506753000 -0400
-+++ Pound-2.0.4/configure 2006-04-20 11:58:14.881735000 -0400
-@@ -3218,9 +3218,9 @@
- echo 'Missing OpenSSL (-lssl) - aborted'; exit 1
- fi
-
--echo "$as_me:$LINENO: checking for pcreposix_regcomp in -lpcreposix" >&5
--echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6
--if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then
-+echo "$as_me:$LINENO: checking for regcomp in -lpcreposix" >&5
-+echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
-+if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -3238,11 +3238,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char pcreposix_regcomp ();
-+char regcomp ();
- int
- main ()
- {
--pcreposix_regcomp ();
-+regcomp ();
- ;
- return 0;
- }
Added: csw/mgar/pkg/pound/trunk/files/pound-sample.cfg
===================================================================
--- csw/mgar/pkg/pound/trunk/files/pound-sample.cfg (rev 0)
+++ csw/mgar/pkg/pound/trunk/files/pound-sample.cfg 2009-06-30 13:25:24 UTC (rev 5437)
@@ -0,0 +1,13 @@
+#Pound sample configuration
+
+#IP and Port to which Pound is bound to
+ListenHTTP 127.0.0.1,80
+
+UrlGroup ".*"
+Alive 20
+#Enable sticky cookie
+Session COOKIE JSESSIONID 180
+#IPs and Ports to which Pound should balance on
+BackEnd 127.0.0.1,81,1
+BackEnd 127.0.0.2,8888,1
+EndGroup
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list