Re: Comments? ap2 flavor for www/mod_fastcgi

[Roland Philippsen]

 Original-Nachricht 
> Datum: Thu, 13 Sep 2007 01:49:07 +0200
> Von: Simon Bertrang <[EMAIL PROTECTED]>
> Betreff: Re: Comments? ap2 flavor for www/mod_fastcgi
> > > Another proposal using MULTI_PACKAGES instead of FLAVOR which allows
> to
> > > install both at the same time.

Both proposed  subpackages build and install fine on my amd64, but attempting 
to load ap2-mod_fastcgi-2.4.2 into Apache 2 yields:

/usr/local/sbin/httpd2:/usr/local/lib/apache2/mod_fastcgi.so: undefined symbol 
'ap_server_strip_chroot'
/usr/local/sbin/httpd2:/usr/local/lib/apache2/mod_fastcgi.so: undefined symbol 
'ap_server_chroot_desired'

These two symbols come from patch-mod_fastcgi_c which I had disabled for the 
ap2 flavor in my original post. Something similar would happen if my Apache 
config exercised patch-fcgi_pm_c (didn't test that though).

Similarly, the patch-fcgi_h is specific to Apache 2 and not required under 
Apache 1 (although it does not *seem* to hurt, although I didn't actually run 
it).

I see no "obvious" way of specifying PATCH_LIST in a subpackage-dependent way, 
but I think we need such granularity in this case. I will read up on 
PSEUDO_FLAVORS and its use in other ports to see if that can solve this issue 
elegantly.

Other ideas or comments?

Cheers,
Roland

-- 
GMX FreeMail: 1 GB Postfach, 5 E-Mail-Adressen, 10 Free SMS.
Alle Infos und kostenlose Anmeldung: http://www.gmx.net/de/go/freemail

UPDATE: vpnc -> 0.5.1

[Aaron Hsu]

The compressed archive of the port is available at




-- 
((name "Aaron Hsu")
 (email/xmpp "[EMAIL PROTECTED]")
 (phone "703-597-7656")
 (site "http://www.aaronhsu.com";))

Re: Comments? ap2 flavor for www/mod_fastcgi

[Roland Philippsen]

Simon Bertrang wrote:
> On Mon, Sep 10, 2007 at 11:59:27PM -0400, Mike Erdely wrote:
>> On Sun, Sep 09, 2007 at 12:57:30PM -0700, Roland Philippsen wrote:
>>> here's a suggestion for adding an Apache2-flavor to www/mod_fastcgi.
>>> The patch (created with git) is best applied using 'patch -p2' from
>>> within the mod_fastcgi directory.
...
>> I made a couple tweaks and used "cvs diff" (below).
...
> Another proposal using MULTI_PACKAGES instead of FLAVOR which allows to
> install both at the same time.
> patches/patch-fcgi_h works in both version, so i changed it to apply
> unconditionally which make the Makefile even smaller.

Thanks for the input. I didn't test your patch yet, but...

The reason why I hadn't opted for MULTI_PACKAGES was that it would
change the default behavior of the port. People who "want just the
good old thing" would be forced to specify SUBPACKAGE=main in the
environment when building mod_fastcgi, otherwise they're forced to
install apache-httpd, which might not be exactly what they want.

Or am I missing something here?

Just my two cents, will test your patch and let everyone know.

Cheers,
Roland

Use /dev/arandom instead of /dev/urandom for NSS and glib2

[Damien Miller]

Hi,

glib2 and Mozilla's NSS are voracious consumers of /dev/urandom. These
patches makes them use /dev/arandom instead - it is faster and we already
consider its output sufficiently strong for use by OpenSSL.

There are probably quite a few other ports that could be similarly adapted.

Ok?

-d? w-glib-2.12.12
Index: Makefile
===
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile27 Jul 2007 10:09:51 -  1.36
+++ Makefile12 Sep 2007 23:06:16 -
@@ -5,7 +5,7 @@ COMMENT-docs=   "glib2 documentation"
 
 VERSION=   2.12.12
 DISTNAME=  glib-${VERSION}
-PKGNAME-main=  glib2-${VERSION}p1
+PKGNAME-main=  glib2-${VERSION}p2
 PKGNAME-docs=  glib2-docs-${VERSION}
 CATEGORIES=devel
 
Index: patches/patch-glib_grand_c
===
RCS file: patches/patch-glib_grand_c
diff -N patches/patch-glib_grand_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-glib_grand_c  12 Sep 2007 23:06:16 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- glib/grand.c.orig  Thu Sep 13 09:01:56 2007
 glib/grand.c   Thu Sep 13 09:02:35 2007
+@@ -173,7 +173,7 @@ g_rand_new (void)
+   do
+ {
+ errno = 0;
+-dev_urandom = fopen("/dev/urandom", "rb");
++dev_urandom = fopen("/dev/arandom", "rb");
+   }
+   while G_UNLIKELY (errno == EINTR);
+ 
? w-nss-3.11.7
Index: Makefile
===
RCS file: /cvs/ports/security/nss/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile1 Aug 2007 21:16:10 -   1.7
+++ Makefile12 Sep 2007 23:01:08 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT=   "libraries to support development of security-enabled 
apps"
 
 VERSION=   3.11.7
-DISTNAME=  nss-${VERSION}
+DISTNAME=  nss-${VERSION}p0
 SO_VERSION=20.0
 .for _lib in freebl3 nss3 nssckbi smime3 softokn3 ssl3
 SHARED_LIBS+=  ${_lib} ${SO_VERSION}
Index: patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c
===
RCS file: 
/cvs/ports/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-mozilla_security_nss_lib_freebl_unix_rand_c
--- patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c   1 Aug 2007 
21:16:10 -   1.2
+++ patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c   12 Sep 2007 
23:01:08 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.2 2007/08/01 
21:16:10 kurt Exp $
 mozilla/security/nss/lib/freebl/unix_rand.c.orig   Wed Feb 14 20:48:36 2007
-+++ mozilla/security/nss/lib/freebl/unix_rand.cWed Jul 25 12:51:08 2007
+--- mozilla/security/nss/lib/freebl/unix_rand.c.orig   Thu Feb 15 12:48:36 2007
 mozilla/security/nss/lib/freebl/unix_rand.cThu Sep 13 08:57:09 2007
 @@ -859,7 +859,8 @@ safe_pclose(FILE *fp)
  /* if the child hasn't exited, kill it -- we're done with its output */
  while ((rv = waitpid(pid, &status, WNOHANG)) == -1 && errno == EINTR)
@@ -19,3 +19,21 @@ $OpenBSD: patch-mozilla_security_nss_lib
  
  void RNG_SystemInfoForRNG(void)
  {
+@@ -956,7 +956,7 @@ for the small amount of entropy it provides.
+ GiveSystemInfo();
+ 
+ /* grab some data from system's PRNG before any other files. */
+-bytes = RNG_FileUpdate("/dev/urandom", SYSTEM_RNG_SEED_COUNT);
++bytes = RNG_FileUpdate("/dev/arandom", SYSTEM_RNG_SEED_COUNT);
+ 
+ /* If the user points us to a random file, pass it through the rng */
+ randfile = getenv("NSRANDFILE");
+@@ -1139,7 +1139,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
+ size_t fileBytes = 0;
+ unsigned char *buffer = dest;
+ 
+-file = fopen("/dev/urandom", "r");
++file = fopen("/dev/arandom", "r");
+ if (file == NULL) {
+   PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
+   return fileBytes;

Re: Comments? ap2 flavor for www/mod_fastcgi

[Simon Bertrang]

On Wed, Sep 12, 2007 at 04:17:53PM -0700, Roland Philippsen wrote:
> Simon Bertrang wrote:
> > On Mon, Sep 10, 2007 at 11:59:27PM -0400, Mike Erdely wrote:
> >> On Sun, Sep 09, 2007 at 12:57:30PM -0700, Roland Philippsen wrote:
> >>> here's a suggestion for adding an Apache2-flavor to www/mod_fastcgi.
> >>> The patch (created with git) is best applied using 'patch -p2' from
> >>> within the mod_fastcgi directory.
> ...
> >> I made a couple tweaks and used "cvs diff" (below).
> ...
> > Another proposal using MULTI_PACKAGES instead of FLAVOR which allows to
> > install both at the same time.
> > patches/patch-fcgi_h works in both version, so i changed it to apply
> > unconditionally which make the Makefile even smaller.
> 
> Thanks for the input. I didn't test your patch yet, but...
> 
> The reason why I hadn't opted for MULTI_PACKAGES was that it would
> change the default behavior of the port. People who "want just the
> good old thing" would be forced to specify SUBPACKAGE=main in the
> environment when building mod_fastcgi, otherwise they're forced to
> install apache-httpd, which might not be exactly what they want.
> 
> Or am I missing something here?
> 

No, i actually thought about it and probably a pseudo flavor like
ap2 could enable the additional package.  If you like to you can
sprinkle the required .if's other the few places where it matters.

I think the maintainer will also have an opinion to that and he's
on the cc list now... mbalmer enlighten us :-)

Regards,
Simon

Re: Comments? ap2 flavor for www/mod_fastcgi

[Simon Bertrang]

On Mon, Sep 10, 2007 at 11:59:27PM -0400, Mike Erdely wrote:
> On Sun, Sep 09, 2007 at 12:57:30PM -0700, Roland Philippsen wrote:
> > here's a suggestion for adding an Apache2-flavor to www/mod_fastcgi.
> > The patch (created with git) is best applied using 'patch -p2' from
> > within the mod_fastcgi directory. The unflavored build is identical to
> > what's in CVS right now, specifying FLAVOR=ap2 builds it for
> > www/apache-httpd.
> > 
> > Tested on a -current amd64 (as of yesterday).
> > 
> > Any comments welcome, of course. I tried to infer the appropriate
> > style from the docs and by looking at other ports, but this is my
> > first attempt so please don't get too upset if I blundered somewhere :o)
> 
> I tested this on macppc and i386.  Works as expected.
> 
> I made a couple tweaks and used "cvs diff" (below).
>  - I removed your "flavored_" PKGNAME prefix.
>  - I added "@comment share/.../mod_fastcgi.html.orig" to PFRAG.ap2 so
>update-plist doesn't change any files.
> 

Another proposal using MULTI_PACKAGES instead of FLAVOR which allows to
install both at the same time.
patches/patch-fcgi_h works in both version, so i changed it to apply
unconditionally which make the Makefile even smaller.

Regards,
Simon
Index: Makefile
===
RCS file: /cvs/ports/www/mod_fastcgi/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile30 Jun 2007 15:32:30 -  1.4
+++ Makefile12 Sep 2007 22:50:58 -
@@ -1,9 +1,11 @@
 # $OpenBSD: Makefile,v 1.4 2007/06/30 15:32:30 simon Exp $
 
-COMMENT="Apache FastCGI module"
+COMMENT-main=  Apache FastCGI module
+COMMENT-ap2=   Apache2 FastCGI module
 
 DISTNAME=   mod_fastcgi-2.4.2
-PKGNAME=   ${DISTNAME}p1
+PKGNAME-main=  ${DISTNAME}p1
+PKGNAME-ap2=   ap2-${DISTNAME}
 
 CATEGORIES= www
 
@@ -24,13 +26,35 @@ PERMIT_DISTFILES_FTP=   Yes
 
 NO_REGRESS= Yes
 
+MULTI_PACKAGES=-main -ap2
+
+BUILD_DEPENDS= ::www/apache-httpd
+
+MAKE_FLAGS=top_dir=${PREFIX}/share/apache2 \
+   APXS=${PREFIX}/sbin/apxs2 \
+   APACHECTL=${PREFIX}/sbin/apachectl2
+
+FAKE_FLAGS=top_dir=${TRUEPREFIX}/share/apache2 \
+   APXS=${TRUEPREFIX}/sbin/apxs2 \
+   APACHECTL=${TRUEPREFIX}/sbin/apachectl2
+
+DESCR-ap2= ${PKGDIR}/DESCR-main
+
+post-patch:
+   mkdir ${WRKBUILD}/ap2 && touch ${WRKBUILD}/ap2/.deps
+   cd ${WRKBUILD}/ap2 && ln ../{Makefile.*,*.[hc],modules.mk} .
+
 do-build:
(cd ${WRKBUILD}; apxs -o mod_fastcgi.so -c *.c)
+   (cd ${WRKBUILD}/ap2; ${GMAKE} -f Makefile.AP2 ${MAKE_FLAGS})
 
 post-build:
@${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
+   cd ${WRKBUILD}/ap2 && ${GMAKE} -f Makefile.AP2 ${FAKE_FLAGS} 
local-install
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apache2/mod/mod_fastcgi
+   ${INSTALL_DATA} ${WRKBUILD}/docs/* 
${PREFIX}/share/doc/apache2/mod/mod_fastcgi
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_fastcgi
${INSTALL_DATA} ${WRKBUILD}/docs/* ${PREFIX}/share/doc/mod_fastcgi
${MODAPACHE_INSTALL}
Index: patches/patch-fcgi_h
===
RCS file: patches/patch-fcgi_h
diff -N patches/patch-fcgi_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-fcgi_h12 Sep 2007 22:50:58 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- fcgi.h.origTue Feb  4 00:07:37 2003
 fcgi.h Thu Sep 13 00:01:59 2007
+@@ -73,6 +73,37 @@ typedef apr_status_t apcb_t;
+ #define ap_reset_timeout(a)
+ #define ap_unblock_alarms()
+ 
++/* starting with apache 2.2 the backward-compatibility defines for
++ * 1.3 APIs are not available anymore. Define them ourselves here.
++ * see 
http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html
++ */
++#ifndef ap_copy_table
++
++#define ap_copy_table apr_table_copy
++#define ap_cpystrn apr_cpystrn
++#define ap_destroy_pool apr_pool_destroy
++#define ap_isspace apr_isspace
++#define ap_make_array apr_array_make
++#define ap_make_table apr_table_make
++#define ap_null_cleanup apr_pool_cleanup_null 
++#define ap_palloc apr_palloc
++#define ap_pcalloc apr_pcalloc
++#define ap_psprintf apr_psprintf
++#define ap_pstrcat apr_pstrcat
++#define ap_pstrdup apr_pstrdup
++#define ap_pstrndup apr_pstrndup
++#define ap_push_array apr_array_push
++#define ap_register_cleanup apr_pool_cleanup_register
++#define ap_snprintf apr_snprintf
++#define ap_table_add apr_table_add
++#define ap_table_do apr_table_do
++#define ap_table_get apr_table_get
++#define ap_table_set apr_table_set
++#define ap_table_setn apr_table_setn
++#define ap_table_unset apr_table_unset
++
++#endif /* defined(ap_copy_table) */
++
+ #if (defined(HAVE_WRITEV) && !HAVE_WRITEV && !defined(NO_WRITEV)) || defined 
WIN32
+ #define NO_WRITEV
+ #endif
Index: patches/patch-fcgi_pm_c
===
RCS file: /cvs/ports/www/mod_fastcgi/patc

Re: NEW: devel/py-zope

[Marc Balmer]

* Eric Faurot wrote:
> On Mon, 10 Sep 2007 10:58:04 +0200
> Marc Balmer <[EMAIL PROTECTED]> wrote:
> 
> > * Eric Faurot wrote:
> > 
> > > It should be useful later for a complete port of zope3.
> > 
> > The Zope port will be undergoing major surgery anyways.  There will
> > be structure like this zope/2.8, zope/2.9, zope/3.0, so more than
> > one major release branch will be supported.
> 
> Is somebody currently working on this?

yes, me.

> 
> 
> Eric.

NEW: geo/geos

[Eric Faurot]

GEOS (Geometry Engine - Open Source) is a C++ port of the Java
Topology Suite (JTS).  As such, it aims to contain the complete
functionality of JTS in C++. This includes all the OpenGIS "Simple
Features for SQL" spatial predicate functions and spatial operators,
as well as specific JTS topology functions such as IsValid().

This package will be required for the upcoming postgis port.

Builds and passes regress on macppc.
Please test and comment. 

Eric.


geos.tgz
Description: Unix tar archive

Re: NEW: devel/py-zope

[Eric Faurot]

On Mon, 10 Sep 2007 10:58:04 +0200
Marc Balmer <[EMAIL PROTECTED]> wrote:

> * Eric Faurot wrote:
> 
> > It should be useful later for a complete port of zope3.
> 
> The Zope port will be undergoing major surgery anyways.  There will
> be structure like this zope/2.8, zope/2.9, zope/3.0, so more than
> one major release branch will be supported.

Is somebody currently working on this?


Eric.

KDevelop

[Antti Harri]

Hi,

I was trying to port KDevelop but couldn't get it to
compile all the way. If someone wants to continue
then be my guest :-)

http://openbsd.fi/~iku/files/kdevelop.tar.gz

Extract into x11/kde/

--
Antti Harri

UPDATE: qgo-1.5.4

[Paul Irofti]

Don't know if this is the proper procedure and I don't mean to insult
the maintainer but the current port version has an irritating bug for
9x9 boards (i.e. it draws an extra line on the board) so I have created
a diff to update to the latest version that fixes this and adds other
features etc.

Anyway, here is the diff.
Index: Makefile
===
RCS file: /cvs/ports/games/qgo/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile31 Mar 2007 12:45:40 -  1.3
+++ Makefile12 Sep 2007 12:27:03 -
@@ -2,8 +2,7 @@
 
 COMMENT=   "go client and fully featured sgf editor"
 
-DISTNAME=  qgo-1.5.2
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  qgo-1.5.4
 CATEGORIES=games
 
 MAINTAINER=Mathieu Sauve-Frankel <[EMAIL PROTECTED]>
@@ -13,7 +12,7 @@
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=   c m pthread stdc++ X11 Xext SM ICE jpeg
+WANTLIB=   c m pthread stdc++ X11 Xext SM ICE jpeg Xau Xdmcp
 
 MODULES=   x11/qt3
 
Index: distinfo
===
RCS file: /cvs/ports/games/qgo/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo5 Apr 2007 15:38:11 -   1.3
+++ distinfo12 Sep 2007 12:27:03 -
@@ -1,5 +1,5 @@
-MD5 (qgo-1.5.2.tar.gz) = qXZ/JXL8jYxWU3JrvOQC4A==
-RMD160 (qgo-1.5.2.tar.gz) = AH8p7bBKtWFLr2fTxMtJGUoYc4M=
-SHA1 (qgo-1.5.2.tar.gz) = wrI68yWzTmNGJhW9vQamiPIJXk0=
-SHA256 (qgo-1.5.2.tar.gz) = 2NLLF6jmp3U1foUMNf026X/YUpVkgQHq12QKRtUTXT8=
-SIZE (qgo-1.5.2.tar.gz) = 2331728
+MD5 (qgo-1.5.4.tar.gz) = qR6QMZTWdu6ZcDAK3O9wsQ==
+RMD160 (qgo-1.5.4.tar.gz) = guQiDCaBJHdLEJ0Hj6gsZVINQ5Q=
+SHA1 (qgo-1.5.4.tar.gz) = NqZlZ4CyXEUZT7MduQKIs7GZ+I8=
+SHA256 (qgo-1.5.4.tar.gz) = HF3XFx5NoTObDZXD8c/tilkubkuNwL9Eal0/wC5i0BQ=
+SIZE (qgo-1.5.4.tar.gz) = 2427901
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/qgo/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   3 Oct 2006 00:03:03 -   1.1.1.1
+++ pkg/PLIST   12 Sep 2007 12:27:03 -
@@ -1,5 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/03 00:03:03 msf Exp $
 bin/qgo
+man/cat3f/
+man/man3f/
 share/applnk/
 share/applnk/Games/
 share/applnk/Games/qgo.desktop
@@ -38,6 +40,9 @@
 share/qGo/translations/qgo_dk.qm
 share/qGo/translations/qgo_fr.qm
 share/qGo/translations/qgo_it.qm
+share/qGo/translations/qgo_la.qm
 share/qGo/translations/qgo_nl.qm
 share/qGo/translations/qgo_pt.qm
+share/qGo/translations/qgo_ru.qm
 share/qGo/translations/qgo_zh.qm
+share/qGo/translations/qgo_zh_cn.qm

Re: NEW: devel/cutils

[Paul Irofti]

On Wed, Sep 12, 2007 at 10:59:02AM +0100, Stuart Henderson wrote:
> On 2007/09/12 11:24, Paul Irofti wrote:
> > Fixed the warning and attached the actual port not the blobs.
> 
> thanks, here it is again with a little tidying:
> 
> add $Id$
> lowercase COMMENT, remove "
> PKGNAME= already defaults to ${DISTNAME}
> add HOMEPAGE (not much info there, but I think it makes sense,
>   and oh cool, there's a repton clone :-)
> add comment with license info
> add WANTLIB
> spaces to tabs
> no need for CONFIGURE_SHARED
> 
> unfortunately the yacc tools this provides don't grok most of
> the pfctl-derived parse.y
> 

Thanks for the clean-up!

Re: NEW: devel/cutils

[Stuart Henderson]

On 2007/09/12 11:24, Paul Irofti wrote:
> Fixed the warning and attached the actual port not the blobs.

thanks, here it is again with a little tidying:

add $Id$
lowercase COMMENT, remove "
PKGNAME= already defaults to ${DISTNAME}
add HOMEPAGE (not much info there, but I think it makes sense,
  and oh cool, there's a repton clone :-)
add comment with license info
add WANTLIB
spaces to tabs
no need for CONFIGURE_SHARED

unfortunately the yacc tools this provides don't grok most of
the pfctl-derived parse.y



cutils.tar.gz
Description: application/tar-gz

Re: NEW: devel/cutils

[Paul Irofti]

Fixed the warning and attached the actual port not the blobs.



cutils.tar.gz
Description: application/tar-gz

Re: Comments? ap2 flavor for www/mod_fastcgi

[steven mestdagh]

Roland Philippsen [2007-09-11, 21:20:05]:
> One (general) question: what are the recommendations regarding the use
> of quotes in COMMENT? I've seen patches that remove those, and some
> ports obviously still have them...

The quotes are no longer necessary. Some ports still have them because there
is no point in removing quotes for the sake of it. They can be removed when
the ports are actually updated.