[csw-devel] SF.net SVN: gar:[20611] csw/mgar/pkg/pound/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Apr 6 18:19:52 CEST 2013
Revision: 20611
http://gar.svn.sourceforge.net/gar/?rev=20611&view=rev
Author: chninkel
Date: 2013-04-06 16:19:51 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
pound/trunk: reverted to the recipe of the last shipped package to rebuild against libssl 1.0.0
Modified Paths:
--------------
csw/mgar/pkg/pound/trunk/Makefile
csw/mgar/pkg/pound/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile 2013-04-06 16:18:15 UTC (rev 20610)
+++ csw/mgar/pkg/pound/trunk/Makefile 2013-04-06 16:19:51 UTC (rev 20611)
@@ -12,67 +12,63 @@
endef
MASTER_SITES = http://www.apsis.ch/pound/
-DISTNAME = Pound-$(VERSION)
-DISTFILES += $(DISTNAME).tgz
+DISTFILES = Pound-$(VERSION).tgz
+DISTNAME = Pound-$(VERSION)
-# adjust log/run files
-PATCHFILES = patch-pound.h
-PATCHFILES += patch-pound.8
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+# we require
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibpcreposix0
-VENDOR_URL = http://www.apsis.ch/pound/
+# This is just for example scripts we can ignore it
+CHECKPKG_OVERRIDES_CSWpound2 += missing-dependency|CSWpython
-LICENSE = GPL.txt
+# These are harmless reference located in doc or man files
+CHECKPKG_OVERRIDES_CSWpound2 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound2/README
+CHECKPKG_OVERRIDES_CSWpound2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/pound2.8
-RUNTIME_DEP_PKGS += CSWlibssl-dev
-RUNTIME_DEP_PKGS += CSWlibcurl-dev
-SPKG_DESC_CSWpound2 = Reverse proxy load balancer
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWpound2 += CSWlibpcreposix0
-RUNTIME_DEP_PKGS_CSWpound2 += CSWlibssl1-0-0
-
-# This is just for example scripts
-CHECKPKG_OVERRIDES_CSWpound += missing-dependency|CSWpython
-CHECKPKG_OVERRIDES_CSWpound += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound/README
-
-# Patch taken from upstream to compile against libssl 1.0.0
-PATCHFILES = openssl1.0.0.patch
-
-EXTRA_DOCS += README
-EXTRA_DOCS += FAQ
-EXTRA_DOCS += CHANGELOG
-EXTRA_DOCS += z2_2_5_1.py
-EXTRA_DOCS += z2_2_6_1.py
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-super
CONFIGURE_ARGS += --enable-msdav
CONFIGURE_ARGS += --with-maxbuf=8192
CONFIGURE_ARGS += --with-ssl=$(prefix)
+# adjust log/run files
+PATCHFILES = patch-pound.h
+PATCHFILES += patch-pound.8
+
+# Patch taken from upstream to compile against libssl 1.0.0
+PATCHFILES = openssl1.0.0.patch
+
# No test suite available
TEST_SCRIPTS =
# use a custom install
-INSTALL_SCRIPTS = custom extra-docs
+INSTALL_SCRIPTS = custom docs
-PRESERVECONF = $(sysconfdir)/pound.cfg
-
include gar/category.mk
install-custom:
ginstall -d $(DESTDIR)$(sbindir)
- ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound
- ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/poundctl
+ ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound2
+ ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/pound2ctl
ginstall -d $(DESTDIR)$(mandir)/man8
- ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8
- ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8
+ ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound2.8
+ ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/pound2ctl.8
ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME)
- ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg
+ ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/$(NAME)
+ ginstall -d $(DESTDIR)/var/opt/csw/run
-install-extra-docs:
+docs-list = $(WORKSRC)/README
+docs-list += $(WORKSRC)/FAQ
+docs-list += $(WORKSRC)/CHANGELOG
+docs-list += $(WORKSRC)/z2_2_5_1.py
+docs-list += $(WORKSRC)/z2_2_6_1.py
+install-docs:
ginstall -d $(DESTDIR)$(docdir)/$(NAME)
- ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME)
+ @( for file in $(docs-list) ; do \
+ ginstall -m 644 $$file $(DESTDIR)$(docdir)/$(NAME) ; \
+ done )
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/pound/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound/trunk/checksums 2013-04-06 16:18:15 UTC (rev 20610)
+++ csw/mgar/pkg/pound/trunk/checksums 2013-04-06 16:19:51 UTC (rev 20611)
@@ -1 +1,3 @@
-4c4613e857ee14c06c61ab09e28ae503 Pound-2.4.5.tgz
+4c4613e857ee14c06c61ab09e28ae503 download/Pound-2.4.5.tgz
+30fabf8e6abf2e1af1cc65bc740c0124 download/patch-pound.8
+e7acc61f9ff01ecaaa628a08b207176f download/patch-pound.h
Deleted: csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
===================================================================
--- csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch 2013-04-06 16:18:15 UTC (rev 20610)
+++ csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch 2013-04-06 16:19:51 UTC (rev 20611)
@@ -1,310 +0,0 @@
-Description: Port to OpenSSL 1.0.0. Patch backported from upstream version
- 2.6c.
-Author: Ilya Barygin <barygin at gmail.com>
-Bug-Debian: http://bugs.debian.org/622041
---- pound-2.5.orig/svc.c
-+++ pound-2.5/svc.c
-@@ -27,12 +27,17 @@
-
- #include "pound.h"
-
-+#ifndef LHASH_OF
-+#define LHASH_OF(x) LHASH
-+#define CHECKED_LHASH_OF(type, h) h
-+#endif
-+
- /*
- * Add a new key/content pair to a hash table
- * the table should be already locked
- */
- static void
--t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
-+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
- {
- TABNODE *t, *old;
-
-@@ -53,7 +58,11 @@
- }
- memcpy(t->content, content, cont_len);
- t->last_acc = time(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
-+#else
- if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-+#endif
- free(old->key);
- free(old->content);
- free(old);
-@@ -68,12 +77,16 @@
- * side-effect: update the time of last access
- */
- static void *
--t_find(LHASH *const tab, char *const key)
-+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
- {
- TABNODE t, *res;
-
- t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
-+#else
- if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-+#endif
- res->last_acc = time(NULL);
- return res->content;
- }
-@@ -84,12 +97,16 @@
- * Delete a key
- */
- static void
--t_remove(LHASH *const tab, char *const key)
-+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
- {
- TABNODE t, *res;
-
- t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
-+#else
- if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-+#endif
- free(res->key);
- free(res->content);
- free(res);
-@@ -98,59 +115,77 @@
- }
-
- typedef struct {
-- LHASH *tab;
-+ LHASH_OF(TABNODE) *tab;
- time_t lim;
- void *content;
- int cont_len;
- } ALL_ARG;
-
- static void
--t_old(TABNODE *t, void *arg)
-+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
- {
-- ALL_ARG *a;
-
-- a = (ALL_ARG *)arg;
- if(t->last_acc < a->lim)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ LHM_lh_delete(TABNODE, a->tab, t);
-+#else
- lh_delete(a->tab, t);
-+#endif
- return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
-+#else
-+#define t_old t_old_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
-+#endif
-
- /*
- * Expire all old nodes
- */
- static void
--t_expire(LHASH *const tab, const time_t lim)
-+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- {
- ALL_ARG a;
- int down_load;
-
- a.tab = tab;
- a.lim = lim;
-- down_load = tab->down_load;
-- tab->down_load = 0;
-+ down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
-+#else
- lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
-- tab->down_load = down_load;
-+#endif
-+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
- return;
- }
-
- static void
--t_cont(TABNODE *t, void *arg)
-+t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
- {
-- ALL_ARG *a;
-
-- a = (ALL_ARG *)arg;
-- if(memcmp(t->content, a->content, a->cont_len) == 0)
-- lh_delete(a->tab, t);
-+ if(memcmp(t->content, arg->content, arg->cont_len) == 0)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ LHM_lh_delete(TABNODE, arg->tab, t);
-+#else
-+ lh_delete(arg->tab, t);
-+#endif
- return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
-+#else
-+#define t_cont t_cont_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
-+#endif
-
- /*
- * Remove all nodes with the given content
- */
- static void
--t_clean(LHASH *const tab, void *const content, const size_t cont_len)
-+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
- {
- ALL_ARG a;
- int down_load;
-@@ -158,10 +193,14 @@
- a.tab = tab;
- a.content = content;
- a.cont_len = cont_len;
-- down_load = tab->down_load;
-- tab->down_load = 0;
-+ down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
-+#else
- lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
-- tab->down_load = down_load;
-+#endif
-+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
- return;
- }
-
-@@ -1410,41 +1449,47 @@
- } DUMP_ARG;
-
- static void
--t_dump(TABNODE *t, void *arg)
-+t_dump_doall_arg(TABNODE *t, DUMP_ARG *arg)
- {
-- DUMP_ARG *a;
- BACKEND *be, *bep;
- int n_be, sz;
-
-- a = (DUMP_ARG *)arg;
- memcpy(&bep, t->content, sizeof(bep));
-- for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
-+ for(n_be = 0, be = arg->backends; be; be = be->next, n_be++)
- if(be == bep)
- break;
- if(!be)
- /* should NEVER happen */
- n_be = 0;
-- write(a->control_sock, t, sizeof(TABNODE));
-- write(a->control_sock, &n_be, sizeof(n_be));
-+ write(arg->control_sock, t, sizeof(TABNODE));
-+ write(arg->control_sock, &n_be, sizeof(n_be));
- sz = strlen(t->key);
-- write(a->control_sock, &sz, sizeof(sz));
-- write(a->control_sock, t->key, sz);
-+ write(arg->control_sock, &sz, sizeof(sz));
-+ write(arg->control_sock, t->key, sz);
- return;
- }
--
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
-+#else
-+#define t_dump t_dump_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
-+#endif
-
- /*
- * write sessions to the control socket
- */
- static void
--dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
-+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
- {
- DUMP_ARG a;
-
- a.control_sock = control_sock;
- a.backends = backends;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
-+#else
- lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-+#endif
- return;
- }
-
---- pound-2.5.orig/pound.h
-+++ pound-2.5/pound.h
-@@ -322,6 +322,10 @@
- /* maximal session key size */
- #define KEY_SIZE 127
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+DECLARE_LHASH_OF(TABNODE);
-+#endif
-+
- /* service definition */
- typedef struct _service {
- char name[KEY_SIZE + 1]; /* symbolic name */
-@@ -337,7 +341,11 @@
- int sess_ttl; /* session time-to-live */
- regex_t sess_pat; /* pattern to match the session data */
- char *sess_parm; /* session cookie or parameter */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ LHASH_OF(TABNODE) *sessions; /* currently active sessions */
-+#else
- LHASH *sessions; /* currently active sessions */
-+#endif
- int dynscale; /* true if the back-ends should be dynamically rescaled */
- int disabled; /* true if the service is disabled */
- struct _service *next;
---- pound-2.5.orig/config.c
-+++ pound-2.5/config.c
-@@ -431,14 +431,25 @@
- res = (res ^ *k++) * 16777619;
- return res;
- }
--static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
-+#else
-+static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-+#endif
-+
- static int
- t_cmp(const TABNODE *d1, const TABNODE *d2)
- {
- return strcmp(d1->key, d2->key);
- }
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
-+#endif
-+
-
- /*
- * parse a service
-@@ -460,7 +471,11 @@
- pthread_mutex_init(&res->mut, NULL);
- if(svc_name)
- strncpy(res->name, svc_name, KEY_SIZE);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) {
-+#else
- if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) {
-+#endif
- logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
- exit(1);
- }
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