[csw-devel] SF.net SVN: gar:[5434] csw/mgar/pkg/pound2/trunk

bensons at users.sourceforge.net bensons at users.sourceforge.net
Tue Jun 30 14:09:09 CEST 2009


Revision: 5434
          http://gar.svn.sourceforge.net/gar/?rev=5434&view=rev
Author:   bensons
Date:     2009-06-30 12:09:09 +0000 (Tue, 30 Jun 2009)

Log Message:
-----------
pound2: adjusted config and pid dir to our needs

Modified Paths:
--------------
    csw/mgar/pkg/pound2/trunk/Makefile
    csw/mgar/pkg/pound2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pound2/trunk/files/patch-pound.8
    csw/mgar/pkg/pound2/trunk/files/patch-pound.h

Modified: csw/mgar/pkg/pound2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound2/trunk/Makefile	2009-06-30 12:05:35 UTC (rev 5433)
+++ csw/mgar/pkg/pound2/trunk/Makefile	2009-06-30 12:09:09 UTC (rev 5434)
@@ -27,6 +27,10 @@
 CONFIGURE_ARGS += --with-maxbuf=8192
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
+# adjust log/run files
+PATCHFILES  = patch-pound.h
+PATCHFILES += patch-pound.8
+
 # No test suite available
 TEST_SCRIPTS =
 
@@ -44,6 +48,7 @@
 	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/pound2ctl.8
 	ginstall -d $(DESTDIR)$(sysconfdir)/$(CATALOGNAME)
 	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/$(CATALOGNAME)
+	ginstall -d /var/opt/csw/run
 
 docs-list  = $(WORKSRC)/README
 docs-list += $(WORKSRC)/FAQ

Modified: csw/mgar/pkg/pound2/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound2/trunk/checksums	2009-06-30 12:05:35 UTC (rev 5433)
+++ csw/mgar/pkg/pound2/trunk/checksums	2009-06-30 12:09:09 UTC (rev 5434)
@@ -1 +1,3 @@
 4c4613e857ee14c06c61ab09e28ae503  download/Pound-2.4.5.tgz
+2113303d7ab72d5d8621c5d7a36ce380  download/patch-pound.8
+e7acc61f9ff01ecaaa628a08b207176f  download/patch-pound.h

Added: csw/mgar/pkg/pound2/trunk/files/patch-pound.8
===================================================================
--- csw/mgar/pkg/pound2/trunk/files/patch-pound.8	                        (rev 0)
+++ csw/mgar/pkg/pound2/trunk/files/patch-pound.8	2009-06-30 12:09:09 UTC (rev 5434)
@@ -0,0 +1,71 @@
+*** Pound-2.4.5.orig/pound.8	Mon Jun 29 17:53:58 2009
+--- Pound-2.4.5/pound.8	Tue Jun 30 13:55:23 2009
+***************
+*** 155,161 ****
+  \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.
+--- 155,161 ----
+  \fB\-f\fR config_file
+  Location of the configuration file (see below for a full description of the format).
+  Default:
+! .I /opt/csw/etc/pound2/pound2.cfg
+  .TP
+  \fB\-p\fR pid_file
+  Location of the pid file.
+***************
+*** 163,169 ****
+  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.
+--- 163,169 ----
+  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/pound2.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.
+***************
+*** 1107,1122 ****
+  .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.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
+--- 1107,1122 ----
+  .br
+  .SH FILES
+  .TP
+! \fI/var/opt/csw/run/pound2.nnn\fR
+  this is where
+  .B Pound
+  will attempt to record its process id.
+  .TP
+! \fI/opt/csw/etc/pound2/pound2.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/pound2/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/pound2/trunk/files/patch-pound.h
===================================================================
--- csw/mgar/pkg/pound2/trunk/files/patch-pound.h	                        (rev 0)
+++ csw/mgar/pkg/pound2/trunk/files/patch-pound.h	2009-06-30 12:09:09 UTC (rev 5434)
@@ -0,0 +1,27 @@
+*** Pound-2.4.5.orig/pound.h	Mon Jun 29 17:53:58 2009
+--- Pound-2.4.5/pound.h	Tue Jun 30 13:47:08 2009
+***************
+*** 271,281 ****
+  #define MAXHEADERS  128
+  
+  #ifndef F_CONF
+! #define F_CONF  "/usr/local/etc/pound.cfg"
+  #endif
+  
+  #ifndef F_PID
+! #define F_PID  "/var/run/pound.pid"
+  #endif
+  
+  /* matcher chain */
+--- 271,281 ----
+  #define MAXHEADERS  128
+  
+  #ifndef F_CONF
+! #define F_CONF  "/usr/local/etc/pound2/pound2.cfg"
+  #endif
+  
+  #ifndef F_PID
+! #define F_PID  "/var/opt/csw/run/pound2.pid"
+  #endif
+  
+  /* matcher chain */


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